diff --git a/events/2011/event-20110224-01.el.xml b/events/2011/event-20110224-01.el.xml
index e50c6cc20d..387475a38d 100644
--- a/events/2011/event-20110224-01.el.xml
+++ b/events/2011/event-20110224-01.el.xml
@@ -19,7 +19,7 @@
 
 
       
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2011/event-20110224-01.en.xml b/events/2011/event-20110224-01.en.xml
index fc3a8a0b34..6e3659b816 100644
--- a/events/2011/event-20110224-01.en.xml
+++ b/events/2011/event-20110224-01.en.xml
@@ -13,7 +13,7 @@
       <tag key="front-page"/>
       <tag key="gb"/>
       <tag key="openstandards"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2011/event-20110224-01.hr.xml b/events/2011/event-20110224-01.hr.xml
index 0876b46af1..9c14dc649f 100644
--- a/events/2011/event-20110224-01.hr.xml
+++ b/events/2011/event-20110224-01.hr.xml
@@ -13,7 +13,7 @@
       <tag key="front-page"/>
       <tag key="gb"/>
       <tag key="openstandards"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2011/event-20110614-01.en.xml b/events/2011/event-20110614-01.en.xml
index 5c16da82cc..9df6c68d5a 100644
--- a/events/2011/event-20110614-01.en.xml
+++ b/events/2011/event-20110614-01.en.xml
@@ -11,7 +11,7 @@
     <link>http://www.smartgovlive.com/</link>
     <tags>
       <tag key="gb"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2011/event-20110808-01.en.xml b/events/2011/event-20110808-01.en.xml
index b076456197..1bdb97b759 100644
--- a/events/2011/event-20110808-01.en.xml
+++ b/events/2011/event-20110808-01.en.xml
@@ -21,7 +21,7 @@
     <link>https://www.desktopsummit.org/program</link>
     <tags>
       <tag key="front-page"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
       <tag key="europe"/>
     </tags>
   </event>
diff --git a/events/2011/event-20110808-01.hr.xml b/events/2011/event-20110808-01.hr.xml
index 96485a8ffd..28cf45d0a6 100644
--- a/events/2011/event-20110808-01.hr.xml
+++ b/events/2011/event-20110808-01.hr.xml
@@ -26,7 +26,7 @@
     <link>https://www.desktopsummit.org/program/sessions/free-desktops-europes-public-sector</link>
     <tags>
       <tag key="front-page"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
       <tag key="europe"/>
     </tags>
   </event>
diff --git a/events/2011/event-20110909-01.en.xml b/events/2011/event-20110909-01.en.xml
index 6f2d9eb942..161233ea05 100644
--- a/events/2011/event-20110909-01.en.xml
+++ b/events/2011/event-20110909-01.en.xml
@@ -19,7 +19,7 @@
     <link>http://www.mastersoftwarelibre.com/2011/08/05/jornadas-abiertas-de-septiembre-2011/</link>
     <tags>
       <tag key="front-page"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2012/event-20120529-01.el.xml b/events/2012/event-20120529-01.el.xml
index 65f310dcb8..e359f781f8 100644
--- a/events/2012/event-20120529-01.el.xml
+++ b/events/2012/event-20120529-01.el.xml
@@ -18,7 +18,7 @@
     <tag key="front-page"/>
     <tag key="gb"/>
     <tag key="openstandards"/>
-    <tag key="publicadministration"/>    
+    <tag key="public-administration"/>    
     <tag key="policy"/>
    </tags>
   </event>
diff --git a/events/2012/event-20120529-01.en.xml b/events/2012/event-20120529-01.en.xml
index b43801729e..538492121d 100644
--- a/events/2012/event-20120529-01.en.xml
+++ b/events/2012/event-20120529-01.en.xml
@@ -13,7 +13,7 @@
     <tag key="front-page"/>
     <tag key="gb"/>
     <tag key="openstandards"/>
-    <tag key="publicadministration"/>    
+    <tag key="public-administration"/>    
     <tag key="policy"/>
    </tags>
   </event>
diff --git a/events/2012/event-20121205-01.en.xml b/events/2012/event-20121205-01.en.xml
index 1c6ede2ede..8795c8ee38 100644
--- a/events/2012/event-20121205-01.en.xml
+++ b/events/2012/event-20121205-01.en.xml
@@ -22,7 +22,7 @@
       <tag key="front-page"/>
       <tag key="berlin"/>
       <tag key="de"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2013/event-20130304-01.de.xml b/events/2013/event-20130304-01.de.xml
index bedcc9c7e0..364323d778 100644
--- a/events/2013/event-20130304-01.de.xml
+++ b/events/2013/event-20130304-01.de.xml
@@ -17,7 +17,7 @@
 
     <tags>
       <tag key="de"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2013/event-20130517-03.de.xml b/events/2013/event-20130517-03.de.xml
index 61de93ae82..ee9ed4ac3e 100644
--- a/events/2013/event-20130517-03.de.xml
+++ b/events/2013/event-20130517-03.de.xml
@@ -16,7 +16,7 @@
 
     <tags>
       <tag key="de"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2013/event-20130517-03.en.xml b/events/2013/event-20130517-03.en.xml
index 0d2d021fee..dfe581f24f 100644
--- a/events/2013/event-20130517-03.en.xml
+++ b/events/2013/event-20130517-03.en.xml
@@ -16,7 +16,7 @@
 
     <tags>
       <tag key="de"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2013/event-20130517-03.sq.xml b/events/2013/event-20130517-03.sq.xml
index e285853f55..c4596d63ea 100644
--- a/events/2013/event-20130517-03.sq.xml
+++ b/events/2013/event-20130517-03.sq.xml
@@ -16,7 +16,7 @@
 
     <tags>
       <tag key="de"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2013/event-20131029-01.en.xml b/events/2013/event-20131029-01.en.xml
index 9b90ab3087..ae6739d1b2 100644
--- a/events/2013/event-20131029-01.en.xml
+++ b/events/2013/event-20131029-01.en.xml
@@ -16,7 +16,7 @@
    <link>http://prtr-workshop.ecologic-events.eu/</link>
    <tags>
     <tag key="de"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
    </tags>
 
   </event>
diff --git a/events/2016/event-20160902-01.en.xml b/events/2016/event-20160902-01.en.xml
index b9b8b71e3f..9a30c8aebc 100644
--- a/events/2016/event-20160902-01.en.xml
+++ b/events/2016/event-20160902-01.en.xml
@@ -18,7 +18,7 @@
 		<tags>
 			<tag key="berlin">Berlin</tag>
 			<tag key="de">Deutschland</tag>
-			<tag key="fsfesummit">FSFE summit</tag>
+			<tag key="fsfe-summit">FSFE summit</tag>
 			<tag key="fellowship">Community</tag>
 			<tag key="front-page"/>
 		</tags>
diff --git a/events/2016/event-20160902-01.nl.xml b/events/2016/event-20160902-01.nl.xml
index d6df35afe1..740939db90 100644
--- a/events/2016/event-20160902-01.nl.xml
+++ b/events/2016/event-20160902-01.nl.xml
@@ -15,7 +15,7 @@ netwerken, de strategie te bepalen en samen te computeren, te werken en te leren
       <tag key="de">Duitsland</tag>
       <tag key="front-page">voorpagina</tag>
       <tag key="fellowship"/>
-      <tag key="fsfesummit"/>
+      <tag key="fsfe-summit"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2016/event-20160902-01.sq.xml b/events/2016/event-20160902-01.sq.xml
index bc4fbf568d..ba4a88f7be 100644
--- a/events/2016/event-20160902-01.sq.xml
+++ b/events/2016/event-20160902-01.sq.xml
@@ -16,7 +16,7 @@ për t’u dhënë fill punëve të ndryshme dhe për të mësuar tok.
       <tag key="de">Gjermani</tag>
       <tag key="front-page"/>
       <tag key="fellowship"/>
-      <tag key="fsfesummit"/>
+      <tag key="fsfe-summit"/>
     </tags>
   </event>
 </eventset>
diff --git a/events/2016/event-20160903-01.en.xml b/events/2016/event-20160903-01.en.xml
index dc557f8180..233194691b 100644
--- a/events/2016/event-20160903-01.en.xml
+++ b/events/2016/event-20160903-01.en.xml
@@ -17,9 +17,9 @@
 		<tags>
 			<tag key="berlin">Berlin</tag>
 			<tag key="de">Germany</tag>
-			<tag key="fsfesummit">FSFE summit</tag>
+			<tag key="fsfe-summit">FSFE summit</tag>
 			<tag key="fellowship">Community</tag>
-			<tag key="15yearsfsfe">15 years FSFE</tag>
+			<tag key="anniversary">15 years FSFE</tag>
 			<tag key="front-page"/>
 		</tags>
 
diff --git a/events/2016/event-20160903-01.nl.xml b/events/2016/event-20160903-01.nl.xml
index c981fe6c87..c2a796f903 100644
--- a/events/2016/event-20160903-01.nl.xml
+++ b/events/2016/event-20160903-01.nl.xml
@@ -17,9 +17,9 @@
 		<tags>
 			<tag key="berlin">Berlijn</tag>
 			<tag key="de">Duitsland</tag>
-			<tag key="fsfesummit">FSFE-Top</tag>
+			<tag key="fsfe-summit">FSFE-Top</tag>
 			<tag key="fellowship">Fellowship</tag>
-			<tag key="15yearsfsfe">15 jaar FSFE</tag>
+			<tag key="anniversary">15 jaar FSFE</tag>
 			<tag key="front-page"/>
 		</tags>
 
diff --git a/events/2016/event-20160903-01.sq.xml b/events/2016/event-20160903-01.sq.xml
index 012c733ac3..2335ec09e8 100644
--- a/events/2016/event-20160903-01.sq.xml
+++ b/events/2016/event-20160903-01.sq.xml
@@ -17,9 +17,9 @@
 		<tags>
 			<tag key="berlin">Berlin</tag>
 			<tag key="de">Gjermani</tag>
-			<tag key="fsfesummit">kuvendi i FSFE-së</tag>
+			<tag key="fsfe-summit">kuvendi i FSFE-së</tag>
 			<tag key="fellowship">Bashkësi</tag>
-			<tag key="15yearsfsfe">15 vjet FSFE</tag>
+			<tag key="anniversary">15 vjet FSFE</tag>
 			<tag key="front-page"/>
 		</tags>
 
diff --git a/news/2009/news-20090120-02.de.xhtml b/news/2009/news-20090120-02.de.xhtml
index 6e77cb626e..cd2504f573 100644
--- a/news/2009/news-20090120-02.de.xhtml
+++ b/news/2009/news-20090120-02.de.xhtml
@@ -65,7 +65,7 @@ rechtliche Sicherheit zu verschaffen, sind die wichtigsten Ziele der FSFE, die
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090120-02.el.xhtml b/news/2009/news-20090120-02.el.xhtml
index 4d3a2d07a4..567afc9796 100644
--- a/news/2009/news-20090120-02.el.xhtml
+++ b/news/2009/news-20090120-02.el.xhtml
@@ -63,7 +63,7 @@ Systems (ECIS) για την αλλοίωση των κανόνων της αγ
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090120-02.en.xhtml b/news/2009/news-20090120-02.en.xhtml
index 6edcf19fe0..94cc3dd5b3 100644
--- a/news/2009/news-20090120-02.en.xhtml
+++ b/news/2009/news-20090120-02.en.xhtml
@@ -84,7 +84,7 @@ href="/">https://fsfe.org/</a>.</p>
 	<tag key="policy"/>
 	<tag key="antitrust"/>
 	<tag key="microsoft"/>
-	<tag key="europeancommission">European Commission</tag>
+	<tag key="european-commission">European Commission</tag>
 </tags>
 
 </html>
diff --git a/news/2009/news-20090120-02.fr.xhtml b/news/2009/news-20090120-02.fr.xhtml
index 0e8b847fa4..3cc6b97a41 100644
--- a/news/2009/news-20090120-02.fr.xhtml
+++ b/news/2009/news-20090120-02.fr.xhtml
@@ -66,7 +66,7 @@ Libres, tels sont les objectifs principaux de la FSFE fondée en 2001.
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090120-02.it.xhtml b/news/2009/news-20090120-02.it.xhtml
index e24ae6ce6a..7861df4c5f 100644
--- a/news/2009/news-20090120-02.it.xhtml
+++ b/news/2009/news-20090120-02.it.xhtml
@@ -56,7 +56,7 @@ Libero, sono temi centrali per la FSFE fin dalla sua fondazione nel 2001.</p>
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090120-02.nb.xhtml b/news/2009/news-20090120-02.nb.xhtml
index de362852a1..24a6b67029 100644
--- a/news/2009/news-20090120-02.nb.xhtml
+++ b/news/2009/news-20090120-02.nb.xhtml
@@ -42,7 +42,7 @@ utvikling av fri programvare.</p><p>Du finner mer informasjon om vårt arbeid og
   <translator>Andreas Tolf Tolfsen</translator>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090120-02.nl.xhtml b/news/2009/news-20090120-02.nl.xhtml
index 313d5d0213..8a64d2e89c 100644
--- a/news/2009/news-20090120-02.nl.xhtml
+++ b/news/2009/news-20090120-02.nl.xhtml
@@ -93,7 +93,7 @@
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090227-01.bg.xhtml b/news/2009/news-20090227-01.bg.xhtml
index 3593ab02a9..2c335ca12f 100644
--- a/news/2009/news-20090227-01.bg.xhtml
+++ b/news/2009/news-20090227-01.bg.xhtml
@@ -91,7 +91,7 @@ License. Това доведе до по-добър и технологично
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090227-01.el.xhtml b/news/2009/news-20090227-01.el.xhtml
index 4bd362d7bc..71f2135748 100644
--- a/news/2009/news-20090227-01.el.xhtml
+++ b/news/2009/news-20090227-01.el.xhtml
@@ -104,7 +104,7 @@ FSFE καλωσορίζει τη συμμετοχή οποιασδήποτε ε
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090227-01.en.xhtml b/news/2009/news-20090227-01.en.xhtml
index 16f7af9933..ef667bb319 100644
--- a/news/2009/news-20090227-01.en.xhtml
+++ b/news/2009/news-20090227-01.en.xhtml
@@ -120,7 +120,7 @@ FSFE.</p>
 	<tag key="policy"/>
 	<tag key="antitrust"/>
 	<tag key="microsoft"/>
-	<tag key="europeancommission">European Commission</tag>
+	<tag key="european-commission">European Commission</tag>
 </tags>
 
 </html>
diff --git a/news/2009/news-20090227-01.es.xhtml b/news/2009/news-20090227-01.es.xhtml
index d7590e5476..02e1ed3f16 100644
--- a/news/2009/news-20090227-01.es.xhtml
+++ b/news/2009/news-20090227-01.es.xhtml
@@ -110,7 +110,7 @@ Software Libre.
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090227-01.fr.xhtml b/news/2009/news-20090227-01.fr.xhtml
index b1770124c2..d0d38d9e1b 100644
--- a/news/2009/news-20090227-01.fr.xhtml
+++ b/news/2009/news-20090227-01.fr.xhtml
@@ -107,7 +107,7 @@ Retrouvez plus d'information sur le travail de la FSFE ici:
 </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090227-01.it.xhtml b/news/2009/news-20090227-01.it.xhtml
index 6100789f0f..87abb46b35 100644
--- a/news/2009/news-20090227-01.it.xhtml
+++ b/news/2009/news-20090227-01.it.xhtml
@@ -94,7 +94,7 @@ FSFE.</p>
   <translator>Federico Bruni</translator>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090227-01.nl.xhtml b/news/2009/news-20090227-01.nl.xhtml
index 678ff74427..da7740838a 100644
--- a/news/2009/news-20090227-01.nl.xhtml
+++ b/news/2009/news-20090227-01.nl.xhtml
@@ -151,7 +151,7 @@
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090728-01.de.xhtml b/news/2009/news-20090728-01.de.xhtml
index dcb6af2dd6..0e4d9f3bc8 100644
--- a/news/2009/news-20090728-01.de.xhtml
+++ b/news/2009/news-20090728-01.de.xhtml
@@ -109,7 +109,7 @@ wichtigsten Ziele der FSFE, die 2001 gegründet wurde.
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090728-01.el.xhtml b/news/2009/news-20090728-01.el.xhtml
index dfc1c3e824..a0ded347fa 100644
--- a/news/2009/news-20090728-01.el.xhtml
+++ b/news/2009/news-20090728-01.el.xhtml
@@ -97,7 +97,7 @@
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090728-01.en.xhtml b/news/2009/news-20090728-01.en.xhtml
index 7b24889d0e..1b6852a2a8 100644
--- a/news/2009/news-20090728-01.en.xhtml
+++ b/news/2009/news-20090728-01.en.xhtml
@@ -114,7 +114,7 @@ standards through control of server and client.</p>
 
 <tags>
 	<tag key="policy"/>
-	<tag key="europeancommission">European Commission</tag>
+	<tag key="european-commission">European Commission</tag>
 	<tag key="microsoft"/>
 	<tag key="antitrust"/>
 </tags>
diff --git a/news/2009/news-20090728-01.nl.xhtml b/news/2009/news-20090728-01.nl.xhtml
index 115ed1d4f6..513efb35ee 100644
--- a/news/2009/news-20090728-01.nl.xhtml
+++ b/news/2009/news-20090728-01.nl.xhtml
@@ -154,7 +154,7 @@
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20090728-01.tr.xhtml b/news/2009/news-20090728-01.tr.xhtml
index 7a29f2d8f5..5c8e5d8429 100644
--- a/news/2009/news-20090728-01.tr.xhtml
+++ b/news/2009/news-20090728-01.tr.xhtml
@@ -101,7 +101,7 @@ alanlarıdır.</p>
   <translator>Oğuzhan Öğreden</translator>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20091005-01.el.xhtml b/news/2009/news-20091005-01.el.xhtml
index 2f7be650d5..2d40991a9f 100644
--- a/news/2009/news-20091005-01.el.xhtml
+++ b/news/2009/news-20091005-01.el.xhtml
@@ -122,7 +122,7 @@ Office. Συνεπώς θεωρούμε ουσιαστικό, οποιοσδήπ
 </body>
 <tags>
   <tag key="policy"/>
-  <tag key="europeancommission">European Commission</tag>
+  <tag key="european-commission">European Commission</tag>
   <tag key="microsoft"/>
   <tag key="antitrust"/>
 </tags>
diff --git a/news/2009/news-20091005-01.en.xhtml b/news/2009/news-20091005-01.en.xhtml
index a8038f6ed3..81fa0d2355 100644
--- a/news/2009/news-20091005-01.en.xhtml
+++ b/news/2009/news-20091005-01.en.xhtml
@@ -119,7 +119,7 @@ input.</p>
 </body>
 <tags>
   <tag key="policy"/>
-  <tag key="europeancommission">European Commission</tag>
+  <tag key="european-commission">European Commission</tag>
   <tag key="microsoft"/>
   <tag key="antitrust"/>
 </tags>
diff --git a/news/2009/news-20091005-01.fr.xhtml b/news/2009/news-20091005-01.fr.xhtml
index 867d87bd17..a7249043ee 100644
--- a/news/2009/news-20091005-01.fr.xhtml
+++ b/news/2009/news-20091005-01.fr.xhtml
@@ -64,7 +64,7 @@
 </body>
 <tags>
   <tag key="policy"/>
-  <tag key="europeancommission">European Commission</tag>
+  <tag key="european-commission">European Commission</tag>
   <tag key="microsoft"/>
   <tag key="antitrust"/>
 </tags>
diff --git a/news/2009/news-20091005-01.it.xhtml b/news/2009/news-20091005-01.it.xhtml
index e02d2efdc6..dff156ed50 100644
--- a/news/2009/news-20091005-01.it.xhtml
+++ b/news/2009/news-20091005-01.it.xhtml
@@ -103,7 +103,7 @@ disponibili a fornire ulteriore supporto.</p>
 </body>
 <tags>
   <tag key="policy"/>
-  <tag key="europeancommission">European Commission</tag>
+  <tag key="european-commission">European Commission</tag>
   <tag key="microsoft"/>
   <tag key="antitrust"/>
 </tags>
diff --git a/news/2009/news-20091006-01.el.xhtml b/news/2009/news-20091006-01.el.xhtml
index 67827bd3f4..cfced1b181 100644
--- a/news/2009/news-20091006-01.el.xhtml
+++ b/news/2009/news-20091006-01.el.xhtml
@@ -52,7 +52,7 @@ Explorer στα λειτουργικά της συστήματα Windows, απο
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20091006-01.en.xhtml b/news/2009/news-20091006-01.en.xhtml
index 9a9c26823d..1cc92533f3 100644
--- a/news/2009/news-20091006-01.en.xhtml
+++ b/news/2009/news-20091006-01.en.xhtml
@@ -56,7 +56,7 @@ from making use of the information.
   
   <tags>
 	<tag key="policy"/>
-	<tag key="europeancommission">European Commission</tag>
+	<tag key="european-commission">European Commission</tag>
 	<tag key="microsoft"/>
 	<tag key="antitrust"/>
 </tags>
diff --git a/news/2009/news-20091006-01.nl.xhtml b/news/2009/news-20091006-01.nl.xhtml
index cef9eece0f..b81ccd532d 100644
--- a/news/2009/news-20091006-01.nl.xhtml
+++ b/news/2009/news-20091006-01.nl.xhtml
@@ -62,7 +62,7 @@
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20091006-01.tr.xhtml b/news/2009/news-20091006-01.tr.xhtml
index c47016c79a..3a96cd3de3 100644
--- a/news/2009/news-20091006-01.tr.xhtml
+++ b/news/2009/news-20091006-01.tr.xhtml
@@ -50,7 +50,7 @@ için Korku, Belirsizlik ve Şüphe üçlüsünden yararlanmasını engelleyecek
   <translator>Oğuzhan Öğreden</translator>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20091008-01.el.xhtml b/news/2009/news-20091008-01.el.xhtml
index 6a290c465e..919fa40058 100644
--- a/news/2009/news-20091008-01.el.xhtml
+++ b/news/2009/news-20091008-01.el.xhtml
@@ -61,7 +61,7 @@ Microsoft έχει πολλά παράθυρα για να ξεγλιστρήσ
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20091008-01.en.xhtml b/news/2009/news-20091008-01.en.xhtml
index d81f438444..b9ae6df4a1 100644
--- a/news/2009/news-20091008-01.en.xhtml
+++ b/news/2009/news-20091008-01.en.xhtml
@@ -69,7 +69,7 @@ competitive future.
   
  <tags>
 	<tag key="policy"/>
-	<tag key="europeancommission">European Commission</tag>
+	<tag key="european-commission">European Commission</tag>
 	<tag key="microsoft"/>
 	<tag key="antitrust"/>
 </tags>
diff --git a/news/2009/news-20091008-01.fr.xhtml b/news/2009/news-20091008-01.fr.xhtml
index 4fa38eaef2..905f835861 100644
--- a/news/2009/news-20091008-01.fr.xhtml
+++ b/news/2009/news-20091008-01.fr.xhtml
@@ -32,7 +32,7 @@ Dans les semaines à venir, La FSFE va analyser l'engagement de Microsoft en dé
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20091008-01.nl.xhtml b/news/2009/news-20091008-01.nl.xhtml
index 0f0186c23a..17c7522538 100644
--- a/news/2009/news-20091008-01.nl.xhtml
+++ b/news/2009/news-20091008-01.nl.xhtml
@@ -73,7 +73,7 @@
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20091109-02.de.xhtml b/news/2009/news-20091109-02.de.xhtml
index eca2a5f5b6..aba7506082 100644
--- a/news/2009/news-20091109-02.de.xhtml
+++ b/news/2009/news-20091109-02.de.xhtml
@@ -33,9 +33,9 @@ führen."</p>
   </body>
   <tags>
     <tag key="eif"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
   </tags>
 </html>
 <!--
diff --git a/news/2009/news-20091109-02.el.xhtml b/news/2009/news-20091109-02.el.xhtml
index d1593b8da5..338564ba73 100644
--- a/news/2009/news-20091109-02.el.xhtml
+++ b/news/2009/news-20091109-02.el.xhtml
@@ -28,9 +28,9 @@
   </body>
   <tags>
     <tag key="eif"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
   </tags>
 </html>
 <!--
diff --git a/news/2009/news-20091109-02.en.xhtml b/news/2009/news-20091109-02.en.xhtml
index 4d450d85b6..41b65f6e1d 100644
--- a/news/2009/news-20091109-02.en.xhtml
+++ b/news/2009/news-20091109-02.en.xhtml
@@ -41,8 +41,8 @@ Member States and the European Commission."</p>
 <tags>
 	<tag key="policy"/>
 	<tag key="eif"/>
-	<tag key="europeancommission">European Commission</tag>
-	<tag key="publicadministration">Public Administration</tag>
+	<tag key="european-commission">European Commission</tag>
+	<tag key="public-administration">Public Administration</tag>
 </tags>
 
 </html>
diff --git a/news/2009/news-20091216-01.de.xhtml b/news/2009/news-20091216-01.de.xhtml
index d87c330505..8515d66283 100644
--- a/news/2009/news-20091216-01.de.xhtml
+++ b/news/2009/news-20091216-01.de.xhtml
@@ -53,7 +53,7 @@ Freie Software gibt."
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20091216-01.el.xhtml b/news/2009/news-20091216-01.el.xhtml
index 9cc851469f..69dfac9f5f 100644
--- a/news/2009/news-20091216-01.el.xhtml
+++ b/news/2009/news-20091216-01.el.xhtml
@@ -51,7 +51,7 @@
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20091216-01.en.xhtml b/news/2009/news-20091216-01.en.xhtml
index d8e1b8e888..714edc9427 100644
--- a/news/2009/news-20091216-01.en.xhtml
+++ b/news/2009/news-20091216-01.en.xhtml
@@ -64,7 +64,7 @@ doesn't improve things for Free Software."
 
 <tags>
 	<tag key="policy"/>
-	<tag key="europeancommission">European Commission</tag>
+	<tag key="european-commission">European Commission</tag>
 	<tag key="microsoft"/>
 	<tag key="antitrust"/>
 </tags>
diff --git a/news/2009/news-20091216-01.fr.xhtml b/news/2009/news-20091216-01.fr.xhtml
index 1c8d570895..4701deed4f 100644
--- a/news/2009/news-20091216-01.fr.xhtml
+++ b/news/2009/news-20091216-01.fr.xhtml
@@ -19,7 +19,7 @@
   <translator>Hugo Roy, Nicolas JEAN, Jil Larner (Mont Blanc, France)</translator>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2009/news-20091216-01.nl.xhtml b/news/2009/news-20091216-01.nl.xhtml
index 0c86516d61..42fe562fbb 100644
--- a/news/2009/news-20091216-01.nl.xhtml
+++ b/news/2009/news-20091216-01.nl.xhtml
@@ -69,7 +69,7 @@
   </body>
   <tags>
     <tag key="antitrust"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="microsoft"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2010/news-20100330-01.de.xhtml b/news/2010/news-20100330-01.de.xhtml
index 7f5235f9be..7008edf3a3 100644
--- a/news/2010/news-20100330-01.de.xhtml
+++ b/news/2010/news-20100330-01.de.xhtml
@@ -38,7 +38,7 @@
   <translator>Andreas Aubele</translator>
   <tags>
     <tag key="eif"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2010/news-20100330-01.el.xhtml b/news/2010/news-20100330-01.el.xhtml
index 859516230b..2397f19177 100644
--- a/news/2010/news-20100330-01.el.xhtml
+++ b/news/2010/news-20100330-01.el.xhtml
@@ -36,7 +36,7 @@
   </body>
   <tags>
     <tag key="eif"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2010/news-20100330-01.en.xhtml b/news/2010/news-20100330-01.en.xhtml
index 97ff1f67da..beb89c57a8 100644
--- a/news/2010/news-20100330-01.en.xhtml
+++ b/news/2010/news-20100330-01.en.xhtml
@@ -48,7 +48,7 @@
   
   <tags>
 	<tag key="eif"/>
-	<tag key="europeancommission">European Commission</tag>
+	<tag key="european-commission">European Commission</tag>
 	<tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2010/news-20100330-01.nb.xhtml b/news/2010/news-20100330-01.nb.xhtml
index 4083484283..46fc08e08b 100644
--- a/news/2010/news-20100330-01.nb.xhtml
+++ b/news/2010/news-20100330-01.nb.xhtml
@@ -40,7 +40,7 @@
   <translator>Cato Auestad</translator>
   <tags>
     <tag key="eif"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2010/news-20100330-01.ru.xhtml b/news/2010/news-20100330-01.ru.xhtml
index 1b8ed20274..fe7cb56b23 100644
--- a/news/2010/news-20100330-01.ru.xhtml
+++ b/news/2010/news-20100330-01.ru.xhtml
@@ -29,7 +29,7 @@
   </body>
   <tags>
     <tag key="eif"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2010/news-20100519-01.el.xhtml b/news/2010/news-20100519-01.el.xhtml
index ad47c30f74..6859680f9f 100644
--- a/news/2010/news-20100519-01.el.xhtml
+++ b/news/2010/news-20100519-01.el.xhtml
@@ -48,7 +48,7 @@
   </body>
   <translator> </translator>
   <tags>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2010/news-20100519-01.en.xhtml b/news/2010/news-20100519-01.en.xhtml
index 8b9a146021..cc72c581f3 100644
--- a/news/2010/news-20100519-01.en.xhtml
+++ b/news/2010/news-20100519-01.en.xhtml
@@ -54,7 +54,7 @@
   </body>
   
   <tags>
-	<tag key="europeancommission">European Commission</tag>
+	<tag key="european-commission">European Commission</tag>
 	<tag key="policy"/>
   </tags>
   
diff --git a/news/2010/news-20100803-01.de.xhtml b/news/2010/news-20100803-01.de.xhtml
index c79faf1fdc..c1d3355bf8 100644
--- a/news/2010/news-20100803-01.de.xhtml
+++ b/news/2010/news-20100803-01.de.xhtml
@@ -66,6 +66,6 @@ Kommunikation mit Freier Software zu schützen.</p>
     <tag key="dfd">Document Freedom Day</tag>
     <tag key="openstandards">Offene Standards</tag>
     <tag key="policy"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
   </tags>
 </html>
diff --git a/news/2010/news-20100803-01.en.xhtml b/news/2010/news-20100803-01.en.xhtml
index de6dc2bcc5..85dbb221d0 100644
--- a/news/2010/news-20100803-01.en.xhtml
+++ b/news/2010/news-20100803-01.en.xhtml
@@ -72,6 +72,6 @@ German citizens' right to communicate using Free Software.</p>
 		<tag key="dfd">Document Freedom Day</tag>
 		<tag key="openstandards">Open Standards</tag>
 		<tag key="policy"/>
-		<tag key="publicadministration">Public Administration</tag>
+		<tag key="public-administration">Public Administration</tag>
 	</tags>
 </html>
diff --git a/news/2010/news-20101207-01.de.xhtml b/news/2010/news-20101207-01.de.xhtml
index e0c1d2d1ce..f4a73ac16c 100644
--- a/news/2010/news-20101207-01.de.xhtml
+++ b/news/2010/news-20101207-01.de.xhtml
@@ -71,7 +71,7 @@ Punkten nicht gerecht. Es schadet der Glaubwürdigkeit der Kommission.“</p>
   </body>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
   <translator>Markus Enzenberger</translator>
diff --git a/news/2010/news-20101207-01.el.xhtml b/news/2010/news-20101207-01.el.xhtml
index 741b8a4ce6..6d342f5a46 100644
--- a/news/2010/news-20101207-01.el.xhtml
+++ b/news/2010/news-20101207-01.el.xhtml
@@ -91,7 +91,7 @@ Gerloff, Πρόεδρος του Ευρωπαϊκού Ιδρύματος Ελε
   </body>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2010/news-20101207-01.en.xhtml b/news/2010/news-20101207-01.en.xhtml
index f6ee7efc8e..9296ab9f71 100644
--- a/news/2010/news-20101207-01.en.xhtml
+++ b/news/2010/news-20101207-01.en.xhtml
@@ -61,7 +61,7 @@ proprietary software and related services<a class="fn" href="#refs">1</a>.</p>
     <tags>
       <tag key="front-page"/>
       <tag key="policy"/>
-      <tag key="europeancommission">European Commission</tag>
+      <tag key="european-commission">European Commission</tag>
     </tags>
 </html>
 
diff --git a/news/2010/news-20101207-01.fr.xhtml b/news/2010/news-20101207-01.fr.xhtml
index 69c7ce9e7b..ec1e1b8279 100644
--- a/news/2010/news-20101207-01.fr.xhtml
+++ b/news/2010/news-20101207-01.fr.xhtml
@@ -36,7 +36,7 @@
   </body>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2010/news-20101216-01.de.xhtml b/news/2010/news-20101216-01.de.xhtml
index c53a6e2e76..579e1db851 100644
--- a/news/2010/news-20101216-01.de.xhtml
+++ b/news/2010/news-20101216-01.de.xhtml
@@ -69,7 +69,7 @@ aktualisiert, um die endgültige Fassung des Dokuments darzustellen.</p>
   <tags>
     <tag key="front-page"/>
     <tag key="eif"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
   <translator>Markus Enzenberger</translator>
diff --git a/news/2010/news-20101216-01.el.xhtml b/news/2010/news-20101216-01.el.xhtml
index 98b9539d25..c1151224eb 100644
--- a/news/2010/news-20101216-01.el.xhtml
+++ b/news/2010/news-20101216-01.el.xhtml
@@ -72,7 +72,7 @@ EIFv2. Ο πίνακας ενημερώνεται για να απεικονίσ
   <tags>
     <tag key="front-page"/>
     <tag key="eif"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2010/news-20101216-01.en.xhtml b/news/2010/news-20101216-01.en.xhtml
index 0af3eb9856..62a13d5073 100644
--- a/news/2010/news-20101216-01.en.xhtml
+++ b/news/2010/news-20101216-01.en.xhtml
@@ -38,7 +38,7 @@ The document's definition of "open specifications" demands that such standards m
     <tags>
       <tag key="front-page"/>
 	<tag key="eif"/>
-	<tag key="europeancommission">European Commission</tag>
+	<tag key="european-commission">European Commission</tag>
 	<tag key="policy"/>
     </tags>
 </html>
diff --git a/news/2010/news-20101216-01.fr.xhtml b/news/2010/news-20101216-01.fr.xhtml
index 70a4117caa..0dadb023a7 100644
--- a/news/2010/news-20101216-01.fr.xhtml
+++ b/news/2010/news-20101216-01.fr.xhtml
@@ -53,7 +53,7 @@ la version finale du document.</p>
   <tags>
     <tag key="front-page"/>
     <tag key="eif"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="policy"/>
   </tags>
   <translator>Schnouki, maelle</translator>
diff --git a/news/2011/news-20110209-01.en.xhtml b/news/2011/news-20110209-01.en.xhtml
index 329da66c24..84c9152747 100644
--- a/news/2011/news-20110209-01.en.xhtml
+++ b/news/2011/news-20110209-01.en.xhtml
@@ -86,7 +86,7 @@
   <tags>
     <tag key="front-page"/>
     <tag key="policy"/>
-    <tag key="europeanparliament">European Parliament</tag>
+    <tag key="european-parliament">European Parliament</tag>
     <tag key="patents">Software Patents</tag>
   </tags>
 </html>
diff --git a/news/2011/news-20110209-01.fr.xhtml b/news/2011/news-20110209-01.fr.xhtml
index 1f8b6df52d..5b5edd323b 100644
--- a/news/2011/news-20110209-01.fr.xhtml
+++ b/news/2011/news-20110209-01.fr.xhtml
@@ -75,7 +75,7 @@
   </body>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeanparliament"/>
+    <tag key="european-parliament"/>
     <tag key="patents"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2011/news-20110209-01.it.xhtml b/news/2011/news-20110209-01.it.xhtml
index bcf24a4f23..e4efafe7ca 100644
--- a/news/2011/news-20110209-01.it.xhtml
+++ b/news/2011/news-20110209-01.it.xhtml
@@ -70,7 +70,7 @@
   </body>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeanparliament"/>
+    <tag key="european-parliament"/>
     <tag key="patents"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2011/news-20110301-02.en.xml b/news/2011/news-20110301-02.en.xml
index fcfe954c07..1179058438 100644
--- a/news/2011/news-20110301-02.en.xml
+++ b/news/2011/news-20110301-02.en.xml
@@ -14,7 +14,7 @@
     <tags>
       <tag key="gb"/>
       <tag key="openstandards"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </news>
 </newsset>
diff --git a/news/2011/news-20110301-03.en.xml b/news/2011/news-20110301-03.en.xml
index 2d7c567e20..7929509763 100644
--- a/news/2011/news-20110301-03.en.xml
+++ b/news/2011/news-20110301-03.en.xml
@@ -14,7 +14,7 @@
     <tags>
       <tag key="gb"/>
       <tag key="openstandards"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </news>
 </newsset>
diff --git a/news/2011/news-20110301-04.en.xml b/news/2011/news-20110301-04.en.xml
index a29eebc1f2..da0a737ff0 100644
--- a/news/2011/news-20110301-04.en.xml
+++ b/news/2011/news-20110301-04.en.xml
@@ -14,7 +14,7 @@
     <tags>
       <tag key="gb"/>
       <tag key="openstandards"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
     </tags>
   </news>
 </newsset>
diff --git a/news/2011/news-20110327-01.en.xml b/news/2011/news-20110327-01.en.xml
index 139e07bd85..f6da97b9b0 100644
--- a/news/2011/news-20110327-01.en.xml
+++ b/news/2011/news-20110327-01.en.xml
@@ -15,7 +15,7 @@
       <tag key="gb"/>
       <tag key="front-page"/>
       <tag key="openstandards"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
       <tag key="procurement"/>
       <tag key="eif"/>
     </tags>
diff --git a/news/2011/news-20110330-04.en.xhtml b/news/2011/news-20110330-04.en.xhtml
index d786c9e981..024f048067 100644
--- a/news/2011/news-20110330-04.en.xhtml
+++ b/news/2011/news-20110330-04.en.xhtml
@@ -28,7 +28,7 @@
     <tag key="dfd"/>
     <tag key="openstandards"/>
     <tag key="policy"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
   </tags>
 </html>
 <!--
diff --git a/news/2011/news-20110418-01.en.xhtml b/news/2011/news-20110418-01.en.xhtml
index d279431ff7..f49fff825f 100644
--- a/news/2011/news-20110418-01.en.xhtml
+++ b/news/2011/news-20110418-01.en.xhtml
@@ -56,7 +56,7 @@ FSFE emphasises the following points:
   </body>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="openstandards"/>
     <tag key="procurement"/>
     <tag key="policy"/>
diff --git a/news/2011/news-20110502-01.en.xhtml b/news/2011/news-20110502-01.en.xhtml
index 2a6563e86b..909efbbc04 100644
--- a/news/2011/news-20110502-01.en.xhtml
+++ b/news/2011/news-20110502-01.en.xhtml
@@ -48,7 +48,7 @@ In March, FSFE <a href="/news/2011/news-20110321-01.en.html">announced its suppo
   </body>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="windows-tax"/>
     </tags>
 </html>
diff --git a/news/2011/news-20110518-01.en.xml b/news/2011/news-20110518-01.en.xml
index da7f4c9b43..b813233b77 100644
--- a/news/2011/news-20110518-01.en.xml
+++ b/news/2011/news-20110518-01.en.xml
@@ -15,7 +15,7 @@
       <tag key="gb"/>
       <tag key="front-page"/>
       <tag key="policy"/>
-      <tag key="publicadministration"/>
+      <tag key="public-administration"/>
       <tag key="procurement"/>
     </tags>
   </news>
diff --git a/news/2011/news-20110523-01.en.xhtml b/news/2011/news-20110523-01.en.xhtml
index bf6f7d48d4..4c9a79d24d 100644
--- a/news/2011/news-20110523-01.en.xhtml
+++ b/news/2011/news-20110523-01.en.xhtml
@@ -44,7 +44,7 @@
     <tag key="patents">Software Patents</tag>
     <tag key="microsoft"/>
     <tag key="european-union"/>
-    <tag key="ecj"/>
+    <tag key="european-court-justice"/>
 
   </tags>
 
diff --git a/news/2011/news-20110523-01.hr.xhtml b/news/2011/news-20110523-01.hr.xhtml
index 83e021434b..bdd1a3ea53 100644
--- a/news/2011/news-20110523-01.hr.xhtml
+++ b/news/2011/news-20110523-01.hr.xhtml
@@ -28,7 +28,7 @@
     <tag key="front-page"/>
     <tag key="patents"/>
     <tag key="european-union"/>
-    <tag key="ecj"/>
+    <tag key="european-court-justice"/>
     <tag key="microsoft"/>
     <tag key="samba"/>
   </tags>
diff --git a/news/2011/news-20110525-01.en.xhtml b/news/2011/news-20110525-01.en.xhtml
index 533480c38a..11a312ca7a 100644
--- a/news/2011/news-20110525-01.en.xhtml
+++ b/news/2011/news-20110525-01.en.xhtml
@@ -101,7 +101,7 @@
   <tags>
     <tag key="front-page"/>
     <tag key="samba"/>
-    <tag key="ecj"/>
+    <tag key="european-court-justice"/>
     <tag key="patents">Software Patents</tag>
     <tag key="microsoft"/>
     <tag key="microsoft"/>
diff --git a/news/2011/news-20111128-02.en.xhtml b/news/2011/news-20111128-02.en.xhtml
index d391e06166..fdad171a57 100644
--- a/news/2011/news-20111128-02.en.xhtml
+++ b/news/2011/news-20111128-02.en.xhtml
@@ -174,7 +174,7 @@ The new well thought-out framework project should ensure that there will be oppo
   </body>
   <tags>
   <tag key="policy">Policy</tag>
-  <tag key="openscience">Open Science</tag>
+  <tag key="open-science">Open Science</tag>
   <tag key="horizon2020">Horizon 2020</tag>
   </tags>
 </html>
diff --git a/news/2011/news-20111206-01.en.xhtml b/news/2011/news-20111206-01.en.xhtml
index 5888a57264..14c80cd302 100644
--- a/news/2011/news-20111206-01.en.xhtml
+++ b/news/2011/news-20111206-01.en.xhtml
@@ -54,7 +54,7 @@ the interest of Europe's citizens.
   <tag key="european-union"/>
 
   <tag key="policy"/>
-  <tag key="europeancommission">European Commission</tag>
+  <tag key="european-commission">European Commission</tag>
 </tags>
 
 </html>
diff --git a/news/2012/news-20120412-01.el.xhtml b/news/2012/news-20120412-01.el.xhtml
index 7fa6ce5967..1f1e1fc78e 100644
--- a/news/2012/news-20120412-01.el.xhtml
+++ b/news/2012/news-20120412-01.el.xhtml
@@ -103,7 +103,7 @@ gerloff@fsfe.org<br/>
   <tags>
     <tag key="front-page"/>
     <tag key="fi"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
     <tag key="helsinki"/>
     <tag key="office-suites"/>
   </tags>
diff --git a/news/2012/news-20120412-01.en.xhtml b/news/2012/news-20120412-01.en.xhtml
index e705e7432e..510f627af9 100644
--- a/news/2012/news-20120412-01.en.xhtml
+++ b/news/2012/news-20120412-01.en.xhtml
@@ -57,7 +57,7 @@ gerloff@fsfe.org<br/>
   <tags>
     <tag key="front-page"/>
     <tag key="fi"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
     <tag key="helsinki"/>
     <tag key="office-suites"/>
   </tags>
diff --git a/news/2012/news-20120412-01.fi.xhtml b/news/2012/news-20120412-01.fi.xhtml
index a56354281b..7780f66d97 100644
--- a/news/2012/news-20120412-01.fi.xhtml
+++ b/news/2012/news-20120412-01.fi.xhtml
@@ -56,7 +56,7 @@ gerloff@fsfe.org<br/>
   <tags>
     <tag key="front-page"/>
     <tag key="fi"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
     <tag key="helsinki"/>
     <tag key="office-suites"/>
   </tags>
diff --git a/news/2012/news-20120412-01.fr.xhtml b/news/2012/news-20120412-01.fr.xhtml
index 4f836f3591..f623d19809 100644
--- a/news/2012/news-20120412-01.fr.xhtml
+++ b/news/2012/news-20120412-01.fr.xhtml
@@ -96,7 +96,7 @@ gerloff@fsfe.org<br/>
   <tags>
     <tag key="front-page"/>
     <tag key="fi"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
     <tag key="helsinki"/>
     <tag key="office-suites"/>
   </tags>
diff --git a/news/2012/news-20120412-01.it.xhtml b/news/2012/news-20120412-01.it.xhtml
index fefdeec1a1..2664a019ed 100644
--- a/news/2012/news-20120412-01.it.xhtml
+++ b/news/2012/news-20120412-01.it.xhtml
@@ -71,7 +71,7 @@ gerloff@fsfe.org<br/>
   <tags>
     <tag key="front-page"/>
     <tag key="fi"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
     <tag key="helsinki"/>
     <tag key="office-suites"/>
   </tags>
diff --git a/news/2012/news-20120412-02.en.xhtml b/news/2012/news-20120412-02.en.xhtml
index be6e239e93..e39aeed469 100644
--- a/news/2012/news-20120412-02.en.xhtml
+++ b/news/2012/news-20120412-02.en.xhtml
@@ -80,7 +80,7 @@
 
   <tags>
     <tag key="fi"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
     <tag key="helsinki"/>
     <tag key="office-suites"/>
   </tags>
diff --git a/news/2012/news-20120412-02.fr.xhtml b/news/2012/news-20120412-02.fr.xhtml
index bdb1e03168..26ede4744d 100644
--- a/news/2012/news-20120412-02.fr.xhtml
+++ b/news/2012/news-20120412-02.fr.xhtml
@@ -215,7 +215,7 @@ logiciel libre</a> plutôt que d'«&#160;open source&#160;»</p>
 
   <tags>
     <tag key="fi"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
     <tag key="helsinki"/>
     <tag key="office-suites"/>
   </tags>
diff --git a/news/2012/news-20120525-01.el.xhtml b/news/2012/news-20120525-01.el.xhtml
index eb34847797..80502358bd 100644
--- a/news/2012/news-20120525-01.el.xhtml
+++ b/news/2012/news-20120525-01.el.xhtml
@@ -55,7 +55,7 @@
   </body>
   <tags>
     <tag key="fr"/>
-    <tag key="electronicvoting"/>
+    <tag key="electronic-voting"/>
     <tag key="fr"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2012/news-20120525-01.en.xhtml b/news/2012/news-20120525-01.en.xhtml
index f0ebd0a98b..79320199ad 100644
--- a/news/2012/news-20120525-01.en.xhtml
+++ b/news/2012/news-20120525-01.en.xhtml
@@ -39,7 +39,7 @@
 
   <tags>
     <tag key="fr"/>
-    <tag key="electronicvoting"/>
+    <tag key="electronic-voting"/>
     <tag key="fr"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2012/news-20120525-01.fr.xhtml b/news/2012/news-20120525-01.fr.xhtml
index 471525c5c8..97f0fd41ea 100644
--- a/news/2012/news-20120525-01.fr.xhtml
+++ b/news/2012/news-20120525-01.fr.xhtml
@@ -23,7 +23,7 @@
   <tags>
     <tag key="fr"/>
     <tag key="fr"/>
-    <tag key="electronicvoting">Vote électronique</tag>
+    <tag key="electronic-voting">Vote électronique</tag>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2012/news-20120528-01.en.xhtml b/news/2012/news-20120528-01.en.xhtml
index b96e4c5c10..6a769b5cbc 100644
--- a/news/2012/news-20120528-01.en.xhtml
+++ b/news/2012/news-20120528-01.en.xhtml
@@ -41,7 +41,7 @@
 		<tag key="gb"/>
 		<tag key="openstandards"/>
 
-		<tag key="publicadministration"/>    
+		<tag key="public-administration"/>    
 		<tag key="policy"/>
 	</tags>
 	
diff --git a/news/2012/news-20120627-01.de.xhtml b/news/2012/news-20120627-01.de.xhtml
index 6291ef6c1f..3ee3870c18 100644
--- a/news/2012/news-20120627-01.de.xhtml
+++ b/news/2012/news-20120627-01.de.xhtml
@@ -128,7 +128,7 @@ auf <a href="/press">https://fsfe.org/press</a>.</p>
  <tags>
   <tag key="front-page"/>
   <tag key="microsoft"/>
-  <tag key="ecj"/>
+  <tag key="european-court-justice"/>
   <tag key="legal"/>
   <tag key="antitrust"/>
  </tags>
diff --git a/news/2012/news-20120627-01.en.xhtml b/news/2012/news-20120627-01.en.xhtml
index 911de65360..11e4ffa203 100644
--- a/news/2012/news-20120627-01.en.xhtml
+++ b/news/2012/news-20120627-01.en.xhtml
@@ -132,7 +132,7 @@ gerloff@fsfe.org<br/>
  <tags>
   <tag key="front-page"/>
   <tag key="microsoft"/>
-  <tag key="ecj"/>
+  <tag key="european-court-justice"/>
   <tag key="legal"/>
   <tag key="antitrust"/>
  </tags>
diff --git a/news/2012/news-20120627-01.it.xhtml b/news/2012/news-20120627-01.it.xhtml
index a6170f69fd..d3788e0a73 100644
--- a/news/2012/news-20120627-01.it.xhtml
+++ b/news/2012/news-20120627-01.it.xhtml
@@ -234,7 +234,7 @@ href="/press">https://fsfe.org/press</a>.</p>
  <tags>
   <tag key="front-page"/>
   <tag key="microsoft"/>
-  <tag key="ecj"/>
+  <tag key="european-court-justice"/>
   <tag key="legal"/>
   <tag key="antitrust"/>
  </tags>
diff --git a/news/2012/news-20120918-01.de.xhtml b/news/2012/news-20120918-01.de.xhtml
index 5efb75cf2e..cb63f3a8b1 100644
--- a/news/2012/news-20120918-01.de.xhtml
+++ b/news/2012/news-20120918-01.de.xhtml
@@ -66,6 +66,6 @@ Marco Schulze - Bundesverband des Informations- und Kommunikationstechnologie</p
 </body>
  <tags>
   <tag key="de"/>
-  <tag key="publicadministration"/>
+  <tag key="public-administration"/>
  </tags>
 </html>
diff --git a/news/2012/news-20121101-02.en.xhtml b/news/2012/news-20121101-02.en.xhtml
index b6947de0c9..249534c294 100644
--- a/news/2012/news-20121101-02.en.xhtml
+++ b/news/2012/news-20121101-02.en.xhtml
@@ -56,7 +56,7 @@ Exit costs are another issue where the policy represents significant progress. I
   <tag key="front-page"/>
   <tag key="gb"/>
   <tag key="openstandards"/>
-  <tag key="publicadministration"/>
+  <tag key="public-administration"/>
   <tag key="policy"/>
  </tags>
 </html>
diff --git a/news/2012/news-20121116-01.de.xhtml b/news/2012/news-20121116-01.de.xhtml
index 5ac319c0a0..caf4f45f2b 100644
--- a/news/2012/news-20121116-01.de.xhtml
+++ b/news/2012/news-20121116-01.de.xhtml
@@ -216,6 +216,6 @@ Jacqueline Rahemipour - Vorstandsmitglied des Freies Office Deutschland e.V.</p>
 </body>
  <tags>
   <tag key="de"/>
-  <tag key="publicadministration"/>
+  <tag key="public-administration"/>
  </tags>
 </html>
diff --git a/news/2012/news-20121122-01.en.xhtml b/news/2012/news-20121122-01.en.xhtml
index 58e28a5d89..7be6896d52 100644
--- a/news/2012/news-20121122-01.en.xhtml
+++ b/news/2012/news-20121122-01.en.xhtml
@@ -53,7 +53,7 @@ address this problem, and they agreed to work on this.</p>
       <tag key="pdfreaders"/>
       <tag key="fundraising"/> 
       <tag key="policy"/>
-      <tag key="publicadministration">Public Administration</tag>
+      <tag key="public-administration">Public Administration</tag>
  </tags>
 </html>
 
diff --git a/news/2012/news-20121208-01.en.xhtml b/news/2012/news-20121208-01.en.xhtml
index 8ec6af8855..b4f8a38ad2 100644
--- a/news/2012/news-20121208-01.en.xhtml
+++ b/news/2012/news-20121208-01.en.xhtml
@@ -126,6 +126,6 @@ should heed the age-old principle: First, do no harm.
       <tag key="patents">Software Patents</tag>
       <tag key="european-union"/>
       <tag key="policy"/>
-      <tag key="europeanparliament">European Parliament</tag>
+      <tag key="european-parliament">European Parliament</tag>
  </tags>
 </html>
diff --git a/news/2012/news-20121211-01.en.xhtml b/news/2012/news-20121211-01.en.xhtml
index c87d6a4f3e..c39d394b7f 100644
--- a/news/2012/news-20121211-01.en.xhtml
+++ b/news/2012/news-20121211-01.en.xhtml
@@ -93,6 +93,6 @@ in at any time."
       <tag key="patents">Software Patents</tag>
       <tag key="european-union"/>
       <tag key="policy"/>
-      <tag key="europeanparliament">European Parliament</tag>
+      <tag key="european-parliament">European Parliament</tag>
  </tags>
 </html>
diff --git a/news/2012/news-20121211-01.es.xhtml b/news/2012/news-20121211-01.es.xhtml
index 140b21d447..8f8b0a5909 100644
--- a/news/2012/news-20121211-01.es.xhtml
+++ b/news/2012/news-20121211-01.es.xhtml
@@ -61,7 +61,7 @@ Según <a href="http://www.europarl.europa.eu/news/en/pressroom/content/20121210
     <tag key="front-page"/>
     <tag key="patents"/>
     <tag key="european-union"/>
-    <tag key="europeanparliament"/>
+    <tag key="european-parliament"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2012/news-20121211-01.fi.xhtml b/news/2012/news-20121211-01.fi.xhtml
index f49af49b53..c3ba06ca2c 100644
--- a/news/2012/news-20121211-01.fi.xhtml
+++ b/news/2012/news-20121211-01.fi.xhtml
@@ -43,7 +43,7 @@ gerloff@fsfe.org<br/>
     <tag key="front-page"/>
     <tag key="patents"/>
     <tag key="european-union"/>
-    <tag key="europeanparliament"/>
+    <tag key="european-parliament"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2012/news-20121211-01.fr.xhtml b/news/2012/news-20121211-01.fr.xhtml
index f9a7717e7d..a3138ef3c1 100644
--- a/news/2012/news-20121211-01.fr.xhtml
+++ b/news/2012/news-20121211-01.fr.xhtml
@@ -94,7 +94,7 @@ sont jusqu'à présent en dehors du nouveau régime, mais elles pourront partici
     <tag key="front-page"/>
     <tag key="patents"/>
     <tag key="european-union"/>
-    <tag key="europeanparliament"/>
+    <tag key="european-parliament"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2013/news-20130312-01.en.xhtml b/news/2013/news-20130312-01.en.xhtml
index 21dd1780ff..a620656d2b 100644
--- a/news/2013/news-20130312-01.en.xhtml
+++ b/news/2013/news-20130312-01.en.xhtml
@@ -21,7 +21,7 @@
 	<tags>
 		<tag key="front-page"/>
 		<tag key="policy"/>
-		<tag key="europeancommission">European Commission</tag>
+		<tag key="european-commission">European Commission</tag>
 		<tag key="microsoft"/>
 		<tag key="antitrust"/>
 	</tags>
diff --git a/news/2013/news-20130312-01.sq.xhtml b/news/2013/news-20130312-01.sq.xhtml
index 7b359dca7d..35cf089177 100644
--- a/news/2013/news-20130312-01.sq.xhtml
+++ b/news/2013/news-20130312-01.sq.xhtml
@@ -21,7 +21,7 @@
 	<tags>
 		<tag key="front-page"/>
 		<tag key="policy">Politika</tag>
-	        <tag key="europeancommission">Komisioni Europian</tag>
+	        <tag key="european-commission">Komisioni Europian</tag>
 		<tag key="microsoft"/>
                 <tag key="antitrust">Antitrust</tag>
 	</tags>
diff --git a/news/2013/news-20130620-01.en.xhtml b/news/2013/news-20130620-01.en.xhtml
index fe029e33af..35c6e5fc26 100644
--- a/news/2013/news-20130620-01.en.xhtml
+++ b/news/2013/news-20130620-01.en.xhtml
@@ -59,7 +59,7 @@
 		<tag key="google"/>
 		<tag key="education"/>
 		<tag key="fya"/>
-		<tag key="openletter"/>
+		<tag key="open-letter"/>
 		<tag key="tr"/>
 		<tag key="policy"/>
 		
diff --git a/news/2013/news-20130620-01.sq.xhtml b/news/2013/news-20130620-01.sq.xhtml
index 9fb33bd0d5..5905aa9947 100644
--- a/news/2013/news-20130620-01.sq.xhtml
+++ b/news/2013/news-20130620-01.sq.xhtml
@@ -59,7 +59,7 @@
 		<tag key="google"/>
 		<tag key="education">Arsim</tag>
 		<tag key="fya"/>
-		<tag key="openletter">Letër e Hapur</tag>
+		<tag key="open-letter">Letër e Hapur</tag>
 		<tag key="tr">Turqi</tag>
 		<tag key="policy">Politika</tag>
 		
diff --git a/news/2013/news-20130620-01.tr.xhtml b/news/2013/news-20130620-01.tr.xhtml
index faf9e3ecd3..379d69b4fe 100644
--- a/news/2013/news-20130620-01.tr.xhtml
+++ b/news/2013/news-20130620-01.tr.xhtml
@@ -36,7 +36,7 @@
     <tag key="google"/>
     <tag key="education"/>
     <tag key="fya"/>
-    <tag key="openletter"/>
+    <tag key="open-letter"/>
     <tag key="tr"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2013/news-20130703-01.de.xhtml b/news/2013/news-20130703-01.de.xhtml
index 070f452da1..17d19f8133 100644
--- a/news/2013/news-20130703-01.de.xhtml
+++ b/news/2013/news-20130703-01.de.xhtml
@@ -180,7 +180,7 @@
     <tag key="front-page"/>
     <tag key="ayc"/>
     <tag key="de"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2013/news-20130703-01.en.xhtml b/news/2013/news-20130703-01.en.xhtml
index a08b29989d..3d2eee91e3 100644
--- a/news/2013/news-20130703-01.en.xhtml
+++ b/news/2013/news-20130703-01.en.xhtml
@@ -234,7 +234,7 @@
     <tag key="ayc"/>
     <tag key="de"/>
     <tag key="policy"/>    
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
   </tags>
   <translator>Martin Gollowitzer</translator>
 </html>
diff --git a/news/2013/news-20130703-01.sq.xhtml b/news/2013/news-20130703-01.sq.xhtml
index e2d4d95492..948685f9a1 100644
--- a/news/2013/news-20130703-01.sq.xhtml
+++ b/news/2013/news-20130703-01.sq.xhtml
@@ -241,7 +241,7 @@
     <tag key="ayc">Pyetni Kandidatët Tuaj</tag>
     <tag key="de"/>
     <tag key="policy">Politika</tag>
-    <tag key="publicadministration">Administratë Publike</tag>
+    <tag key="public-administration">Administratë Publike</tag>
   </tags>
   <translator>Martin Gollowitzer</translator>
 </html>
diff --git a/news/2013/news-20130716-01.en.xhtml b/news/2013/news-20130716-01.en.xhtml
index 583099e602..09f512752a 100644
--- a/news/2013/news-20130716-01.en.xhtml
+++ b/news/2013/news-20130716-01.en.xhtml
@@ -53,7 +53,7 @@ preparation of the transparency study.
   <tags>
     <tag key="front-page"/>
     <tag key="european-union"/>
-    <tag key="europeanparliament"/>
+    <tag key="european-parliament"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2013/news-20130716-01.it.xhtml b/news/2013/news-20130716-01.it.xhtml
index 66d99b8ce1..f76374efc7 100644
--- a/news/2013/news-20130716-01.it.xhtml
+++ b/news/2013/news-20130716-01.it.xhtml
@@ -28,7 +28,7 @@ L'Open Rights Group e la FSFE sono pronte ad assistere il Parlamento Europeo nel
   <tags>
     <tag key="front-page"/>
     <tag key="european-union"/>
-    <tag key="europeanparliament"/>
+    <tag key="european-parliament"/>
     <tag key="policy"/>
   </tags>
   <translator>Alessandro Polvani</translator>
diff --git a/news/2013/news-20130716-01.sq.xhtml b/news/2013/news-20130716-01.sq.xhtml
index 712741eaf7..706c141751 100644
--- a/news/2013/news-20130716-01.sq.xhtml
+++ b/news/2013/news-20130716-01.sq.xhtml
@@ -50,7 +50,7 @@ përgatitjen e studimit mbi transparencën.
   <tags>
     <tag key="front-page"/>
     <tag key="european-union">Bashkimi Europian</tag>
-    <tag key="europeanparliament">Parlamenti Europian</tag>
+    <tag key="european-parliament">Parlamenti Europian</tag>
     <tag key="policy">Politika</tag>
   </tags>
 </html>
diff --git a/news/2013/news-20130729-01.el.xhtml b/news/2013/news-20130729-01.el.xhtml
index 12ea36a50a..0ba31f2ce9 100644
--- a/news/2013/news-20130729-01.el.xhtml
+++ b/news/2013/news-20130729-01.el.xhtml
@@ -61,7 +61,7 @@
   <tags>
     <tag key="front-page"/>
     <tag key="european-union"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="competition"/>
     <tag key="antitrust"/>
   </tags>
diff --git a/news/2013/news-20130729-01.en.xhtml b/news/2013/news-20130729-01.en.xhtml
index c1ba2c1dff..80121db586 100644
--- a/news/2013/news-20130729-01.en.xhtml
+++ b/news/2013/news-20130729-01.en.xhtml
@@ -53,7 +53,7 @@ group's filing.
   <tags>
     <tag key="front-page"/>
     <tag key="european-union"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="competition"/>
     <tag key="antitrust"/>
   </tags>
diff --git a/news/2013/news-20130729-01.pt.xhtml b/news/2013/news-20130729-01.pt.xhtml
index c7790ef27b..0bfd580b0e 100644
--- a/news/2013/news-20130729-01.pt.xhtml
+++ b/news/2013/news-20130729-01.pt.xhtml
@@ -54,7 +54,7 @@ tomar em resposta ao texto do grupo.
   <tags>
     <tag key="front-page"/>
     <tag key="european-union"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="competition"/>
     <tag key="antitrust"/>
   </tags>
diff --git a/news/2013/news-20130729-01.sq.xhtml b/news/2013/news-20130729-01.sq.xhtml
index bf5a80561d..6b9ab69523 100644
--- a/news/2013/news-20130729-01.sq.xhtml
+++ b/news/2013/news-20130729-01.sq.xhtml
@@ -53,7 +53,7 @@
   <tags>
     <tag key="front-page"/>
     <tag key="european-union">Bashkimi Europian</tag>
-    <tag key="europeancommission">Komisioni Europian</tag>
+    <tag key="european-commission">Komisioni Europian</tag>
     <tag key="competition">Konkurencë</tag>
     <tag key="antitrust">Antitrust</tag>
   </tags>
diff --git a/news/2013/news-20130729-02.en.xhtml b/news/2013/news-20130729-02.en.xhtml
index dbd19b0a90..b039ba59a4 100644
--- a/news/2013/news-20130729-02.en.xhtml
+++ b/news/2013/news-20130729-02.en.xhtml
@@ -294,7 +294,7 @@ MICROSYSTEMS, paragraph 655.</p>
   <tags>
     <tag key="front-page"/>
     <tag key="european-union"/>
-    <tag key="europeancommission"/>
+    <tag key="european-commission"/>
     <tag key="competition"/>
     <tag key="antitrust"/>
   </tags>
diff --git a/news/2013/news-20130730-01.de.xhtml b/news/2013/news-20130730-01.de.xhtml
index 2ba16b6e8b..671ee9cb0b 100644
--- a/news/2013/news-20130730-01.de.xhtml
+++ b/news/2013/news-20130730-01.de.xhtml
@@ -20,7 +20,7 @@
   <tags>
     <tag key="front-page"/>
     <tag key="ee"/>
-    <tag key="electronicvoting"/>
+    <tag key="electronic-voting"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2013/news-20130730-01.en.xhtml b/news/2013/news-20130730-01.en.xhtml
index 6986a8b282..7c8062fe1b 100644
--- a/news/2013/news-20130730-01.en.xhtml
+++ b/news/2013/news-20130730-01.en.xhtml
@@ -28,6 +28,6 @@
 		<tag key="front-page"/>
 		<tag key="ee"/>
 		<tag key="policy"/>
-		<tag key="electronicvoting">Electronic Voting</tag>
+		<tag key="electronic-voting">Electronic Voting</tag>
 	</tags>
 </html>
diff --git a/news/2013/news-20130730-01.et.xhtml b/news/2013/news-20130730-01.et.xhtml
index d0cb7838b3..6d7c3593c3 100644
--- a/news/2013/news-20130730-01.et.xhtml
+++ b/news/2013/news-20130730-01.et.xhtml
@@ -20,7 +20,7 @@
   <tags>
     <tag key="front-page"/>
     <tag key="ee"/>
-    <tag key="electronicvoting"/>
+    <tag key="electronic-voting"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2013/news-20130730-01.pt.xhtml b/news/2013/news-20130730-01.pt.xhtml
index 476f2c9758..71ae95f15c 100644
--- a/news/2013/news-20130730-01.pt.xhtml
+++ b/news/2013/news-20130730-01.pt.xhtml
@@ -20,7 +20,7 @@
   <tags>
     <tag key="front-page"/>
     <tag key="ee"/>
-    <tag key="electronicvoting"/>
+    <tag key="electronic-voting"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2013/news-20130730-01.sq.xhtml b/news/2013/news-20130730-01.sq.xhtml
index 75159a2798..914b4367e1 100644
--- a/news/2013/news-20130730-01.sq.xhtml
+++ b/news/2013/news-20130730-01.sq.xhtml
@@ -28,6 +28,6 @@
 		<tag key="front-page"/>
 		<tag key="ee"/>
                 <tag key="policy">Politika</tag>
-                <tag key="electronicvoting">Votim Elektronik</tag>
+                <tag key="electronic-voting">Votim Elektronik</tag>
 	</tags>
 </html>
diff --git a/news/2013/news-20130918-01.de.xhtml b/news/2013/news-20130918-01.de.xhtml
index bb8517c014..b18a11f0e8 100644
--- a/news/2013/news-20130918-01.de.xhtml
+++ b/news/2013/news-20130918-01.de.xhtml
@@ -136,7 +136,7 @@ aufzunehmen.</p>
     <tag key="de"/>
     <tag key="elections"/>
     
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
   </tags>
 </html>
 <!--
diff --git a/news/2013/news-20130926-01.de.xhtml b/news/2013/news-20130926-01.de.xhtml
index 7f6f2d04a5..63118e3774 100644
--- a/news/2013/news-20130926-01.de.xhtml
+++ b/news/2013/news-20130926-01.de.xhtml
@@ -51,7 +51,7 @@
     <tag key="ayc">Frage deinen Kandidaten</tag>
     <tag key="at">Österreich</tag>
     <tag key="elections">Wahlen</tag>
-    <tag key="publicadministration">Öffentliche Verwaltung</tag>
+    <tag key="public-administration">Öffentliche Verwaltung</tag>
   </tags>
 </html>
 <!--
diff --git a/news/2013/news-20131211-01.de.xhtml b/news/2013/news-20131211-01.de.xhtml
index 055270cf6c..08b6abbcbe 100644
--- a/news/2013/news-20131211-01.de.xhtml
+++ b/news/2013/news-20131211-01.de.xhtml
@@ -162,7 +162,7 @@
     <tag key="de"/>
     <tag key="patents"/>
 
-    <tag key="publicadministration"/>,
+    <tag key="public-administration"/>,
     
   </tags>
 </html>
diff --git a/news/2014/news-20140116-01.el.xhtml b/news/2014/news-20140116-01.el.xhtml
index 0a0642cbf4..eab059ae56 100644
--- a/news/2014/news-20140116-01.el.xhtml
+++ b/news/2014/news-20140116-01.el.xhtml
@@ -44,7 +44,7 @@
     <tag key="front-page"/>
     <tag key="procurement"/>
     <tag key="it"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
   </tags>
   <translator>Constantine Mousafiris</translator>
 </html>
diff --git a/news/2014/news-20140116-01.en.xhtml b/news/2014/news-20140116-01.en.xhtml
index bfdeca55e6..e0f26db9cc 100644
--- a/news/2014/news-20140116-01.en.xhtml
+++ b/news/2014/news-20140116-01.en.xhtml
@@ -29,7 +29,7 @@
 	<tags>
 		<tag key="front-page"/>
 		<tag key="procurement"/>
-		<tag key="publicadministration"/>
+		<tag key="public-administration"/>
 		<tag key="it"/>
 	</tags>
 </html>
diff --git a/news/2014/news-20140116-01.fr.xhtml b/news/2014/news-20140116-01.fr.xhtml
index 01c4044899..f4516ca90f 100644
--- a/news/2014/news-20140116-01.fr.xhtml
+++ b/news/2014/news-20140116-01.fr.xhtml
@@ -72,7 +72,7 @@
 	<tags>
 		<tag key="front-page"/>
 		<tag key="procurement"/>
-		<tag key="publicadministration"/>
+		<tag key="public-administration"/>
 		<tag key="it"/>
 	</tags>
 </html>
diff --git a/news/2014/news-20140116-01.it.xhtml b/news/2014/news-20140116-01.it.xhtml
index fcb37bc8d5..f87bd4efc9 100644
--- a/news/2014/news-20140116-01.it.xhtml
+++ b/news/2014/news-20140116-01.it.xhtml
@@ -17,7 +17,7 @@
     <tag key="front-page"/>
     <tag key="procurement"/>
     <tag key="it"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
   </tags>
   <translator>$Daniele Micci$</translator>
 </html>
diff --git a/news/2014/news-20140116-01.sq.xhtml b/news/2014/news-20140116-01.sq.xhtml
index 207590b6da..35ff838ce5 100644
--- a/news/2014/news-20140116-01.sq.xhtml
+++ b/news/2014/news-20140116-01.sq.xhtml
@@ -25,7 +25,7 @@
 		<tags>
 				<tag key="front-page"/>
 				<tag key="procurement">Prokurim</tag>
-                                <tag key="publicadministration">Administratë Publike</tag>
+                                <tag key="public-administration">Administratë Publike</tag>
 				<tag key="it">Itali</tag>
 		</tags>
 		
diff --git a/news/2014/news-20140226-01.en.xhtml b/news/2014/news-20140226-01.en.xhtml
index c5ec512a65..feacc25c97 100644
--- a/news/2014/news-20140226-01.en.xhtml
+++ b/news/2014/news-20140226-01.en.xhtml
@@ -40,7 +40,7 @@ efficient, and reduce costs," says Gerloff.
 		<tag key="front-page"/>
 		<tag key="procurement"/>
 		<tag key="openstandards"/>
-		<tag key="publicadministration"/>
+		<tag key="public-administration"/>
 		<tag key="policy"/>
 	</tags>
 </html>
diff --git a/news/2014/news-20140226-01.sq.xhtml b/news/2014/news-20140226-01.sq.xhtml
index 2aefbb5eb7..9b195d71b0 100644
--- a/news/2014/news-20140226-01.sq.xhtml
+++ b/news/2014/news-20140226-01.sq.xhtml
@@ -43,7 +43,7 @@ kostot," thotë Gerloff.
 		<tag key="front-page"/>
 		<tag key="procurement">Prokurim</tag>
 		<tag key="openstandards">Standarde të Hapura</tag>
-		<tag key="publicadministration">Administratë Publike</tag>
+		<tag key="public-administration">Administratë Publike</tag>
 		<tag key="policy">Politika</tag>
 	</tags>
 </html>
diff --git a/news/2014/news-20140304-01.en.xhtml b/news/2014/news-20140304-01.en.xhtml
index 9b1e75692c..cba5f4b766 100644
--- a/news/2014/news-20140304-01.en.xhtml
+++ b/news/2014/news-20140304-01.en.xhtml
@@ -29,7 +29,7 @@
   <tag key="elections">European Elections</tag>
   <tag key="ayc">Ask Your Candidates</tag>
   <tag key="fspact">Free Software Pact</tag>
-  <tag key="europeanparliament">European Parliament</tag>
+  <tag key="european-parliament">European Parliament</tag>
   <tag key="policy"/>
  </tags>
 </html>
diff --git a/news/2014/news-20140304-01.sq.xhtml b/news/2014/news-20140304-01.sq.xhtml
index 039e77ffac..f41a0bdc15 100644
--- a/news/2014/news-20140304-01.sq.xhtml
+++ b/news/2014/news-20140304-01.sq.xhtml
@@ -29,7 +29,7 @@
   <tag key="elections">Zgjedhjet Europiane</tag>
   <tag key="ayc">Pyetni Kandidatët Tuaj</tag>
   <tag key="fspact">Pakti Për Software të Lirë</tag>
-  <tag key="europeanparliament">Parlamenti Europian</tag>
+  <tag key="european-parliament">Parlamenti Europian</tag>
   <tag key="policy">Politika</tag>
  </tags>
 </html>
diff --git a/news/2014/news-20140310-01.de.xhtml b/news/2014/news-20140310-01.de.xhtml
index c82997772c..0a73657ebd 100644
--- a/news/2014/news-20140310-01.de.xhtml
+++ b/news/2014/news-20140310-01.de.xhtml
@@ -168,7 +168,7 @@ der Werbewirtschaft und von Adresshändlern muss hintanstehen."</p>
   </body>
   <tags>
 		<tag key="limux">München</tag>
-		<tag key="publicadministration">ÖffentlicheVerwaltung</tag>
+		<tag key="public-administration">ÖffentlicheVerwaltung</tag>
 		<tag key="ayc">BefrageDeineKandidaten</tag>
   </tags>
 </html>
diff --git a/news/2014/news-20140326-02.en.xhtml b/news/2014/news-20140326-02.en.xhtml
index 94c2499a5d..d0e73f90b7 100644
--- a/news/2014/news-20140326-02.en.xhtml
+++ b/news/2014/news-20140326-02.en.xhtml
@@ -59,7 +59,7 @@ more progress on this issue over the past six years."
 		<tag key="openstandards"/>
 		<tag key="european-union"/>
 		<tag key="procurement"/>
-		<tag key="publicadministration"/>
+		<tag key="public-administration"/>
 		<tag key="policy"/>
 	</tags>
 </html>
diff --git a/news/2014/news-20140326-02.sq.xhtml b/news/2014/news-20140326-02.sq.xhtml
index 72d02de46b..cbbc5f795d 100644
--- a/news/2014/news-20140326-02.sq.xhtml
+++ b/news/2014/news-20140326-02.sq.xhtml
@@ -56,7 +56,7 @@ asnjë përparim në këtë pikë gjatë gjashtë vjetëve të fundit.”
 		<tag key="openstandards">Standarde të Hapura</tag>
 		<tag key="european-union">BE</tag>
 		<tag key="procurement">Prokurime</tag>
-		<tag key="publicadministration">Administrata Publike</tag>
+		<tag key="public-administration">Administrata Publike</tag>
 		<tag key="policy">Politika</tag>
 	</tags>
 </html>
diff --git a/news/2014/news-20140506-01.el.xhtml b/news/2014/news-20140506-01.el.xhtml
index d039cf5599..83abe6dba2 100644
--- a/news/2014/news-20140506-01.el.xhtml
+++ b/news/2014/news-20140506-01.el.xhtml
@@ -56,7 +56,7 @@
     <tag key="front-page"/>
     <tag key="drm"/>
     <tag key="w3c"/>
-    <tag key="openletter"/>
+    <tag key="open-letter"/>
     <tag key="policy"/>
   </tags>
   <translator>Constantine Mousafiris</translator>
diff --git a/news/2014/news-20140506-01.en.xhtml b/news/2014/news-20140506-01.en.xhtml
index a2335a5030..a7a298873b 100644
--- a/news/2014/news-20140506-01.en.xhtml
+++ b/news/2014/news-20140506-01.en.xhtml
@@ -69,7 +69,7 @@
         <tag key="front-page"/>
         <tag key="drm"/>
         <tag key="w3c"/>
-        <tag key="openletter"/>
+        <tag key="open-letter"/>
         <tag key="policy"/>
     </tags>
 </html>
diff --git a/news/2014/news-20140506-01.es.xhtml b/news/2014/news-20140506-01.es.xhtml
index 56b9d163d4..9587478f18 100644
--- a/news/2014/news-20140506-01.es.xhtml
+++ b/news/2014/news-20140506-01.es.xhtml
@@ -30,7 +30,7 @@ o informan de vulnerabilidades en la tecnología DRM. </li>
     <tag key="front-page"/>
     <tag key="drm"/>
     <tag key="w3c"/>
-    <tag key="openletter"/>
+    <tag key="open-letter"/>
     <tag key="policy"/>
   </tags>
   <translator>juansantiago@joindiaspora.com, usuario Diaspora* (no es correo)</translator>
diff --git a/news/2014/news-20140506-01.nl.xhtml b/news/2014/news-20140506-01.nl.xhtml
index 5e7c0a7bbf..2558c63ff1 100644
--- a/news/2014/news-20140506-01.nl.xhtml
+++ b/news/2014/news-20140506-01.nl.xhtml
@@ -51,7 +51,7 @@ rapporteren te beschermen tegen vervolging.</li>
     <tag key="front-page">voorpagina</tag>
     <tag key="drm">DRM</tag>
     <tag key="w3c">W3C</tag>
-    <tag key="openletter"/>
+    <tag key="open-letter"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2014/news-20140506-01.ru.xhtml b/news/2014/news-20140506-01.ru.xhtml
index 6db7b39281..24ae829bd9 100644
--- a/news/2014/news-20140506-01.ru.xhtml
+++ b/news/2014/news-20140506-01.ru.xhtml
@@ -56,7 +56,7 @@ W3C.</li>
     <tag key="front-page"/>
     <tag key="drm"/>
     <tag key="w3c"/>
-    <tag key="openletter"/>
+    <tag key="open-letter"/>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2014/news-20140506-01.sq.xhtml b/news/2014/news-20140506-01.sq.xhtml
index f2fa4e6da6..847d22640d 100644
--- a/news/2014/news-20140506-01.sq.xhtml
+++ b/news/2014/news-20140506-01.sq.xhtml
@@ -69,7 +69,7 @@
         <tag key="front-page"/>
         <tag key="drm">Administrim Dixhital Kufizimesh</tag>
         <tag key="w3c"/> 
-        <tag key="openletter">Letër e Hapur</tag>
+        <tag key="open-letter">Letër e Hapur</tag>
         <tag key="policy">Politika</tag>
 
     </tags>
diff --git a/news/2014/news-20140528-01.el.xhtml b/news/2014/news-20140528-01.el.xhtml
index 13960abbe8..308f7eac1d 100644
--- a/news/2014/news-20140528-01.el.xhtml
+++ b/news/2014/news-20140528-01.el.xhtml
@@ -39,7 +39,7 @@
     </sidebar>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeanparliament">European Parliament</tag>
+    <tag key="european-parliament">European Parliament</tag>
     <tag key="fspact">Free Software Pact</tag>
     <tag key="european-union"/>
   </tags>
diff --git a/news/2014/news-20140528-01.en.xhtml b/news/2014/news-20140528-01.en.xhtml
index e68f0057fe..028f526cb1 100644
--- a/news/2014/news-20140528-01.en.xhtml
+++ b/news/2014/news-20140528-01.en.xhtml
@@ -27,6 +27,6 @@ More information:
         <tag key="front-page"/>
         <tag key="fspact"/>
         <tag key="european-union"/>
-        <tag key="europeanparliament"/>
+        <tag key="european-parliament"/>
     </tags>
 </html>
diff --git a/news/2014/news-20140528-01.es.xhtml b/news/2014/news-20140528-01.es.xhtml
index 4fa6248c13..2c287761e5 100644
--- a/news/2014/news-20140528-01.es.xhtml
+++ b/news/2014/news-20140528-01.es.xhtml
@@ -39,7 +39,7 @@ Más información:
   <tags>
     <tag key="front-page"/>
     <tag key="fspact">Pacto por el software libre</tag>
-    <tag key="europeanparliament">Parlamento Europeo</tag>
+    <tag key="european-parliament">Parlamento Europeo</tag>
     <tag key="european-union"/>
   </tags>
 </html>
diff --git a/news/2014/news-20140528-01.nl.xhtml b/news/2014/news-20140528-01.nl.xhtml
index f854ed2fbe..b3caa08142 100644
--- a/news/2014/news-20140528-01.nl.xhtml
+++ b/news/2014/news-20140528-01.nl.xhtml
@@ -23,7 +23,7 @@ Meer informatie:
     </sidebar>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeanparliament">European Parliament</tag>
+    <tag key="european-parliament">European Parliament</tag>
     <tag key="fspact">Free Software Pact</tag>
     <tag key="european-union"/>
   </tags>
diff --git a/news/2014/news-20140528-01.ru.xhtml b/news/2014/news-20140528-01.ru.xhtml
index a037b10c04..6ddb996c9a 100644
--- a/news/2014/news-20140528-01.ru.xhtml
+++ b/news/2014/news-20140528-01.ru.xhtml
@@ -52,7 +52,7 @@
     </sidebar>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeanparliament">European Parliament</tag>
+    <tag key="european-parliament">European Parliament</tag>
     <tag key="fspact">Free Software Pact</tag>
     <tag key="european-union"/>
   </tags>
diff --git a/news/2014/news-20140528-01.sq.xhtml b/news/2014/news-20140528-01.sq.xhtml
index f5e01754d9..f086206f36 100644
--- a/news/2014/news-20140528-01.sq.xhtml
+++ b/news/2014/news-20140528-01.sq.xhtml
@@ -21,7 +21,7 @@ Më tepër informacion:
     </sidebar>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeanparliament">Parlamenti Europian</tag>
+    <tag key="european-parliament">Parlamenti Europian</tag>
     <tag key="fspact">Pakti Për Software të Lirë</tag>
     <tag key="european-union"/>
   </tags>
diff --git a/news/2014/news-20141016-01.de.xhtml b/news/2014/news-20141016-01.de.xhtml
index faa3c7a56d..55a0db634a 100644
--- a/news/2014/news-20141016-01.de.xhtml
+++ b/news/2014/news-20141016-01.de.xhtml
@@ -41,7 +41,7 @@ In München soll nun eine Arbeitsgruppe die städtische IT-Strukturen und -Proze
   <tags>
     <tag key="front-page"/>
     <tag key="limux">München</tag>
-    <tag key="publicadministration">Öffentliche Verwaltung</tag>
+    <tag key="public-administration">Öffentliche Verwaltung</tag>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2014/news-20141016-01.el.xhtml b/news/2014/news-20141016-01.el.xhtml
index a87f503a5f..a5b4ba98da 100644
--- a/news/2014/news-20141016-01.el.xhtml
+++ b/news/2014/news-20141016-01.el.xhtml
@@ -90,7 +90,7 @@
   <tags>
     <tag key="front-page"/>
     <tag key="limux"/>
-    <tag key="publicadministration">Public Administrations</tag>
+    <tag key="public-administration">Public Administrations</tag>
     <tag key="policy"/>
   </tags>
   <translator>Constantine Mousafiris</translator>
diff --git a/news/2014/news-20141016-01.en.xhtml b/news/2014/news-20141016-01.en.xhtml
index 687cfaf095..aa1bcf0194 100644
--- a/news/2014/news-20141016-01.en.xhtml
+++ b/news/2014/news-20141016-01.en.xhtml
@@ -50,7 +50,7 @@ The document states that a working group will evaluate the IT-structures and -pr
 	<tags>
     <tag key="front-page"/>
 		<tag key="limux"/>
-		<tag key="publicadministration">Public Administrations</tag>
+		<tag key="public-administration">Public Administrations</tag>
 		<tag key="policy"/>
 	</tags>
 </html>
diff --git a/news/2014/news-20141016-01.nl.xhtml b/news/2014/news-20141016-01.nl.xhtml
index d29614a5e3..b94f1176a1 100644
--- a/news/2014/news-20141016-01.nl.xhtml
+++ b/news/2014/news-20141016-01.nl.xhtml
@@ -85,7 +85,7 @@ zegt Karsten Gerloff, Voorzitter van de Free Software Foundation Europe.
     <tag key="front-page"/>
     <tag key="limux">München</tag>
     <tag key="policy"/>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
   </tags>
   <translator>André Ockers</translator>
 </html>
diff --git a/news/2014/news-20141016-01.sq.xhtml b/news/2014/news-20141016-01.sq.xhtml
index 51394aebaf..6f2c9a72bb 100644
--- a/news/2014/news-20141016-01.sq.xhtml
+++ b/news/2014/news-20141016-01.sq.xhtml
@@ -41,7 +41,7 @@ Dokumenti pohon se një grup pune do të kryejë vlerësimin e strukturave dhe p
   <tags>
     <tag key="front-page"/>
     <tag key="limux"/>
-    <tag key="publicadministration">Administrata Publike</tag>
+    <tag key="public-administration">Administrata Publike</tag>
     <tag key="policy"/>
   </tags>
 </html>
diff --git a/news/2014/news-20141120-01.en.xml b/news/2014/news-20141120-01.en.xml
index 9e4e79ff60..f90bed67c4 100644
--- a/news/2014/news-20141120-01.en.xml
+++ b/news/2014/news-20141120-01.en.xml
@@ -27,7 +27,7 @@ towards greater digitisation.
     <tags>
 		<tag key="front-page"/>
 		<tag key="european-union">European Union</tag>
-		<tag key="europeanparliament">European Parliament</tag>
+		<tag key="european-parliament">European Parliament</tag>
 		<tag key="openstandards">Open Standards</tag>
 
     </tags>
diff --git a/news/2014/news-20141120-01.sq.xml b/news/2014/news-20141120-01.sq.xml
index 7dfa0a23fa..974938b9bd 100644
--- a/news/2014/news-20141120-01.sq.xml
+++ b/news/2014/news-20141120-01.sq.xml
@@ -29,7 +29,7 @@ më tej drejt një dixhitalizimi më të thellë.
     <tags>
 		<tag key="front-page"/>
 		<tag key="european-union">Bashkimi Europian</tag>
-		<tag key="europeanparliament">Parlamenti Europian</tag>
+		<tag key="european-parliament">Parlamenti Europian</tag>
 		<tag key="openstandards">Standarde të Hapura</tag>
 
     </tags>
diff --git a/news/2014/news-20141120-02.de.xhtml b/news/2014/news-20141120-02.de.xhtml
index 24f0b9c854..659b176e1b 100644
--- a/news/2014/news-20141120-02.de.xhtml
+++ b/news/2014/news-20141120-02.de.xhtml
@@ -58,7 +58,7 @@
   <tags>
     <tag key="front-page"/>
     <tag key="ch">Schweiz</tag>
-    <tag key="openjustitia">OpenJustitia</tag>
+    <tag key="open-justitia">OpenJustitia</tag>
     <tag key="federal-supreme-court-of-switzerland"/>
   </tags>
 </html>
diff --git a/news/2014/news-20141120-02.en.xhtml b/news/2014/news-20141120-02.en.xhtml
index 768a4b67df..7b0d7543d4 100644
--- a/news/2014/news-20141120-02.en.xhtml
+++ b/news/2014/news-20141120-02.en.xhtml
@@ -31,6 +31,6 @@
 		<tag key="front-page"/>
 		<tag key="ch">Switzerland</tag>
 		<tag key="federal-supreme-court-of-switzerland">Federal Supreme Court of Switzerland</tag>
-                <tag key="openjustitia">OpenJustitia</tag>
+                <tag key="open-justitia">OpenJustitia</tag>
 	</tags>
 </html>
diff --git a/news/2014/news-20141120-02.nl.xhtml b/news/2014/news-20141120-02.nl.xhtml
index 09046ca3d8..cbdf981729 100644
--- a/news/2014/news-20141120-02.nl.xhtml
+++ b/news/2014/news-20141120-02.nl.xhtml
@@ -24,7 +24,7 @@ oplossing voorhanden was, zelfstandig software heeft ontwikkeld en deze op conse
   <tags>
     <tag key="front-page">voorpagina</tag>
     <tag key="ch">Zwitserland</tag>
-    <tag key="openjustitia">OpenJustitia</tag>
+    <tag key="open-justitia">OpenJustitia</tag>
     <tag key="federal-supreme-court-of-switzerland"/>
   </tags>
   <var>&lt;translator&gt;<em>André Ockers</em>&lt;/translator&gt;</var>
diff --git a/news/2014/news-20141212-01.el.xhtml b/news/2014/news-20141212-01.el.xhtml
index cfae2ffff3..6f5bfb2e04 100644
--- a/news/2014/news-20141212-01.el.xhtml
+++ b/news/2014/news-20141212-01.el.xhtml
@@ -96,7 +96,7 @@
 	<tags>
 		<tag key="front-page"/>
 		<tag key="openstandards">Open Standards</tag>
-		<tag key="europeanparliament">European Parliament</tag>
+		<tag key="european-parliament">European Parliament</tag>
 		<tag key="it"/>
 	</tags>
 </html>
diff --git a/news/2014/news-20141212-01.en.xhtml b/news/2014/news-20141212-01.en.xhtml
index 1959eb10bb..12e1b29d94 100644
--- a/news/2014/news-20141212-01.en.xhtml
+++ b/news/2014/news-20141212-01.en.xhtml
@@ -96,7 +96,7 @@ The Greens/EFA are soliciting <a href="http://euwiki.org/Ensuring_utmost_transpa
 	<tags>
 		<tag key="front-page"/>
 		<tag key="openstandards">Open Standards</tag>
-		<tag key="europeanparliament">European Parliament</tag>
+		<tag key="european-parliament">European Parliament</tag>
 		<tag key="it"/>
 	</tags>
 </html>
diff --git a/news/2014/news-20141212-01.nl.xhtml b/news/2014/news-20141212-01.nl.xhtml
index c655d0af74..94eb05dc1c 100644
--- a/news/2014/news-20141212-01.nl.xhtml
+++ b/news/2014/news-20141212-01.nl.xhtml
@@ -87,7 +87,7 @@ De Groenen/EFA verzoeken om <a href="http://euwiki.org/Ensuring_utmost_transpare
 	<tags>
 		<tag key="front-page"/>
 		<tag key="openstandards">Open Standaarden</tag>
-		<tag key="europeanparliament">Europees Parlement</tag>
+		<tag key="european-parliament">Europees Parlement</tag>
 		<tag key="it">IT</tag>
 	</tags>
 </html>
diff --git a/news/2014/news-20141212-01.sq.xhtml b/news/2014/news-20141212-01.sq.xhtml
index 964ca45292..f1727f5919 100644
--- a/news/2014/news-20141212-01.sq.xhtml
+++ b/news/2014/news-20141212-01.sq.xhtml
@@ -99,7 +99,7 @@ Grupi parlamentar Greens/EFA po kërkon <a href="http://euwiki.org/Ensuring_utmo
 	<tags>
 		<tag key="front-page"/>
 		<tag key="openstandards">Standarde të Hapur</tag>
-		<tag key="europeanparliament">Parlamenti Europian</tag>
+		<tag key="european-parliament">Parlamenti Europian</tag>
 		<tag key="it">TI</tag>
 	</tags>
 </html>
diff --git a/news/2014/news-20141219-01.el.xhtml b/news/2014/news-20141219-01.el.xhtml
index 77f4b69b18..edf3a7a5df 100644
--- a/news/2014/news-20141219-01.el.xhtml
+++ b/news/2014/news-20141219-01.el.xhtml
@@ -54,8 +54,8 @@ projects.</p>
   <tags>
     <tag key="front-page"/>
     <tag key="openstandards">Open Standards</tag>
-    <tag key="europeanparliament">European Parliament</tag>
-    <tag key="europeancommission">European Commission</tag>
+    <tag key="european-parliament">European Parliament</tag>
+    <tag key="european-commission">European Commission</tag>
     <tag key="funding"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2014/news-20141219-01.en.xhtml b/news/2014/news-20141219-01.en.xhtml
index ef0bf99428..926671759b 100644
--- a/news/2014/news-20141219-01.en.xhtml
+++ b/news/2014/news-20141219-01.en.xhtml
@@ -42,8 +42,8 @@
 	<tags>
 		<tag key="front-page"/>
 		<tag key="openstandards">Open Standards</tag>
-		<tag key="europeanparliament">European Parliament</tag>
-		<tag key="europeancommission">European Commission</tag>
+		<tag key="european-parliament">European Parliament</tag>
+		<tag key="european-commission">European Commission</tag>
 		<tag key="policy"/>
                 <tag key="funding"/>
 	</tags>
diff --git a/news/2014/news-20141219-01.es.xhtml b/news/2014/news-20141219-01.es.xhtml
index 5afbf7fb3b..c18c9ce5bb 100644
--- a/news/2014/news-20141219-01.es.xhtml
+++ b/news/2014/news-20141219-01.es.xhtml
@@ -50,8 +50,8 @@ Libre”.</p>
     <tag key="front-page">portada</tag>
     <tag key="funding">Financiación</tag>
     <translator>Eulalio Barbero</translator>
-    <tag key="europeancommission"/>
-    <tag key="europeanparliament"/>
+    <tag key="european-commission"/>
+    <tag key="european-parliament"/>
     <tag key="openstandards"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2014/news-20141219-01.nl.xhtml b/news/2014/news-20141219-01.nl.xhtml
index 510a4a71fd..2c9f05bad3 100644
--- a/news/2014/news-20141219-01.nl.xhtml
+++ b/news/2014/news-20141219-01.nl.xhtml
@@ -33,8 +33,8 @@ die Europees parlementsleden gebruiken voor het werken aan wetten, dat het parle
   <tags>
     <tag key="front-page"/>
     <tag key="funding">Financiering</tag>
-    <tag key="europeancommission"/>
-    <tag key="europeanparliament"/>
+    <tag key="european-commission"/>
+    <tag key="european-parliament"/>
     <tag key="openstandards"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2014/news-20141219-01.sq.xhtml b/news/2014/news-20141219-01.sq.xhtml
index 3d4d6bf30c..d8d8ed207c 100644
--- a/news/2014/news-20141219-01.sq.xhtml
+++ b/news/2014/news-20141219-01.sq.xhtml
@@ -39,8 +39,8 @@
 	<tags>
 		<tag key="front-page"/>
 		<tag key="openstandards">Standarde të Hapura</tag>
-		<tag key="europeanparliament">Parlamenti Europian</tag>
-		<tag key="europeancommission">Komisioni Europian</tag>
+		<tag key="european-parliament">Parlamenti Europian</tag>
+		<tag key="european-commission">Komisioni Europian</tag>
 		<tag key="policy">Politika</tag>
 		<tag key="funding">Financime</tag>
 	</tags>
diff --git a/news/2014/news-20141219-01.sr.xhtml b/news/2014/news-20141219-01.sr.xhtml
index eff714c239..9b528185f6 100644
--- a/news/2014/news-20141219-01.sr.xhtml
+++ b/news/2014/news-20141219-01.sr.xhtml
@@ -27,8 +27,8 @@
   <tags>
     <tag key="front-page"/>
     <tag key="openstandards">Open Standards</tag>
-    <tag key="europeanparliament">European Parliament</tag>
-    <tag key="europeancommission">European Commission</tag>
+    <tag key="european-parliament">European Parliament</tag>
+    <tag key="european-commission">European Commission</tag>
     <tag key="funding"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2015/news-20150218-01.en.xhtml b/news/2015/news-20150218-01.en.xhtml
index 3eb4d879d1..f2f6c1e1b0 100644
--- a/news/2015/news-20150218-01.en.xhtml
+++ b/news/2015/news-20150218-01.en.xhtml
@@ -41,6 +41,6 @@
 		<tag key="patents"/>
 		<tag key="openstandards">Open Standards</tag>
 		<tag key="policy"/>
-                <tag key="europeancommission">European Commission</tag>
+                <tag key="european-commission">European Commission</tag>
 	</tags>
 </html>
diff --git a/news/2015/news-20150218-01.nl.xhtml b/news/2015/news-20150218-01.nl.xhtml
index b2b0fb5bfc..97cc521e84 100644
--- a/news/2015/news-20150218-01.nl.xhtml
+++ b/news/2015/news-20150218-01.nl.xhtml
@@ -42,7 +42,7 @@ te stellen.</p>
 		<tag key="patents">Patenten</tag>
 		<tag key="openstandards">OpenStandaarden</tag>
 		<tag key="policy">Beleid</tag>
-                <tag key="europeancommission">EuropeseCommissie</tag>
+                <tag key="european-commission">EuropeseCommissie</tag>
 	</tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2015/news-20150218-01.sq.xhtml b/news/2015/news-20150218-01.sq.xhtml
index 9acd201922..68a78ad7f9 100644
--- a/news/2015/news-20150218-01.sq.xhtml
+++ b/news/2015/news-20150218-01.sq.xhtml
@@ -41,6 +41,6 @@ të patentave të standardeve thelbësore.</p>
 		<tag key="patents">Patenta</tag>
 		<tag key="openstandards">Standarde të Hapura</tag>
 		<tag key="policy"/>
-                <tag key="europeancommission">Komisioni Europian</tag>
+                <tag key="european-commission">Komisioni Europian</tag>
 	</tags>
 </html>
diff --git a/news/2015/news-20150306-01.de.xhtml b/news/2015/news-20150306-01.de.xhtml
index 6d25aba8f1..fd6919be46 100644
--- a/news/2015/news-20150306-01.de.xhtml
+++ b/news/2015/news-20150306-01.de.xhtml
@@ -46,7 +46,7 @@ Lizenz stärkt und vitualisiert hingegen aus Sicht der FSFE den Markt.</p>
   <tags>
     <tag key="front-page"/>
     <tag key="ch">Schweiz</tag>
-    <tag key="openjustitia">OpenJustitia</tag>
+    <tag key="open-justitia">OpenJustitia</tag>
     <tag key="federal-supreme-court-of-switzerland"/>
     <tag key="policy"/>
   </tags>
diff --git a/news/2015/news-20150306-01.en.xhtml b/news/2015/news-20150306-01.en.xhtml
index 6ffc6f64ad..1ca0715188 100644
--- a/news/2015/news-20150306-01.en.xhtml
+++ b/news/2015/news-20150306-01.en.xhtml
@@ -52,7 +52,7 @@ calls for (German)</a> the lacking legal framework to be created as soon as poss
     <tag key="front-page"/>
 		<tag key="ch">Switzerland</tag>
 		<tag key="federal-supreme-court-of-switzerland">Federal Supreme Court of Switzerland</tag>
-                <tag key="openjustitia">OpenJustitia</tag>
+                <tag key="open-justitia">OpenJustitia</tag>
                 <tag key="policy"/>
 	</tags>
 </html>
diff --git a/news/2015/news-20150306-01.nl.xhtml b/news/2015/news-20150306-01.nl.xhtml
index bdf7bdd1df..f10dcafcb5 100644
--- a/news/2015/news-20150306-01.nl.xhtml
+++ b/news/2015/news-20150306-01.nl.xhtml
@@ -35,7 +35,7 @@ roept op (in het Duits)</a> het ontbrekende juridische raamwerk zo snel mogelijk
     <tag key="front-page"/>
     <tag key="ch">Zwitserland</tag>
     <tag key="federal-supreme-court-of-switzerland">Federaal Hooggerechtshof van Zwitserland</tag>
-    <tag key="openjustitia">OpenJustitia</tag>
+    <tag key="open-justitia">OpenJustitia</tag>
     <tag key="policy"/>
   </tags>
   <translator>André Ockers</translator>
diff --git a/news/2015/news-20150306-01.sq.xhtml b/news/2015/news-20150306-01.sq.xhtml
index a7eb490f96..26be1f6657 100644
--- a/news/2015/news-20150306-01.sq.xhtml
+++ b/news/2015/news-20150306-01.sq.xhtml
@@ -53,7 +53,7 @@ licenca të Lirë e forcon dhe e stimulon tregun.</p>
     <tag key="front-page"/>
 		<tag key="ch">Zvicër</tag>
 		<tag key="federal-supreme-court-of-switzerland">Gjykata e Lartë Federale Zvicerane</tag>
-                <tag key="openjustitia">OpenJustitia</tag>
+                <tag key="open-justitia">OpenJustitia</tag>
                 <tag key="policy">Politika</tag>
 	</tags>
 </html>
diff --git a/news/2015/news-20150401-01.el.xhtml b/news/2015/news-20150401-01.el.xhtml
index 1c84a0d9ab..7e9dd6bc03 100644
--- a/news/2015/news-20150401-01.el.xhtml
+++ b/news/2015/news-20150401-01.el.xhtml
@@ -45,9 +45,9 @@
   </body>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeancommission">European Commission</tag>
+    <tag key="european-commission">European Commission</tag>
     <tag key="procurement">Procurement</tag>
-    <tag key="publicadministration">Public administration</tag>
+    <tag key="public-administration">Public administration</tag>
     <tag key="policy"/>
   </tags>
   <translator>Constantine Mousafiris</translator>
diff --git a/news/2015/news-20150401-01.en.xhtml b/news/2015/news-20150401-01.en.xhtml
index 6d9c86810c..81cca93275 100644
--- a/news/2015/news-20150401-01.en.xhtml
+++ b/news/2015/news-20150401-01.en.xhtml
@@ -26,9 +26,9 @@
 
       <tags>
 	<tag key="front-page"/>
-	<tag key="europeancommission">European Commission</tag>
+	<tag key="european-commission">European Commission</tag>
 	<tag key="procurement">Procurement</tag>
-	<tag key="publicadministration">Public administration</tag>
+	<tag key="public-administration">Public administration</tag>
 	<tag key="policy"/>
       </tags>
       
diff --git a/news/2015/news-20150401-01.nl.xhtml b/news/2015/news-20150401-01.nl.xhtml
index d918d5b74b..af276a4691 100644
--- a/news/2015/news-20150401-01.nl.xhtml
+++ b/news/2015/news-20150401-01.nl.xhtml
@@ -44,9 +44,9 @@ uiteindelijk zal publiceren.</p>
   </body>
   <tags>
     <tag key="front-page"/>
-    <tag key="europeancommission">Europese Commissie</tag>
+    <tag key="european-commission">Europese Commissie</tag>
     <tag key="procurement">Inkoop</tag>
-    <tag key="publicadministration">Overheid</tag>
+    <tag key="public-administration">Overheid</tag>
     <tag key="policy"/>
   </tags>
   <translator>André Ockers</translator>
diff --git a/news/2015/news-20150401-01.sq.xhtml b/news/2015/news-20150401-01.sq.xhtml
index b0f9bb4d62..5511a807dc 100644
--- a/news/2015/news-20150401-01.sq.xhtml
+++ b/news/2015/news-20150401-01.sq.xhtml
@@ -26,9 +26,9 @@
 
       <tags>
 	<tag key="front-page"/>
-	<tag key="europeancommission">Komisioni Europian</tag>
+	<tag key="european-commission">Komisioni Europian</tag>
 	<tag key="procurement">Prokurim</tag>
-	<tag key="publicadministration">Administratë publike</tag>
+	<tag key="public-administration">Administratë publike</tag>
 	<tag key="policy"/>
       </tags>
       
diff --git a/news/2015/news-20150401-02.de.xhtml b/news/2015/news-20150401-02.de.xhtml
index c69e7a811d..ba41c1581d 100644
--- a/news/2015/news-20150401-02.de.xhtml
+++ b/news/2015/news-20150401-02.de.xhtml
@@ -31,7 +31,7 @@ schuldig.&quot;</blockquote></p>
 
       <tags>
 	<tag key="procurement"/>
-	<tag key="publicadministration"/>
+	<tag key="public-administration"/>
 	<tag key="de"/>
 	<tag key="de"/>
       </tags>
diff --git a/news/2015/news-20150401-02.nl.xhtml b/news/2015/news-20150401-02.nl.xhtml
index 1c1746baec..9fe5e51675 100644
--- a/news/2015/news-20150401-02.nl.xhtml
+++ b/news/2015/news-20150401-02.nl.xhtml
@@ -27,7 +27,7 @@ het (Duitse) Ministerie van Buitenlandse Zaken."</blockquote></p>
 
       <tags>
 	<tag key="procurement">Inkoop</tag>
-	<tag key="publicadministration">Overheid</tag>
+	<tag key="public-administration">Overheid</tag>
 	<tag key="de">Duitsland</tag>
 	<tag key="de">Duits</tag>
       </tags>
diff --git a/news/2015/news-20150605-01.en.xhtml b/news/2015/news-20150605-01.en.xhtml
index 723a32e4d1..82a9668948 100644
--- a/news/2015/news-20150605-01.en.xhtml
+++ b/news/2015/news-20150605-01.en.xhtml
@@ -38,7 +38,7 @@
         <tag key="front-page"/>
 		<tag key="drm">DRM</tag>
 		<tag key="policy"/>
-		<tag key="europeanparliament">European Parliament</tag>
-		<tag key="publicadministration">Public Administration</tag>
+		<tag key="european-parliament">European Parliament</tag>
+		<tag key="public-administration">Public Administration</tag>
     </tags>
 </html>
diff --git a/news/2015/news-20150605-01.nl.xhtml b/news/2015/news-20150605-01.nl.xhtml
index dce89038d6..4a80c8814f 100644
--- a/news/2015/news-20150605-01.nl.xhtml
+++ b/news/2015/news-20150605-01.nl.xhtml
@@ -39,8 +39,8 @@
         <tag key="front-page">voorpagina</tag>
 		<tag key="drm">DRM</tag>
 		<tag key="policy">beleid</tag>
-		<tag key="europeanparliament">Europees Parlement</tag>
-		<tag key="publicadministration">overheid</tag>
+		<tag key="european-parliament">Europees Parlement</tag>
+		<tag key="public-administration">overheid</tag>
     </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2015/news-20150605-01.sq.xhtml b/news/2015/news-20150605-01.sq.xhtml
index 8d549cadb6..7442de8364 100644
--- a/news/2015/news-20150605-01.sq.xhtml
+++ b/news/2015/news-20150605-01.sq.xhtml
@@ -38,7 +38,7 @@
         <tag key="front-page"/>
 		<tag key="drm">DRM</tag>
 		<tag key="policy"/>
-		<tag key="europeanparliament">Parlamenti Europian</tag>
-		<tag key="publicadministration">Administratë Publike</tag>
+		<tag key="european-parliament">Parlamenti Europian</tag>
+		<tag key="public-administration">Administratë Publike</tag>
     </tags>
 </html>
diff --git a/news/2015/news-20150605-02.en.xhtml b/news/2015/news-20150605-02.en.xhtml
index 5401e5f7e7..55b213b600 100644
--- a/news/2015/news-20150605-02.en.xhtml
+++ b/news/2015/news-20150605-02.en.xhtml
@@ -126,8 +126,8 @@
   <tag key="front-page"/>
   <tag key="drm">DRM</tag>
   <tag key="policy"/>
-  <tag key="europeanparliament">European Parliament</tag>
-  <tag key="publicadministration">Public Administration</tag>
+  <tag key="european-parliament">European Parliament</tag>
+  <tag key="public-administration">Public Administration</tag>
 </tags>
 
 </html>
diff --git a/news/2015/news-20150616-01.en.xhtml b/news/2015/news-20150616-01.en.xhtml
index 89f3450f80..07127cdd53 100644
--- a/news/2015/news-20150616-01.en.xhtml
+++ b/news/2015/news-20150616-01.en.xhtml
@@ -69,7 +69,7 @@ Parliament is scheduled to hold a plenary vote on July 9.
         <tag key="front-page"/>
 		<tag key="drm">DRM</tag>
 		<tag key="policy"/>
-		<tag key="europeanparliament">European Parliament</tag>
-		<tag key="publicadministration">Public Administration</tag>
+		<tag key="european-parliament">European Parliament</tag>
+		<tag key="public-administration">Public Administration</tag>
     </tags>
 </html>
diff --git a/news/2015/news-20150616-01.nl.xhtml b/news/2015/news-20150616-01.nl.xhtml
index c8558f188b..01ba9872d6 100644
--- a/news/2015/news-20150616-01.nl.xhtml
+++ b/news/2015/news-20150616-01.nl.xhtml
@@ -66,8 +66,8 @@ Parlement heeft voor 9 juli een plenaire stemming op haar agenda staan.
         <tag key="front-page">voorpagina</tag>
 		<tag key="drm">DRM</tag>
 		<tag key="policy">beleid</tag>
-		<tag key="europeanparliament">Europees Parlement</tag>
-		<tag key="publicadministration">overheid</tag>
+		<tag key="european-parliament">Europees Parlement</tag>
+		<tag key="public-administration">overheid</tag>
     </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2015/news-20150616-01.sq.xhtml b/news/2015/news-20150616-01.sq.xhtml
index 18a334af90..fb1022b0d6 100644
--- a/news/2015/news-20150616-01.sq.xhtml
+++ b/news/2015/news-20150616-01.sq.xhtml
@@ -74,7 +74,7 @@ ka në plan të mbajë një seancë plenare për votimin e raportit më 9 korrik
         <tag key="front-page"/>
 		<tag key="drm">DRM</tag>
 		<tag key="policy">Policy</tag>
-		<tag key="europeanparliament">Parlamenti Europian</tag>
-		<tag key="publicadministration">Administrata Publike</tag>
+		<tag key="european-parliament">Parlamenti Europian</tag>
+		<tag key="public-administration">Administrata Publike</tag>
     </tags>
 </html>
diff --git a/news/2015/news-20150918-01.en.xhtml b/news/2015/news-20150918-01.en.xhtml
index 5a6eca76d2..32b077238f 100644
--- a/news/2015/news-20150918-01.en.xhtml
+++ b/news/2015/news-20150918-01.en.xhtml
@@ -51,7 +51,7 @@
         <tag key="front-page"/>
 	<tag key="drm">DRM</tag>
 	<tag key="policy"/>
-	<tag key="europeanparliament">European Parliament</tag>
-	<tag key="publicadministration">Public Administration</tag>
+	<tag key="european-parliament">European Parliament</tag>
+	<tag key="public-administration">Public Administration</tag>
     </tags>
 </html>
diff --git a/news/2015/news-20150918-01.it.xhtml b/news/2015/news-20150918-01.it.xhtml
index 76431e0939..a2abab85f4 100644
--- a/news/2015/news-20150918-01.it.xhtml
+++ b/news/2015/news-20150918-01.it.xhtml
@@ -51,7 +51,7 @@
         <tag key="front-page"/>
 	<tag key="drm">DRM</tag>
 	<tag key="policy">Politiche</tag>
-	<tag key="europeanparliament">Parlamento Europeo</tag>
-	<tag key="publicadministration">Pubblica amministrazione</tag>
+	<tag key="european-parliament">Parlamento Europeo</tag>
+	<tag key="public-administration">Pubblica amministrazione</tag>
     </tags>
 </html>
diff --git a/news/2015/news-20150918-01.nl.xhtml b/news/2015/news-20150918-01.nl.xhtml
index e4d069df2e..f382c2355e 100644
--- a/news/2015/news-20150918-01.nl.xhtml
+++ b/news/2015/news-20150918-01.nl.xhtml
@@ -40,8 +40,8 @@ is nu beperkt tot het maken van privé-kopieën.</li>
         <tag key="front-page">voorpagina</tag>
 	<tag key="drm">digitaal beperkingenbeheer</tag>
 	<tag key="policy">beleid</tag>
-	<tag key="europeanparliament">Europees Parlement</tag>
-	<tag key="publicadministration">overheid</tag>
+	<tag key="european-parliament">Europees Parlement</tag>
+	<tag key="public-administration">overheid</tag>
     </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2015/news-20150918-01.sq.xhtml b/news/2015/news-20150918-01.sq.xhtml
index 9a991bfc04..9f6918f032 100644
--- a/news/2015/news-20150918-01.sq.xhtml
+++ b/news/2015/news-20150918-01.sq.xhtml
@@ -49,7 +49,7 @@
         <tag key="front-page"/>
 	<tag key="drm">DRM</tag>
 	<tag key="policy"/>
-	<tag key="europeanparliament">Parlamenti Europian</tag>
-	<tag key="publicadministration">Administrata Publike</tag>
+	<tag key="european-parliament">Parlamenti Europian</tag>
+	<tag key="public-administration">Administrata Publike</tag>
     </tags>
 </html>
diff --git a/news/2015/news-20150918-02.en.xhtml b/news/2015/news-20150918-02.en.xhtml
index dbe32cee5c..63781f072e 100644
--- a/news/2015/news-20150918-02.en.xhtml
+++ b/news/2015/news-20150918-02.en.xhtml
@@ -344,8 +344,8 @@ as it is essential to the fair spread of knowledge.</p>
   <tag key="front-page"/>
   <tag key="drm">DRM</tag>
   <tag key="policy"/>
-  <tag key="europeanparliament">European Parliament</tag>
-  <tag key="publicadministration">Public Administration</tag>
+  <tag key="european-parliament">European Parliament</tag>
+  <tag key="public-administration">Public Administration</tag>
 </tags>
 
 </html>
diff --git a/news/2015/news-20151013-01.de.xhtml b/news/2015/news-20151013-01.de.xhtml
index 329b08d54e..975010dcbf 100644
--- a/news/2015/news-20151013-01.de.xhtml
+++ b/news/2015/news-20151013-01.de.xhtml
@@ -107,7 +107,7 @@ machen!</p>
  
 	<tags>
 		<tag key="front-page"/>
-		<tag key="publicadministration">Öffentliche Verwaltung</tag>
+		<tag key="public-administration">Öffentliche Verwaltung</tag>
 		<tag key="pdfreaders">PDFreaders</tag>
 		<tag key="campaigns">Kampagne</tag>
 	</tags>
diff --git a/news/2015/news-20151013-01.el.xhtml b/news/2015/news-20151013-01.el.xhtml
index a7f2e7f16b..993466c0ea 100644
--- a/news/2015/news-20151013-01.el.xhtml
+++ b/news/2015/news-20151013-01.el.xhtml
@@ -52,7 +52,7 @@
  </body>
 	<tags>
 		<tag key="front-page"/>
-		<tag key="publicadministration">Public Administration</tag>
+		<tag key="public-administration">Public Administration</tag>
 		<tag key="pdfreaders">PDFreaders</tag>
 		<tag key="campaigns">Campaign</tag>
 	</tags>
diff --git a/news/2015/news-20151013-01.en.xhtml b/news/2015/news-20151013-01.en.xhtml
index dd9c3f4a43..4f7f8b9db8 100644
--- a/news/2015/news-20151013-01.en.xhtml
+++ b/news/2015/news-20151013-01.en.xhtml
@@ -87,7 +87,7 @@ privacy and freedom!"</p></blockquote>
  
 	<tags>
 		<tag key="front-page"/>
-		<tag key="publicadministration">Public Administration</tag>
+		<tag key="public-administration">Public Administration</tag>
 		<tag key="pdfreaders">PDFreaders</tag>
 		<tag key="campaigns">Campaign</tag>
 	</tags>
diff --git a/news/2015/news-20151013-01.es.xhtml b/news/2015/news-20151013-01.es.xhtml
index 7ddf3c9c07..7f8854ac9d 100644
--- a/news/2015/news-20151013-01.es.xhtml
+++ b/news/2015/news-20151013-01.es.xhtml
@@ -81,7 +81,7 @@ las páginas webs gubernamentales.</p>
     <tag key="front-page"/>
     <tag key="pdfreaders">PDFreaders</tag>
     <tag key="campaigns">Campaign</tag>
-    <tag key="publicadministration"/>
+    <tag key="public-administration"/>
   </tags>
   <translator>Eulalio Barbero</translator>
 </html>
diff --git a/news/2015/news-20151013-01.fr.xhtml b/news/2015/news-20151013-01.fr.xhtml
index 6a48b8bc1f..8e44be46b2 100644
--- a/news/2015/news-20151013-01.fr.xhtml
+++ b/news/2015/news-20151013-01.fr.xhtml
@@ -52,7 +52,7 @@ touche à sa fin ce mois-ci. Elle aura été l’une de nos campagnes les plus r
  
     <tags>
         <tag key="front-page"/>
-        <tag key="publicadministration">Public Administration</tag>
+        <tag key="public-administration">Public Administration</tag>
         <tag key="pdfreaders">PDFreaders</tag>
         <tag key="campaigns">Campaign</tag>
     </tags>
diff --git a/news/2015/news-20151013-01.it.xhtml b/news/2015/news-20151013-01.it.xhtml
index 7a299fab88..07b50e1199 100644
--- a/news/2015/news-20151013-01.it.xhtml
+++ b/news/2015/news-20151013-01.it.xhtml
@@ -97,7 +97,7 @@ hanno firmato questa petizione.</p>
     </ul>
   </sidebar>
   <tags>
-    <tag key="publicadministration">Pubblica Amministrazione</tag>
+    <tag key="public-administration">Pubblica Amministrazione</tag>
     <tag key="pdfreaders">Lettori PDF</tag>
     <tag key="campaigns">Campagne</tag>
     <tag key="front-page"/>
diff --git a/news/2015/news-20151013-01.nl.xhtml b/news/2015/news-20151013-01.nl.xhtml
index c527e7876d..eb50b7dc2c 100644
--- a/news/2015/news-20151013-01.nl.xhtml
+++ b/news/2015/news-20151013-01.nl.xhtml
@@ -72,7 +72,7 @@ respecteert!"</p></blockquote>
  
 	<tags>
 		<tag key="front-page">voorpagina</tag>
-		<tag key="publicadministration">overheid</tag>
+		<tag key="public-administration">overheid</tag>
 		<tag key="pdfreaders">PDF-lezers</tag>
 		<tag key="campaigns">Campagnes</tag>
 	</tags>
diff --git a/news/2015/news-20151013-01.pt.xhtml b/news/2015/news-20151013-01.pt.xhtml
index 83e29ea285..bf900c11d8 100644
--- a/news/2015/news-20151013-01.pt.xhtml
+++ b/news/2015/news-20151013-01.pt.xhtml
@@ -98,7 +98,7 @@ indivíduos assinaram esta petição.</p>
     </ul>
   </sidebar>
   <tags>
-    <tag key="publicadministration">Public Administration</tag>
+    <tag key="public-administration">Public Administration</tag>
     <tag key="pdfreaders">PDFreaders</tag>
     <tag key="campaigns">Campaign</tag>
     <tag key="front-page"/>
diff --git a/news/2015/news-20151013-01.sq.xhtml b/news/2015/news-20151013-01.sq.xhtml
index 478605f52e..18a88d9192 100644
--- a/news/2015/news-20151013-01.sq.xhtml
+++ b/news/2015/news-20151013-01.sq.xhtml
@@ -86,7 +86,7 @@ ashtu edhe ndërkombëtare.</p>
  
 	<tags>
 		<tag key="front-page"/>
-		<tag key="publicadministration">Administratë Publike</tag>
+		<tag key="public-administration">Administratë Publike</tag>
 		<tag key="pdfreaders">PDFreaders</tag>
 		<tag key="campaigns">Fushatë</tag>
 	</tags>
diff --git a/news/2015/news-20151020-01.el.xhtml b/news/2015/news-20151020-01.el.xhtml
index 031163dc5b..fc8a6f2678 100644
--- a/news/2015/news-20151020-01.el.xhtml
+++ b/news/2015/news-20151020-01.el.xhtml
@@ -18,6 +18,6 @@
  
 	<tags>
 		<tag key="front-page"/>
-		<tag key="announce">Announcement</tag>
+		<tag key="internal">Announcement</tag>
 	</tags>
 </html>
diff --git a/news/2015/news-20151020-01.en.xhtml b/news/2015/news-20151020-01.en.xhtml
index ff493ad73f..9096a7d585 100644
--- a/news/2015/news-20151020-01.en.xhtml
+++ b/news/2015/news-20151020-01.en.xhtml
@@ -22,6 +22,6 @@ who joined the celebration. </p>
  
 	<tags>
 		<tag key="front-page"/>
-		<tag key="announce">Announcement</tag>
+		<tag key="internal">Announcement</tag>
 	</tags>
 </html>
diff --git a/news/2015/news-20151020-01.nl.xhtml b/news/2015/news-20151020-01.nl.xhtml
index c6d6007480..de0e9e460a 100644
--- a/news/2015/news-20151020-01.nl.xhtml
+++ b/news/2015/news-20151020-01.nl.xhtml
@@ -21,7 +21,7 @@ iedereen die deelnam aan deze viering.</p>
  
 	<tags>
 		<tag key="front-page">voorpagina</tag>
-		<tag key="announce">bekendmaking</tag>
+		<tag key="internal">bekendmaking</tag>
 	</tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2015/news-20151020-01.sq.xhtml b/news/2015/news-20151020-01.sq.xhtml
index b4354ed042..24ad805b8d 100644
--- a/news/2015/news-20151020-01.sq.xhtml
+++ b/news/2015/news-20151020-01.sq.xhtml
@@ -22,6 +22,6 @@ organizimin e veprimtarisë dhe për krejt pjesëmarrësit në kremtim. </p>
  
 	<tags>
 		<tag key="front-page"/>
-		<tag key="announce">Lajmërim</tag>
+		<tag key="internal">Lajmërim</tag>
 	</tags>
 </html>
diff --git a/news/2015/news-20151104-01.el.xhtml b/news/2015/news-20151104-01.el.xhtml
index 7d3f747c21..7dd618db93 100644
--- a/news/2015/news-20151104-01.el.xhtml
+++ b/news/2015/news-20151104-01.el.xhtml
@@ -41,9 +41,9 @@
     
     <tags>
         <tag key="front-page"/>
-		<tag key="digitalsinglemarket">Digital Single Market</tag>
+		<tag key="digital-single-market">Digital Single Market</tag>
 		<tag key="policy">Policy</tag>
-		<tag key="europeancommission">European Commission</tag>
-		<tag key="publicadministration">Public Administration</tag>
+		<tag key="european-commission">European Commission</tag>
+		<tag key="public-administration">Public Administration</tag>
     </tags>
 </html>
diff --git a/news/2015/news-20151104-01.en.xhtml b/news/2015/news-20151104-01.en.xhtml
index 88dc2e5bde..9b33d734f0 100644
--- a/news/2015/news-20151104-01.en.xhtml
+++ b/news/2015/news-20151104-01.en.xhtml
@@ -75,9 +75,9 @@
     
     <tags>
         <tag key="front-page"/>
-		<tag key="digitalsinglemarket">Digital Single Market</tag>
+		<tag key="digital-single-market">Digital Single Market</tag>
 		<tag key="policy">Policy</tag>
-		<tag key="europeancommission">European Commission</tag>
-		<tag key="publicadministration">Public Administration</tag>
+		<tag key="european-commission">European Commission</tag>
+		<tag key="public-administration">Public Administration</tag>
     </tags>
 </html>
diff --git a/news/2015/news-20151104-01.nl.xhtml b/news/2015/news-20151104-01.nl.xhtml
index 876f516e2e..0a4aaf2ebf 100644
--- a/news/2015/news-20151104-01.nl.xhtml
+++ b/news/2015/news-20151104-01.nl.xhtml
@@ -79,10 +79,10 @@ volledige evaluatie van de digitale interne marktstrategie</a></strong>.</p>
     
     <tags>
         <tag key="front-page">voorpagina</tag>
-		<tag key="digitalsinglemarket">digitale interne markt</tag>
+		<tag key="digital-single-market">digitale interne markt</tag>
 		<tag key="policy">Beleid</tag>
-		<tag key="europeancommission">Europese Commissie</tag>
-		<tag key="publicadministration">overheid</tag>
+		<tag key="european-commission">Europese Commissie</tag>
+		<tag key="public-administration">overheid</tag>
     </tags>
 <translator>Andre Ockers</translator>
 </html>
diff --git a/news/2015/news-20151104-01.sq.xhtml b/news/2015/news-20151104-01.sq.xhtml
index 41ea91d6e0..0f024785aa 100644
--- a/news/2015/news-20151104-01.sq.xhtml
+++ b/news/2015/news-20151104-01.sq.xhtml
@@ -74,9 +74,9 @@
     
     <tags>
         <tag key="front-page"/>
-		<tag key="digitalsinglemarket">Treg i Përbashkët Dixhital</tag>
+		<tag key="digital-single-market">Treg i Përbashkët Dixhital</tag>
 		<tag key="policy">Policy</tag>
-		<tag key="europeancommission">Komisioni Europian</tag>
-		<tag key="publicadministration">Administratë Publike</tag>
+		<tag key="european-commission">Komisioni Europian</tag>
+		<tag key="public-administration">Administratë Publike</tag>
     </tags>
 </html>
diff --git a/news/2015/news-20151110-01.el.xhtml b/news/2015/news-20151110-01.el.xhtml
index 5b382e7862..977eed757e 100644
--- a/news/2015/news-20151110-01.el.xhtml
+++ b/news/2015/news-20151110-01.el.xhtml
@@ -48,7 +48,7 @@
 </body>
 	<tags>
 		<tag key="front-page"/>
-		<tag key="europeanparliament">European Parliament</tag>
+		<tag key="european-parliament">European Parliament</tag>
 		<tag key="policy">Policy</tag>
 	</tags>
 
diff --git a/news/2015/news-20151110-01.en.xhtml b/news/2015/news-20151110-01.en.xhtml
index 04309342fc..f2ca233d45 100644
--- a/news/2015/news-20151110-01.en.xhtml
+++ b/news/2015/news-20151110-01.en.xhtml
@@ -42,7 +42,7 @@ encryption tools</strong>.</blockquote>
 </body>
 	<tags>
 		<tag key="front-page"/>
-		<tag key="europeanparliament">European Parliament</tag>
+		<tag key="european-parliament">European Parliament</tag>
 		<tag key="policy">Policy</tag>
 	</tags>
 
diff --git a/news/2015/news-20151110-01.fr.xhtml b/news/2015/news-20151110-01.fr.xhtml
index 98911604a5..07c4928b63 100644
--- a/news/2015/news-20151110-01.fr.xhtml
+++ b/news/2015/news-20151110-01.fr.xhtml
@@ -28,7 +28,7 @@
 </body>
     <tags>
         <tag key="front-page"/>
-        <tag key="europeanparliament">European Parliament</tag>
+        <tag key="european-parliament">European Parliament</tag>
         <tag key="policy">Policy</tag>
     </tags>
 <translator> MDDN</translator>
diff --git a/news/2015/news-20151110-01.nl.xhtml b/news/2015/news-20151110-01.nl.xhtml
index 6196c72536..7160f20b94 100644
--- a/news/2015/news-20151110-01.nl.xhtml
+++ b/news/2015/news-20151110-01.nl.xhtml
@@ -43,7 +43,7 @@ voorzieningen te treffen voor Vrije Software.</p>
 </body>
 	<tags>
 		<tag key="front-page">voorpagina</tag>
-		<tag key="europeanparliament">Europees Parlement</tag>
+		<tag key="european-parliament">Europees Parlement</tag>
 		<tag key="policy">beleid</tag>
 	</tags>
 <translator>André Ockers</translator>
diff --git a/news/2015/news-20151110-01.sq.xhtml b/news/2015/news-20151110-01.sq.xhtml
index 68b77cd562..21d2badb72 100644
--- a/news/2015/news-20151110-01.sq.xhtml
+++ b/news/2015/news-20151110-01.sq.xhtml
@@ -45,7 +45,7 @@ dhe për mundësi të efektshme pasjeje mjetesh fshehtëzimi</strong>.</blockquo
 </body>
 	<tags>
 		<tag key="front-page"/>
-		<tag key="europeanparliament">Parlamenti Europian</tag>
+		<tag key="european-parliament">Parlamenti Europian</tag>
 		<tag key="policy">Politika</tag>
 	</tags>
 
diff --git a/news/2015/news-20151203-01.el.xhtml b/news/2015/news-20151203-01.el.xhtml
index 6cfa43e2bb..e1db944723 100644
--- a/news/2015/news-20151203-01.el.xhtml
+++ b/news/2015/news-20151203-01.el.xhtml
@@ -23,7 +23,7 @@
  
 	<tags>
 		<tag key="front-page"/>
-		<tag key="announce">Announcement</tag>
+		<tag key="internal">Announcement</tag>
 		<tag key="education">Education</tag>
 		<tag key="fr">France</tag>
 	</tags>
diff --git a/news/2015/news-20151203-01.en.xhtml b/news/2015/news-20151203-01.en.xhtml
index c5adf673aa..c11ee09072 100644
--- a/news/2015/news-20151203-01.en.xhtml
+++ b/news/2015/news-20151203-01.en.xhtml
@@ -19,7 +19,7 @@ Microsoft and the French Minister of Education. Full text of <a href="http://www
  
 	<tags>
 		<tag key="front-page"/>
-		<tag key="announce">Announcement</tag>
+		<tag key="internal">Announcement</tag>
 		<tag key="education">Education</tag>
 		<tag key="fr">France</tag>
 	</tags>
diff --git a/news/2015/news-20151203-01.fr.xhtml b/news/2015/news-20151203-01.fr.xhtml
index 8a41c16f13..3285a4aa12 100644
--- a/news/2015/news-20151203-01.fr.xhtml
+++ b/news/2015/news-20151203-01.fr.xhtml
@@ -23,7 +23,7 @@ accord entre Microsoft et le ministère de l'Éducation nationale.
  
 	<tags>
 		<tag key="front-page"/>
-		<tag key="announce">Announcement</tag>
+		<tag key="internal">Announcement</tag>
 		<tag key="education">rÉducation</tag>
 		<tag key="fr">France</tag>
 	</tags>
diff --git a/news/2015/news-20151203-01.nl.xhtml b/news/2015/news-20151203-01.nl.xhtml
index 505f7f3823..b266d6cd3f 100644
--- a/news/2015/news-20151203-01.nl.xhtml
+++ b/news/2015/news-20151203-01.nl.xhtml
@@ -19,7 +19,7 @@ Microsoft en de Franse minister van Onderwijs. De volledige tekst van het <a hre
  
 	<tags>
 		<tag key="front-page">voorpagina</tag>
-		<tag key="announce">aankondiging</tag>
+		<tag key="internal">aankondiging</tag>
 		<tag key="education">educatie</tag>
 		<tag key="fr">Frankrijk</tag>
 	</tags>
diff --git a/news/2015/news-20151203-01.sq.xhtml b/news/2015/news-20151203-01.sq.xhtml
index 55f49919fe..1438a8ed9b 100644
--- a/news/2015/news-20151203-01.sq.xhtml
+++ b/news/2015/news-20151203-01.sq.xhtml
@@ -18,7 +18,7 @@
  
 	<tags>
 		<tag key="front-page"/>
-		<tag key="announce">Njoftim</tag>
+		<tag key="internal">Njoftim</tag>
 		<tag key="education">Arsim</tag>
 		<tag key="fr">Francë</tag>
 	</tags>
diff --git a/news/2016/news-20160118-01.en.xhtml b/news/2016/news-20160118-01.en.xhtml
index 0564267f09..4f8d02cfba 100644
--- a/news/2016/news-20160118-01.en.xhtml
+++ b/news/2016/news-20160118-01.en.xhtml
@@ -40,10 +40,10 @@ that are free from royalties and other restrictions.</p></li>
 </body>
 <tags>
         <tag key="front-page"/>
-	<tag key="digitalsinglemarket">Digital Single Market</tag>
+	<tag key="digital-single-market">Digital Single Market</tag>
         <tag key="policy">Policy</tag>
         <tag key="openstandards">Open Standards</tag>
-        <tag key="europeancommission">European Commission</tag>
-        <tag key="publicadministration">Public Administration</tag>
+        <tag key="european-commission">European Commission</tag>
+        <tag key="public-administration">Public Administration</tag>
     </tags>
 </html>
diff --git a/news/2016/news-20160118-01.fr.xhtml b/news/2016/news-20160118-01.fr.xhtml
index b440914f02..7b30b20b9e 100644
--- a/news/2016/news-20160118-01.fr.xhtml
+++ b/news/2016/news-20160118-01.fr.xhtml
@@ -29,10 +29,10 @@
         </body>
 	<tags>
         <tag key="front-page"/>
-    <tag key="digitalsinglemarket">Digital Single Market</tag>
+    <tag key="digital-single-market">Digital Single Market</tag>
         <tag key="policy">Policy</tag>
         <tag key="openstandards">Open Standards</tag>
-        <tag key="europeancommission">European Commission</tag>
-        <tag key="publicadministration">Public Administration</tag>
+        <tag key="european-commission">European Commission</tag>
+        <tag key="public-administration">Public Administration</tag>
     </tags>
 </html>
diff --git a/news/2016/news-20160118-01.nl.xhtml b/news/2016/news-20160118-01.nl.xhtml
index c437f56ca7..50bc007acc 100644
--- a/news/2016/news-20160118-01.nl.xhtml
+++ b/news/2016/news-20160118-01.nl.xhtml
@@ -50,11 +50,11 @@ vergoedingen ('royalties') en andere beperkingen.</p></li>
 </body>
 <tags>
         <tag key="front-page">voorpagina</tag>
-	<tag key="digitalsinglemarket">digitale interne markt</tag>
+	<tag key="digital-single-market">digitale interne markt</tag>
         <tag key="policy">beleid</tag>
         <tag key="openstandards">Open Standaarden</tag>
-        <tag key="europeancommission">Europese Commissie</tag>
-        <tag key="publicadministration">overheid</tag>
+        <tag key="european-commission">Europese Commissie</tag>
+        <tag key="public-administration">overheid</tag>
     </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2016/news-20160118-01.sq.xhtml b/news/2016/news-20160118-01.sq.xhtml
index 0f95af10a2..d7ff23bde1 100644
--- a/news/2016/news-20160118-01.sq.xhtml
+++ b/news/2016/news-20160118-01.sq.xhtml
@@ -40,10 +40,10 @@ apo kufizime të tjera.</p></li>
 </body>
 <tags>
         <tag key="front-page"/>
-	<tag key="digitalsinglemarket">Tregu i Përbashkët Dixhital</tag>
+	<tag key="digital-single-market">Tregu i Përbashkët Dixhital</tag>
         <tag key="policy">Politika</tag>
         <tag key="openstandards">Standarde të Hapura</tag>
-        <tag key="europeancommission">Komisioni Europian</tag>
-        <tag key="publicadministration">Administrata Publike</tag>
+        <tag key="european-commission">Komisioni Europian</tag>
+        <tag key="public-administration">Administrata Publike</tag>
     </tags>
 </html>
diff --git a/news/2016/news-20160128-01.en.xhtml b/news/2016/news-20160128-01.en.xhtml
index d4ceb18f30..8fb9822243 100644
--- a/news/2016/news-20160128-01.en.xhtml
+++ b/news/2016/news-20160128-01.en.xhtml
@@ -47,9 +47,9 @@ initiatives.</p>
 </body>
 <tags>
         <tag key="front-page"/>
-	<tag key="digitalsinglemarket">Digital Single Market</tag>
+	<tag key="digital-single-market">Digital Single Market</tag>
         <tag key="policy">Policy</tag>
-        <tag key="europeanparliament">European Parliament</tag>
-        <tag key="publicadministration">Public Administration</tag>
+        <tag key="european-parliament">European Parliament</tag>
+        <tag key="public-administration">Public Administration</tag>
     </tags>
 </html>
diff --git a/news/2016/news-20160128-01.fr.xhtml b/news/2016/news-20160128-01.fr.xhtml
index a8dd1850b7..e57474c13e 100644
--- a/news/2016/news-20160128-01.fr.xhtml
+++ b/news/2016/news-20160128-01.fr.xhtml
@@ -46,13 +46,13 @@
 
     <tag key="front-page"/>
 
-    <tag key="digitalsinglemarket">Digital Single Market</tag>
+    <tag key="digital-single-market">Digital Single Market</tag>
 
     <tag key="policy">Policy</tag>
 
-    <tag key="europeanparliament">European Parliament</tag>
+    <tag key="european-parliament">European Parliament</tag>
 
-    <tag key="publicadministration">Public Administration</tag>
+    <tag key="public-administration">Public Administration</tag>
 
     </tags>
 
diff --git a/news/2016/news-20160128-01.nl.xhtml b/news/2016/news-20160128-01.nl.xhtml
index 5218d5f92f..f4bb191f8c 100644
--- a/news/2016/news-20160128-01.nl.xhtml
+++ b/news/2016/news-20160128-01.nl.xhtml
@@ -52,10 +52,10 @@ interne markt-initiatieven.</p>
 </body>
 <tags>
         <tag key="front-page">voorpagina</tag>
-	<tag key="digitalsinglemarket">digitale interne markt</tag>
+	<tag key="digital-single-market">digitale interne markt</tag>
         <tag key="policy">beleid</tag>
-        <tag key="europeanparliament">Europees Parlement</tag>
-        <tag key="publicadministration">overheid</tag>
+        <tag key="european-parliament">Europees Parlement</tag>
+        <tag key="public-administration">overheid</tag>
     </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2016/news-20160128-01.sq.xhtml b/news/2016/news-20160128-01.sq.xhtml
index 334bfa398d..836c2ada7b 100644
--- a/news/2016/news-20160128-01.sq.xhtml
+++ b/news/2016/news-20160128-01.sq.xhtml
@@ -49,9 +49,9 @@ Dixhital.</p>
 </body>
 <tags>
         <tag key="front-page"/>
-	<tag key="digitalsinglemarket">Tregu i Përbashkët Dixhital</tag>
+	<tag key="digital-single-market">Tregu i Përbashkët Dixhital</tag>
         <tag key="policy">Politika</tag>
-        <tag key="europeanparliament">Parlamenti Europian</tag>
-        <tag key="publicadministration">Administrata Publike</tag>
+        <tag key="european-parliament">Parlamenti Europian</tag>
+        <tag key="public-administration">Administrata Publike</tag>
     </tags>
 </html>
diff --git a/news/2016/news-20160205-01.en.xhtml b/news/2016/news-20160205-01.en.xhtml
index 3af0601150..c67c38d52f 100644
--- a/news/2016/news-20160205-01.en.xhtml
+++ b/news/2016/news-20160205-01.en.xhtml
@@ -94,8 +94,8 @@ ideas.</p>
         <tag key="front-page"/>
         <tag key="policy">Policy</tag>
         <tag key="openstandards">Open Standards</tag>
-        <tag key="europeancommission">European Commission</tag>
-        <tag key="europeanparliament">European Parliament</tag>
-        <tag key="publicadministration">Public Administration</tag>
+        <tag key="european-commission">European Commission</tag>
+        <tag key="european-parliament">European Parliament</tag>
+        <tag key="public-administration">Public Administration</tag>
     </tags>
 </html>
diff --git a/news/2016/news-20160205-01.nl.xhtml b/news/2016/news-20160205-01.nl.xhtml
index c09ab5cb1d..f27cef18b0 100644
--- a/news/2016/news-20160205-01.nl.xhtml
+++ b/news/2016/news-20160205-01.nl.xhtml
@@ -107,9 +107,9 @@ kunnen ontmoeten en visies en ideeën kunnen uitwisselen.</p>
         <tag key="front-page">voorpagina</tag>
         <tag key="policy">beleid</tag>
         <tag key="openstandards">Open Standaarden</tag>
-        <tag key="europeancommission">Europese Commissie</tag>
-        <tag key="europeanparliament">European Parliament</tag>
-        <tag key="publicadministration">overheid</tag>
+        <tag key="european-commission">Europese Commissie</tag>
+        <tag key="european-parliament">European Parliament</tag>
+        <tag key="public-administration">overheid</tag>
     </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2016/news-20160205-01.sq.xhtml b/news/2016/news-20160205-01.sq.xhtml
index 27f45ae4b5..5af54e7f45 100644
--- a/news/2016/news-20160205-01.sq.xhtml
+++ b/news/2016/news-20160205-01.sq.xhtml
@@ -96,8 +96,8 @@ të takohen dhe të shkëmbejnë mendime dhe ide.</p>
         <tag key="front-page"/>
         <tag key="policy">Politika</tag>
         <tag key="openstandards">Standarde të Hapur</tag>
-        <tag key="europeancommission">Komisioni Europian</tag>
-        <tag key="europeanparliament">European Parliament</tag>
-        <tag key="publicadministration">Administrata  Publike</tag>
+        <tag key="european-commission">Komisioni Europian</tag>
+        <tag key="european-parliament">European Parliament</tag>
+        <tag key="public-administration">Administrata  Publike</tag>
     </tags>
 </html>
diff --git a/news/2016/news-20160411-01.de.xhtml b/news/2016/news-20160411-01.de.xhtml
index 80bc9080d4..2f71c7021d 100644
--- a/news/2016/news-20160411-01.de.xhtml
+++ b/news/2016/news-20160411-01.de.xhtml
@@ -75,7 +75,7 @@ diesem Thema haben.</p>
   <tag key="radiodirective">Funkabschottung</tag>
   <tag key="policy">Politik</tag>
   <tag key="competition">Wettbewerb</tag>
-  <tag key="europeanparliament">Europäisches Parlament</tag>
-  <tag key="europeancommission">Europäische Kommission</tag>
+  <tag key="european-parliament">Europäisches Parlament</tag>
+  <tag key="european-commission">Europäische Kommission</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160411-01.en.xhtml b/news/2016/news-20160411-01.en.xhtml
index 73017cbd13..186d5fd2ef 100644
--- a/news/2016/news-20160411-01.en.xhtml
+++ b/news/2016/news-20160411-01.en.xhtml
@@ -67,7 +67,7 @@ analysis</a>, and feel free to contact us if you have any questions.</p>
   <tag key="radiodirective">Radio Lockdown Directive</tag>
   <tag key="policy">Policy</tag>
   <tag key="competition">Competition</tag>
-  <tag key="europeanparliament">European Parliament</tag>
-  <tag key="europeancommission">European Commission</tag>
+  <tag key="european-parliament">European Parliament</tag>
+  <tag key="european-commission">European Commission</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160411-01.nl.xhtml b/news/2016/news-20160411-01.nl.xhtml
index 94efe0354a..791928d4ee 100644
--- a/news/2016/news-20160411-01.nl.xhtml
+++ b/news/2016/news-20160411-01.nl.xhtml
@@ -69,8 +69,8 @@ analyse</a> en voel u vrij om contact met ons op te nemen als u een vraag heeft.
   <tag key="radiodirective">radioafschermingsrichtlijn</tag>
   <tag key="policy">beleid</tag>
   <tag key="competition">competitie</tag>
-  <tag key="europeanparliament">Europees Parlement</tag>
-  <tag key="europeancommission">Europese Commissie</tag>
+  <tag key="european-parliament">Europees Parlement</tag>
+  <tag key="european-commission">Europese Commissie</tag>
 </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2016/news-20160411-01.sq.xhtml b/news/2016/news-20160411-01.sq.xhtml
index c2353dc973..4a434cca3e 100644
--- a/news/2016/news-20160411-01.sq.xhtml
+++ b/news/2016/news-20160411-01.sq.xhtml
@@ -67,7 +67,7 @@ tonë të hollësishme</a>, dhe mos ngurroni të lidheni me ne, nëse keni ndonj
   <tag key="radiodirective">Udhëzimi mbi Bllokimet Radio</tag>
   <tag key="policy">Politika</tag>
   <tag key="competition">Konkurrencë</tag>
-  <tag key="europeanparliament">Parlamenti Europian</tag>
-  <tag key="europeancommission">Komisioni Europian</tag>
+  <tag key="european-parliament">Parlamenti Europian</tag>
+  <tag key="european-commission">Komisioni Europian</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160428-01.de.xhtml b/news/2016/news-20160428-01.de.xhtml
index a261529dbb..f59b009caf 100644
--- a/news/2016/news-20160428-01.de.xhtml
+++ b/news/2016/news-20160428-01.de.xhtml
@@ -24,9 +24,9 @@
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
   <tag key="cfp">Call for Participation</tag>
-  <tag key="15yearsfsfe">15 years FSFE</tag>
+  <tag key="anniversary">15 years FSFE</tag>
   <tag key="community">Community event</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160428-01.en.xhtml b/news/2016/news-20160428-01.en.xhtml
index 6a9a1c115e..86619b8e16 100644
--- a/news/2016/news-20160428-01.en.xhtml
+++ b/news/2016/news-20160428-01.en.xhtml
@@ -24,9 +24,9 @@
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
   <tag key="cfp">Call for Participation</tag>
-  <tag key="15yearsfsfe">15 years FSFE</tag>
+  <tag key="anniversary">15 years FSFE</tag>
   <tag key="community">Community event</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160428-01.es.xhtml b/news/2016/news-20160428-01.es.xhtml
index ac3592de3c..2283a723e4 100644
--- a/news/2016/news-20160428-01.es.xhtml
+++ b/news/2016/news-20160428-01.es.xhtml
@@ -24,9 +24,9 @@
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
   <tag key="cfp">Call for Participation</tag>
-  <tag key="15yearsfsfe">15 years FSFE</tag>
+  <tag key="anniversary">15 years FSFE</tag>
   <tag key="community">Community event</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160428-01.fr.xhtml b/news/2016/news-20160428-01.fr.xhtml
index d9817c57e8..66e7aa5038 100644
--- a/news/2016/news-20160428-01.fr.xhtml
+++ b/news/2016/news-20160428-01.fr.xhtml
@@ -24,9 +24,9 @@
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
   <tag key="cfp">Call for Participation</tag>
-  <tag key="15yearsfsfe">15 years FSFE</tag>
+  <tag key="anniversary">15 years FSFE</tag>
   <tag key="community">Community event</tag>
 </tags>
 
diff --git a/news/2016/news-20160428-01.nl.xhtml b/news/2016/news-20160428-01.nl.xhtml
index 094dbb90fe..8a3ae2eed9 100644
--- a/news/2016/news-20160428-01.nl.xhtml
+++ b/news/2016/news-20160428-01.nl.xhtml
@@ -41,8 +41,8 @@ te delen en te verbeteren.
     <tag key="front-page"/>
     <tag key="cfp">Oproep voor daelname</tag>
     <tag key="community">Gemeenschapsevenement</tag>
-    <tag key="15yearsfsfe"/>
-    <tag key="fsfesummit"/>
+    <tag key="anniversary"/>
+    <tag key="fsfe-summit"/>
   </tags>
   <translator>André Ockers</translator>
 </html>
diff --git a/news/2016/news-20160428-01.pt.xhtml b/news/2016/news-20160428-01.pt.xhtml
index ce4fdb76bc..4a37d4be96 100644
--- a/news/2016/news-20160428-01.pt.xhtml
+++ b/news/2016/news-20160428-01.pt.xhtml
@@ -24,9 +24,9 @@ A nossa ideia para o primeiro FSFE summit é executar um evento que é organizad
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
   <tag key="cfp">Call for Participation</tag>
-  <tag key="15yearsfsfe">15 years FSFE</tag>
+  <tag key="anniversary">15 years FSFE</tag>
   <tag key="community">Community event</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160428-01.sq.xhtml b/news/2016/news-20160428-01.sq.xhtml
index ca57d31b7c..b452ed0041 100644
--- a/news/2016/news-20160428-01.sq.xhtml
+++ b/news/2016/news-20160428-01.sq.xhtml
@@ -24,9 +24,9 @@
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">Kuvendi i FSFE-së</tag>
+  <tag key="fsfe-summit">Kuvendi i FSFE-së</tag>
   <tag key="cfp">Thirrje për Pjesëmarrje</tag>
-  <tag key="15yearsfsfe">15 vjet FSFE</tag>
+  <tag key="anniversary">15 vjet FSFE</tag>
   <tag key="community">Veprimtari e bashkësisë</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160428-02.en.xhtml b/news/2016/news-20160428-02.en.xhtml
index 1709734945..a9afc4d9a4 100644
--- a/news/2016/news-20160428-02.en.xhtml
+++ b/news/2016/news-20160428-02.en.xhtml
@@ -101,7 +101,7 @@ to encourage Free Software communities to participate in standardisation.</p>
   <tag key="front-page"/>
   <tag key="openstandards">Open Standards</tag>
   <tag key="policy">Policy</tag>
-  <tag key="europeancommission">European Commission</tag>
-  <tag key="digitalsinglemarket">Digital Single Market</tag>
+  <tag key="european-commission">European Commission</tag>
+  <tag key="digital-single-market">Digital Single Market</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160428-02.nl.xhtml b/news/2016/news-20160428-02.nl.xhtml
index 21efd44b10..3461eeaac0 100644
--- a/news/2016/news-20160428-02.nl.xhtml
+++ b/news/2016/news-20160428-02.nl.xhtml
@@ -104,8 +104,8 @@ om deel te nemen aan standaardisatie.</p>
   <tag key="front-page"/>
   <tag key="openstandards">open standaarden</tag>
   <tag key="policy">beleid</tag>
-  <tag key="europeancommission">Europese Commissie</tag>
-  <tag key="digitalsinglemarket">digitale interne markt</tag>
+  <tag key="european-commission">Europese Commissie</tag>
+  <tag key="digital-single-market">digitale interne markt</tag>
 </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2016/news-20160428-02.sq.xhtml b/news/2016/news-20160428-02.sq.xhtml
index e4aac1265c..e02e5b0fdd 100644
--- a/news/2016/news-20160428-02.sq.xhtml
+++ b/news/2016/news-20160428-02.sq.xhtml
@@ -97,7 +97,7 @@ të marrin pjesë në proceset e standardizimit.</p>
   <tag key="front-page"/>
   <tag key="openstandards">Standarde të Hapura</tag>
   <tag key="policy">Politika</tag>
-  <tag key="europeancommission">Komisioni Europian</tag>
-  <tag key="digitalsinglemarket">Tregu i Përbashkët Dixhital</tag>
+  <tag key="european-commission">Komisioni Europian</tag>
+  <tag key="digital-single-market">Tregu i Përbashkët Dixhital</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160624-01.en.xhtml b/news/2016/news-20160624-01.en.xhtml
index 755979817c..3c122571ae 100644
--- a/news/2016/news-20160624-01.en.xhtml
+++ b/news/2016/news-20160624-01.en.xhtml
@@ -57,7 +57,7 @@ and Open Standards are quintessential for interoperability.</p>
   <tag key="eif"/>
   <tag key="openstandards">Open Standards</tag>
   <tag key="policy">Policy</tag>
-  <tag key="europeancommission">European Commission</tag>
-  <tag key="digitalsinglemarket">Digital Single Market</tag>
+  <tag key="european-commission">European Commission</tag>
+  <tag key="digital-single-market">Digital Single Market</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160624-01.nl.xhtml b/news/2016/news-20160624-01.nl.xhtml
index 9ffbe41501..834b3af377 100644
--- a/news/2016/news-20160624-01.nl.xhtml
+++ b/news/2016/news-20160624-01.nl.xhtml
@@ -53,8 +53,8 @@ en Open Standaarden essentieel zijn voor interoperabiliteit.</p>
     <tag key="front-page"/>
     <tag key="openstandards">Open Standaarden</tag>
     <tag key="policy">beleid</tag>
-    <tag key="europeancommission">Europese Commissie</tag>
-    <tag key="digitalsinglemarket">Digitale interne markt</tag>
+    <tag key="european-commission">Europese Commissie</tag>
+    <tag key="digital-single-market">Digitale interne markt</tag>
     <tag key="eif"/>
   </tags>
   <translator>André Ockers</translator>
diff --git a/news/2016/news-20160624-01.sq.xhtml b/news/2016/news-20160624-01.sq.xhtml
index 8af4051660..906d2e3ba0 100644
--- a/news/2016/news-20160624-01.sq.xhtml
+++ b/news/2016/news-20160624-01.sq.xhtml
@@ -59,7 +59,7 @@ se Software i Lirë dhe Standardet e Hapëta janë thelbësore për ndërveprues
   <tag key="eif"/>
   <tag key="openstandards">Standarde të Hapëta</tag>
   <tag key="policy">Politika</tag>
-  <tag key="europeancommission">Komisioni Europian</tag>
-  <tag key="digitalsinglemarket">Tregu i Përbashkët Dixhital</tag>
+  <tag key="european-commission">Komisioni Europian</tag>
+  <tag key="digital-single-market">Tregu i Përbashkët Dixhital</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160701-01.de.xml b/news/2016/news-20160701-01.de.xml
index b9e8506c99..18f7ac33bb 100644
--- a/news/2016/news-20160701-01.de.xml
+++ b/news/2016/news-20160701-01.de.xml
@@ -18,7 +18,7 @@
     <link>https://fsfe.org/community/events/2016/summit/frontpage.de.html</link>
     <tags>
         <tag key="front-page"/>
-      <tag key="fsfesummit">FSFE summit</tag>
+      <tag key="fsfe-summit">FSFE summit</tag>
       <tag key="community">Community</tag>
     </tags>
   </news>
diff --git a/news/2016/news-20160701-01.en.xml b/news/2016/news-20160701-01.en.xml
index 9675b097a9..d342b4ae54 100644
--- a/news/2016/news-20160701-01.en.xml
+++ b/news/2016/news-20160701-01.en.xml
@@ -18,7 +18,7 @@
     <link>https://fsfe.org/community/events/2016/summit/frontpage</link>
     <tags>
         <tag key="front-page"/>
-      <tag key="fsfesummit">FSFE summit</tag>
+      <tag key="fsfe-summit">FSFE summit</tag>
       <tag key="community">Community</tag>
     </tags>
   </news>
diff --git a/news/2016/news-20160701-01.es.xml b/news/2016/news-20160701-01.es.xml
index b2523e2129..14f632b093 100644
--- a/news/2016/news-20160701-01.es.xml
+++ b/news/2016/news-20160701-01.es.xml
@@ -18,7 +18,7 @@
     <link>https://fsfe.org/community/events/2016/summit/frontpage.es.html</link>
     <tags>
         <tag key="front-page"/>
-      <tag key="fsfesummit">FSFE summit</tag>
+      <tag key="fsfe-summit">FSFE summit</tag>
       <tag key="community">Community</tag>
     </tags>
   </news>
diff --git a/news/2016/news-20160701-01.fr.xml b/news/2016/news-20160701-01.fr.xml
index a1dd9c915e..bbc9650ded 100644
--- a/news/2016/news-20160701-01.fr.xml
+++ b/news/2016/news-20160701-01.fr.xml
@@ -18,7 +18,7 @@
     <link>https://fsfe.org/community/events/2016/summit/frontpage.fr.html</link>
     <tags>
         <tag key="front-page"/>
-      <tag key="fsfesummit">FSFE summit</tag>
+      <tag key="fsfe-summit">FSFE summit</tag>
       <tag key="community">Community</tag>
     </tags>
   </news>
diff --git a/news/2016/news-20160701-01.nl.xml b/news/2016/news-20160701-01.nl.xml
index a0f650a598..6ce85b5a6a 100644
--- a/news/2016/news-20160701-01.nl.xml
+++ b/news/2016/news-20160701-01.nl.xml
@@ -18,7 +18,7 @@
     <link>https://fsfe.org/community/events/2016/summit/frontpage.nl.html</link>
     <tags>
         <tag key="front-page"/>
-      <tag key="fsfesummit">FSFE summit</tag>
+      <tag key="fsfe-summit">FSFE summit</tag>
       <tag key="community">Community</tag>
     </tags>
   </news>
diff --git a/news/2016/news-20160701-01.sq.xml b/news/2016/news-20160701-01.sq.xml
index d0721f4e1c..8fbfc35b5e 100644
--- a/news/2016/news-20160701-01.sq.xml
+++ b/news/2016/news-20160701-01.sq.xml
@@ -19,7 +19,7 @@
     <link>https://fsfe.org/community/events/2016/summit/frontpage</link>
     <tags>
         <tag key="front-page"/>
-      <tag key="fsfesummit">Kuvendi i FSFE-së</tag>
+      <tag key="fsfe-summit">Kuvendi i FSFE-së</tag>
       <tag key="community">Bashkësi</tag>
     </tags>
   </news>
diff --git a/news/2016/news-20160804-01.de.xhtml b/news/2016/news-20160804-01.de.xhtml
index 66c843e168..0b5692e2c8 100644
--- a/news/2016/news-20160804-01.de.xhtml
+++ b/news/2016/news-20160804-01.de.xhtml
@@ -74,7 +74,7 @@ QtCon. <a href="#fnref1">↩</a></li>
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
-  <tag key="15yearsfsfe">15 Jahre FSFE</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
+  <tag key="anniversary">15 Jahre FSFE</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160804-01.el.xhtml b/news/2016/news-20160804-01.el.xhtml
index e96733b0a3..0bb9d4bdfa 100644
--- a/news/2016/news-20160804-01.el.xhtml
+++ b/news/2016/news-20160804-01.el.xhtml
@@ -60,7 +60,7 @@ QtCon. Η συγκεκριμένη εκδήλωση φέρνει μαζί develo
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
-  <tag key="15yearsfsfe">15 Years FSFE</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
+  <tag key="anniversary">15 Years FSFE</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160804-01.en.xhtml b/news/2016/news-20160804-01.en.xhtml
index 0f8ce4300d..275914cc11 100644
--- a/news/2016/news-20160804-01.en.xhtml
+++ b/news/2016/news-20160804-01.en.xhtml
@@ -65,7 +65,7 @@ a member of the press, you will also have free access to the whole of QtCon.<a h
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
-  <tag key="15yearsfsfe">15 Years FSFE</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
+  <tag key="anniversary">15 Years FSFE</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160804-01.es.xhtml b/news/2016/news-20160804-01.es.xhtml
index e7df8edbf7..738004708a 100644
--- a/news/2016/news-20160804-01.es.xhtml
+++ b/news/2016/news-20160804-01.es.xhtml
@@ -53,8 +53,8 @@ disposición para ayudarte a organizar tu visita a nuestro evento.</p>
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
-  <tag key="15yearsfsfe">15 Years FSFE</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
+  <tag key="anniversary">15 Years FSFE</tag>
 </tags>
 <translator>Pep Diz</translator>
 </html>
diff --git a/news/2016/news-20160804-01.fr.xhtml b/news/2016/news-20160804-01.fr.xhtml
index f5606e9dda..98dfc50e25 100644
--- a/news/2016/news-20160804-01.fr.xhtml
+++ b/news/2016/news-20160804-01.fr.xhtml
@@ -66,14 +66,14 @@ un accès gratuit à l'intégralité de la QtCon.
 </p>
     <tags>
       <tag key="front-page"/>
-      <tag key="fsfesummit">FSFE summit</tag>
-      <tag key="15yearsfsfe">15 years FSFE</tag>
+      <tag key="fsfe-summit">FSFE summit</tag>
+      <tag key="anniversary">15 years FSFE</tag>
     </tags>
     <translator>Cellini, Cryptie et Stéphane</translator>
   </body>
   <tags>
-    <tag key="15yearsfsfe"/>
+    <tag key="anniversary"/>
     <tag key="front-page"/>
-    <tag key="fsfesummit"/>
+    <tag key="fsfe-summit"/>
   </tags>
 </html>
diff --git a/news/2016/news-20160804-01.it.xhtml b/news/2016/news-20160804-01.it.xhtml
index d6b75ed6c1..4730cfeb25 100644
--- a/news/2016/news-20160804-01.it.xhtml
+++ b/news/2016/news-20160804-01.it.xhtml
@@ -65,8 +65,8 @@ membro stampa, avrai anche accesso gratuito all'intero QtCon.<a href="#fnref1">
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
-  <tag key="15yearsfsfe">15 Years FSFE</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
+  <tag key="anniversary">15 Years FSFE</tag>
 </tags>
   <translator>Tarin Gamberini</translator>
 </html>
diff --git a/news/2016/news-20160804-01.nl.xhtml b/news/2016/news-20160804-01.nl.xhtml
index a2ce21fef3..bc762c9edc 100644
--- a/news/2016/news-20160804-01.nl.xhtml
+++ b/news/2016/news-20160804-01.nl.xhtml
@@ -69,8 +69,8 @@ toegang hebben tot de hele QtCon.<a href="#fnref1">↩</a></li>
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE-Top</tag>
-  <tag key="15yearsfsfe">15 jaren FSFE</tag>
+  <tag key="fsfe-summit">FSFE-Top</tag>
+  <tag key="anniversary">15 jaren FSFE</tag>
 </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2016/news-20160804-01.sq.xhtml b/news/2016/news-20160804-01.sq.xhtml
index 8471d12808..218e0375c6 100644
--- a/news/2016/news-20160804-01.sq.xhtml
+++ b/news/2016/news-20160804-01.sq.xhtml
@@ -51,7 +51,7 @@ t’ju ndihmojmë të organizoni vizitën tuaj në veprimtarinë tonë.</p>
 </body>
 <tags>
   <tag key="front-page"/>
-  <tag key="fsfesummit">FSFE summit</tag>
-  <tag key="15yearsfsfe">15 Years FSFE</tag>
+  <tag key="fsfe-summit">FSFE summit</tag>
+  <tag key="anniversary">15 Years FSFE</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160907-01.en.xhtml b/news/2016/news-20160907-01.en.xhtml
index 3fc2ea877c..b0d35261bb 100644
--- a/news/2016/news-20160907-01.en.xhtml
+++ b/news/2016/news-20160907-01.en.xhtml
@@ -79,7 +79,7 @@ regulate coherently in favour of free/libre technologies.</p>
 
 <tags>
     <tag key="front-page"/>
-    <tag key="fsfesummit">FSFE summit</tag>
+    <tag key="fsfe-summit">FSFE summit</tag>
 
 </tags>
 </html>
diff --git a/news/2016/news-20160907-01.fr.xhtml b/news/2016/news-20160907-01.fr.xhtml
index cdae28049d..c64ef96534 100644
--- a/news/2016/news-20160907-01.fr.xhtml
+++ b/news/2016/news-20160907-01.fr.xhtml
@@ -40,7 +40,7 @@
 
 <tags>
     <tag key="front-page"/>
-    <tag key="fsfesummit">FSFE summit</tag>
+    <tag key="fsfe-summit">FSFE summit</tag>
 
 </tags>
 <translator>MDDN et Stephane</translator>
diff --git a/news/2016/news-20160907-01.nl.xhtml b/news/2016/news-20160907-01.nl.xhtml
index 96a25be26e..9d9fba4be1 100644
--- a/news/2016/news-20160907-01.nl.xhtml
+++ b/news/2016/news-20160907-01.nl.xhtml
@@ -75,7 +75,7 @@ technologieën.</p>
 
 <tags>
     <tag key="front-page"/>
-    <tag key="fsfesummit">FSFE summit</tag>
+    <tag key="fsfe-summit">FSFE summit</tag>
 </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2016/news-20160907-01.sq.xhtml b/news/2016/news-20160907-01.sq.xhtml
index a2c063ca67..4b7f5672f8 100644
--- a/news/2016/news-20160907-01.sq.xhtml
+++ b/news/2016/news-20160907-01.sq.xhtml
@@ -43,7 +43,7 @@
 
 <tags>
     <tag key="front-page"/>
-    <tag key="fsfesummit">Kuvendi i FSFE-së</tag>
+    <tag key="fsfe-summit">Kuvendi i FSFE-së</tag>
 
 </tags>
 </html>
diff --git a/news/2016/news-20160928-01.en.xhtml b/news/2016/news-20160928-01.en.xhtml
index 3f00a3c014..0624f075fd 100644
--- a/news/2016/news-20160928-01.en.xhtml
+++ b/news/2016/news-20160928-01.en.xhtml
@@ -86,6 +86,6 @@ especially with regard to already heavily limited exceptions.</p>
   <tag key="front-page"/>
   <tag key="copyright">Copyright</tag>
   <tag key="drm">DRM</tag>
-  <tag key="digitalsinglemarket">Digital Single Market</tag>
+  <tag key="digital-single-market">Digital Single Market</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160928-01.nl.xhtml b/news/2016/news-20160928-01.nl.xhtml
index 2545d7b79b..b8eac546bf 100644
--- a/news/2016/news-20160928-01.nl.xhtml
+++ b/news/2016/news-20160928-01.nl.xhtml
@@ -93,7 +93,7 @@ verbieden, vooral ten aanzien van al sterk beperkte uitzonderingen.
   <tag key="front-page"/>
   <tag key="copyright">auteursrecht</tag>
   <tag key="drm">DRM</tag>
-  <tag key="digitalsinglemarket">digitale interne markt</tag>
+  <tag key="digital-single-market">digitale interne markt</tag>
 </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2016/news-20160928-01.pt.xhtml b/news/2016/news-20160928-01.pt.xhtml
index 4722ecd30c..e054d641cd 100644
--- a/news/2016/news-20160928-01.pt.xhtml
+++ b/news/2016/news-20160928-01.pt.xhtml
@@ -87,6 +87,6 @@ autor, proibam explicitamente o uso de práticas perniciosas de DRM, em particul
   <tag key="front-page"/>
   <tag key="copyright">Copyright</tag>
   <tag key="drm">DRM</tag>
-  <tag key="digitalsinglemarket">Digital Single Market</tag>
+  <tag key="digital-single-market">Digital Single Market</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20160928-01.sq.xhtml b/news/2016/news-20160928-01.sq.xhtml
index fdbc8d1067..6d582f5048 100644
--- a/news/2016/news-20160928-01.sq.xhtml
+++ b/news/2016/news-20160928-01.sq.xhtml
@@ -40,6 +40,6 @@ Një funksion i rëndomtë i ofruar nga DRM-ja është kufizimi i numrit të kop
   <tag key="front-page"/>
   <tag key="copyright">Të drejta kopjimi</tag>
   <tag key="drm">DRM</tag>
-  <tag key="digitalsinglemarket">Tregu i Përbashkët Dixhital</tag>
+  <tag key="digital-single-market">Tregu i Përbashkët Dixhital</tag>
 </tags>
 </html>
diff --git a/news/2016/news-20161202-01.de.xhtml b/news/2016/news-20161202-01.de.xhtml
index 731b81592d..49ac5ca51b 100644
--- a/news/2016/news-20161202-01.de.xhtml
+++ b/news/2016/news-20161202-01.de.xhtml
@@ -72,7 +72,7 @@
 
 </body>
 <tags>
-  <tag key="15yearsfsfe">15 Jahre FSFE</tag>
+  <tag key="anniversary">15 Jahre FSFE</tag>
   <tag key="pmpc">Public Money? Public Code!</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2016/news-20161202-01.el.xhtml b/news/2016/news-20161202-01.el.xhtml
index 39c9e706b6..1097890890 100644
--- a/news/2016/news-20161202-01.el.xhtml
+++ b/news/2016/news-20161202-01.el.xhtml
@@ -115,7 +115,7 @@
 
 </body>
 <tags>
-  <tag key="15yearsfsfe">15 years FSFE</tag>
+  <tag key="anniversary">15 years FSFE</tag>
   <tag key="pmpc">Public Money Public Code</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2016/news-20161202-01.en.xhtml b/news/2016/news-20161202-01.en.xhtml
index eb7c5a6837..c13999db9b 100644
--- a/news/2016/news-20161202-01.en.xhtml
+++ b/news/2016/news-20161202-01.en.xhtml
@@ -59,7 +59,7 @@
 
 </body>
 <tags>
-  <tag key="15yearsfsfe">15 years FSFE</tag>
+  <tag key="anniversary">15 years FSFE</tag>
   <tag key="pmpc">Public Money? Public Code!</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2016/news-20161202-01.es.xhtml b/news/2016/news-20161202-01.es.xhtml
index a439ae62e9..5087a27e08 100644
--- a/news/2016/news-20161202-01.es.xhtml
+++ b/news/2016/news-20161202-01.es.xhtml
@@ -54,7 +54,7 @@
 
 </body>
 <tags>
-  <tag key="15yearsfsfe">15 years FSFE</tag>
+  <tag key="anniversary">15 years FSFE</tag>
   <tag key="pmpc">Public Money? Public Code!</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2016/news-20161202-01.fr.xhtml b/news/2016/news-20161202-01.fr.xhtml
index aa2642c0f3..de7513d0f2 100644
--- a/news/2016/news-20161202-01.fr.xhtml
+++ b/news/2016/news-20161202-01.fr.xhtml
@@ -81,7 +81,7 @@ Aidez-nous à nous développer pour faire la différence en 2017 !
 
 </body>
 <tags>
-<tag key="15yearsfsfe">15 years FSFE</tag>
+<tag key="anniversary">15 years FSFE</tag>
 <tag key="pmpc">Public Money? Public Code!</tag>
 <tag key="front-page"/>
 </tags>
diff --git a/news/2016/news-20161202-01.it.xhtml b/news/2016/news-20161202-01.it.xhtml
index 9ef763fb8f..fb96ed0810 100644
--- a/news/2016/news-20161202-01.it.xhtml
+++ b/news/2016/news-20161202-01.it.xhtml
@@ -59,7 +59,7 @@
 
 </body>
 <tags>
-  <tag key="15yearsfsfe">15 years FSFE</tag>
+  <tag key="anniversary">15 years FSFE</tag>
   <tag key="pmpc">Public Money Public Code</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2016/news-20161202-01.nl.xhtml b/news/2016/news-20161202-01.nl.xhtml
index 36d25ce62a..a52488aea4 100644
--- a/news/2016/news-20161202-01.nl.xhtml
+++ b/news/2016/news-20161202-01.nl.xhtml
@@ -59,7 +59,7 @@
 
 </body>
 <tags>
-  <tag key="15yearsfsfe">15 jaren FSFE</tag>
+  <tag key="anniversary">15 jaren FSFE</tag>
   <tag key="pmpc">Publiek Geld? Publieke Code!</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2016/news-20161202-01.pt.xhtml b/news/2016/news-20161202-01.pt.xhtml
index 2595300dfa..955b45c514 100644
--- a/news/2016/news-20161202-01.pt.xhtml
+++ b/news/2016/news-20161202-01.pt.xhtml
@@ -97,7 +97,7 @@ de mais grupos locais.</li>
 
 </body>
 <tags>
-  <tag key="15yearsfsfe">15 years FSFE</tag>
+  <tag key="anniversary">15 years FSFE</tag>
   <tag key="pmpc">Public Money? Public Code!</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2016/news-20161202-01.sq.xhtml b/news/2016/news-20161202-01.sq.xhtml
index d9fcfce606..e4d40a6559 100644
--- a/news/2016/news-20161202-01.sq.xhtml
+++ b/news/2016/news-20161202-01.sq.xhtml
@@ -60,7 +60,7 @@
 
 </body>
 <tags>
-  <tag key="15yearsfsfe">15 vjet FSFE</tag>
+  <tag key="anniversary">15 vjet FSFE</tag>
   <tag key="pmpc">Para Publike? Kod Publik!</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2016/news-20161213-01.en.xml b/news/2016/news-20161213-01.en.xml
index 45231c4a89..6dd4eee098 100644
--- a/news/2016/news-20161213-01.en.xml
+++ b/news/2016/news-20161213-01.en.xml
@@ -18,8 +18,8 @@
     <link>https://fsfe.org/community/events/2016/summit/backsight.en.html</link>
     <tags>
         <tag key="front-page"/>
-      <tag key="fsfesummit">FSFE summit</tag>
-      <tag key="15yearsfsfe">15 years FSFE</tag>
+      <tag key="fsfe-summit">FSFE summit</tag>
+      <tag key="anniversary">15 years FSFE</tag>
     </tags>
   </news>
 </newsset>
diff --git a/news/2016/news-20161213-01.sq.xml b/news/2016/news-20161213-01.sq.xml
index ac630c70b5..ee1b841bf7 100644
--- a/news/2016/news-20161213-01.sq.xml
+++ b/news/2016/news-20161213-01.sq.xml
@@ -18,8 +18,8 @@
     <link>https://fsfe.org/community/events/2016/summit/backsight.sq.html</link>
     <tags>
         <tag key="front-page"/>
-      <tag key="fsfesummit">Kuvendi i FSFE-së</tag>
-      <tag key="15yearsfsfe">15 vjet FSFE</tag>
+      <tag key="fsfe-summit">Kuvendi i FSFE-së</tag>
+      <tag key="anniversary">15 vjet FSFE</tag>
     </tags>
   </news>
 </newsset>
diff --git a/news/2017/news-20170105-01.en.xhtml b/news/2017/news-20170105-01.en.xhtml
index c689bd8435..924881e96e 100644
--- a/news/2017/news-20170105-01.en.xhtml
+++ b/news/2017/news-20170105-01.en.xhtml
@@ -98,9 +98,9 @@
   <tags>
       <tag key="front-page"/>
       <tag key="openstandards">Open Standards</tag>
-      <tag key="openscience">Open Science</tag>
+      <tag key="open-science">Open Science</tag>
       <tag key="policy">policy</tag>
-      <tag key="europeancommission">European Commission</tag>
+      <tag key="european-commission">European Commission</tag>
     </tags>
 </html>
   
diff --git a/news/2017/news-20170105-01.nl.xhtml b/news/2017/news-20170105-01.nl.xhtml
index 3396084475..b8ba48235d 100644
--- a/news/2017/news-20170105-01.nl.xhtml
+++ b/news/2017/news-20170105-01.nl.xhtml
@@ -50,9 +50,9 @@
   <tags>
       <tag key="front-page"/>
       <tag key="openstandards">Open Standaarden</tag>
-      <tag key="openscience">Open Wetenschap</tag>
+      <tag key="open-science">Open Wetenschap</tag>
       <tag key="policy">beleid</tag>
-      <tag key="europeancommission">Europese Commissie</tag>
+      <tag key="european-commission">Europese Commissie</tag>
     </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2017/news-20170105-01.sq.xhtml b/news/2017/news-20170105-01.sq.xhtml
index 25b8c45748..1bc69bcb99 100644
--- a/news/2017/news-20170105-01.sq.xhtml
+++ b/news/2017/news-20170105-01.sq.xhtml
@@ -56,8 +56,8 @@
   <tags>
       <tag key="front-page"/>
       <tag key="openstandards">Standarde të Hapura</tag>
-      <tag key="openscience">Shkencë e Hapur</tag>
+      <tag key="open-science">Shkencë e Hapur</tag>
       <tag key="policy">politika</tag>
-      <tag key="europeancommission">Komisioni Europian</tag>
+      <tag key="european-commission">Komisioni Europian</tag>
     </tags>
 </html>
diff --git a/news/2017/news-20170110-01.en.xhtml b/news/2017/news-20170110-01.en.xhtml
index 92ed57163a..2e1e49f9a2 100644
--- a/news/2017/news-20170110-01.en.xhtml
+++ b/news/2017/news-20170110-01.en.xhtml
@@ -82,9 +82,9 @@
   <tags>
       <tag key="front-page"/>
       <tag key="openstandards">Open Standards</tag>
-      <tag key="openscience">Open Science</tag>
+      <tag key="open-science">Open Science</tag>
       <tag key="policy">policy</tag>
-      <tag key="europeancommission">European Commission</tag>
+      <tag key="european-commission">European Commission</tag>
       <tag key="horizon2020">Horizon 2020</tag>
     </tags>
 </html>
diff --git a/news/2017/news-20170110-01.nl.xhtml b/news/2017/news-20170110-01.nl.xhtml
index 6f1d2a3fd2..e9bbad6dd2 100644
--- a/news/2017/news-20170110-01.nl.xhtml
+++ b/news/2017/news-20170110-01.nl.xhtml
@@ -51,9 +51,9 @@
   <tags>
       <tag key="front-page"/>
       <tag key="openstandards">Open Standaarden</tag>
-      <tag key="openscience">Open Wetenschap</tag>
+      <tag key="open-science">Open Wetenschap</tag>
       <tag key="policy">beleid</tag>
-      <tag key="europeancommission">Europese Commissie</tag>
+      <tag key="european-commission">Europese Commissie</tag>
       <tag key="horizon2020">Horizon 2020</tag>
     </tags>
 <translator>André Ockers</translator>
diff --git a/news/2017/news-20170110-01.sq.xhtml b/news/2017/news-20170110-01.sq.xhtml
index 66c62d8821..13856cf78e 100644
--- a/news/2017/news-20170110-01.sq.xhtml
+++ b/news/2017/news-20170110-01.sq.xhtml
@@ -57,9 +57,9 @@
   <tags>
       <tag key="front-page"/>
       <tag key="openstandards">Standarde të Hapura</tag>
-      <tag key="openscience">Shkencë e Hapur</tag>
+      <tag key="open-science">Shkencë e Hapur</tag>
       <tag key="policy">politika</tag>
-      <tag key="europeancommission">Komisioni Europian</tag>
+      <tag key="european-commission">Komisioni Europian</tag>
       <tag key="horizon2020">Horizon 2020</tag>
     </tags>
 </html>
diff --git a/news/2017/news-20170214-02.en.xhtml b/news/2017/news-20170214-02.en.xhtml
index c8d74b8f35..ee0e0942ee 100644
--- a/news/2017/news-20170214-02.en.xhtml
+++ b/news/2017/news-20170214-02.en.xhtml
@@ -98,9 +98,9 @@ make a difference on the policy level.</p>
         <tag key="front-page"/>
         <tag key="policy">Policy</tag>
         <tag key="openstandards">Open Standards</tag>
-        <tag key="europeancommission">European Commission</tag>
-        <tag key="europeanparliament">EuropeanParliament</tag>
-        <tag key="publicadministration">Public Administration</tag>
+        <tag key="european-commission">European Commission</tag>
+        <tag key="european-parliament">EuropeanParliament</tag>
+        <tag key="public-administration">Public Administration</tag>
     </tags>
 
 <author id="malaja"/>
diff --git a/news/2017/news-20170214-02.sq.xhtml b/news/2017/news-20170214-02.sq.xhtml
index 2778d0f897..66787fc603 100644
--- a/news/2017/news-20170214-02.sq.xhtml
+++ b/news/2017/news-20170214-02.sq.xhtml
@@ -40,9 +40,9 @@ Government Partnership</a>. Synimi i kësaj gjedheje është të furnizojë një
         <tag key="front-page"/>
         <tag key="policy">Politika</tag>
         <tag key="openstandards">Standarde të Hapura</tag>
-        <tag key="europeancommission">Komisioni Europian</tag>
-        <tag key="europeanparliament">European Parliament</tag>
-        <tag key="publicadministration">Administrata Publike</tag>
+        <tag key="european-commission">Komisioni Europian</tag>
+        <tag key="european-parliament">European Parliament</tag>
+        <tag key="public-administration">Administrata Publike</tag>
     </tags>
 
 <author id="malaja"/>
diff --git a/news/2017/news-20170217-01.en.xhtml b/news/2017/news-20170217-01.en.xhtml
index 8e53da6186..37d7da5f26 100644
--- a/news/2017/news-20170217-01.en.xhtml
+++ b/news/2017/news-20170217-01.en.xhtml
@@ -104,8 +104,8 @@
   <tags>
       <tag key="front-page"/>
       <tag key="openstandards">Open Standards</tag>
-      <tag key="openscience">Open Science</tag>
+      <tag key="open-science">Open Science</tag>
       <tag key="policy">policy</tag>
-      <tag key="europeancommission">European Commission</tag>
+      <tag key="european-commission">European Commission</tag>
     </tags>
 </html>
diff --git a/news/2017/news-20170217-01.es.xhtml b/news/2017/news-20170217-01.es.xhtml
index 06914be7cb..facfc40570 100644
--- a/news/2017/news-20170217-01.es.xhtml
+++ b/news/2017/news-20170217-01.es.xhtml
@@ -104,9 +104,9 @@
   <tags>
       <tag key="front-page"/>
       <tag key="openstandards">Open Standards</tag>
-      <tag key="openscience">Open Science</tag>
+      <tag key="open-science">Open Science</tag>
       <tag key="policy">policy</tag>
-      <tag key="europeancommission">European Commission</tag>
+      <tag key="european-commission">European Commission</tag>
     </tags>
 
 <translator>Eulalio Barbero</translator></html>
diff --git a/news/2017/news-20170217-01.nl.xhtml b/news/2017/news-20170217-01.nl.xhtml
index a47308b448..1fb639dcee 100644
--- a/news/2017/news-20170217-01.nl.xhtml
+++ b/news/2017/news-20170217-01.nl.xhtml
@@ -45,9 +45,9 @@ Zoals FSFE eerder heeft bepleit in haar <a href="https://download.fsfe.org/polic
   <tags>
       <tag key="front-page"/>
       <tag key="openstandards">Open Standaarden</tag>
-      <tag key="openscience">Open Wetenschap</tag>
+      <tag key="open-science">Open Wetenschap</tag>
       <tag key="policy">beleid</tag>
-      <tag key="europeancommission">Europese Commissie</tag>
+      <tag key="european-commission">Europese Commissie</tag>
     </tags>
  <translator>André Ockers</translator>
 </html>
diff --git a/news/2017/news-20170217-01.sq.xhtml b/news/2017/news-20170217-01.sq.xhtml
index 4b129b9ff4..604646e211 100644
--- a/news/2017/news-20170217-01.sq.xhtml
+++ b/news/2017/news-20170217-01.sq.xhtml
@@ -48,8 +48,8 @@
   <tags>
       <tag key="front-page"/>
       <tag key="openstandards">Standarde të Hapur</tag>
-      <tag key="openscience">Shkencë e Hapur</tag>
+      <tag key="open-science">Shkencë e Hapur</tag>
       <tag key="policy">politika</tag>
-      <tag key="europeancommission">Komisioni Europian</tag>
+      <tag key="european-commission">Komisioni Europian</tag>
     </tags>
 </html>
diff --git a/news/2017/news-20170301-01.en.xhtml b/news/2017/news-20170301-01.en.xhtml
index 94781da126..d0e361a4ae 100644
--- a/news/2017/news-20170301-01.en.xhtml
+++ b/news/2017/news-20170301-01.en.xhtml
@@ -224,7 +224,7 @@
       <tag key="limux">LiMux</tag>
       <tag key="policy">policy</tag>
       <tag key="limux">München</tag>
-      <tag key="publicadministration">ÖffentlicheVerwaltung</tag>
+      <tag key="public-administration">ÖffentlicheVerwaltung</tag>
   </tags>
 
   <author id="schiessle"/>
diff --git a/news/2017/news-20170301-01.sq.xhtml b/news/2017/news-20170301-01.sq.xhtml
index d6503f28ad..ec61fc68f3 100644
--- a/news/2017/news-20170301-01.sq.xhtml
+++ b/news/2017/news-20170301-01.sq.xhtml
@@ -136,7 +136,7 @@
       <tag key="limux">LiMux</tag>
       <tag key="policy">politika</tag>
       <tag key="limux">Mynih</tag>
-      <tag key="publicadministration">ÖffentlicheVerwaltung</tag>
+      <tag key="public-administration">ÖffentlicheVerwaltung</tag>
   </tags>
 
   <author id="schiessle"/>
diff --git a/news/2017/news-20170328-01.de.xhtml b/news/2017/news-20170328-01.de.xhtml
index 4f09e7096c..3f808e96bd 100644
--- a/news/2017/news-20170328-01.de.xhtml
+++ b/news/2017/news-20170328-01.de.xhtml
@@ -261,7 +261,7 @@ zweiten Nationalen Aktionsplans bereits vorliegen.</li>
   <tags>
       <tag key="front-page"/>
       <tag key="policy">policy</tag>
-      <tag key="publicadministration">ÖffentlicheVerwaltung</tag>
+      <tag key="public-administration">ÖffentlicheVerwaltung</tag>
   </tags>
 
 </html>
diff --git a/news/2017/news-20170328-01.en.xhtml b/news/2017/news-20170328-01.en.xhtml
index 2b5b06cce3..a24d6d4ffe 100644
--- a/news/2017/news-20170328-01.en.xhtml
+++ b/news/2017/news-20170328-01.en.xhtml
@@ -259,7 +259,7 @@ OGP</a>.)</p>
   <tags>
       <tag key="front-page"/>
       <tag key="policy">policy</tag>
-      <tag key="publicadministration">PublicAdministration</tag>
+      <tag key="public-administration">PublicAdministration</tag>
   </tags>
 
 </html>
diff --git a/news/2017/news-20170328-01.nl.xhtml b/news/2017/news-20170328-01.nl.xhtml
index d2971dd5fb..f26dedf273 100644
--- a/news/2017/news-20170328-01.nl.xhtml
+++ b/news/2017/news-20170328-01.nl.xhtml
@@ -126,7 +126,7 @@
   <tags>
       <tag key="front-page"/>
       <tag key="policy">beleid</tag>
-      <tag key="publicadministration">overheid</tag>
+      <tag key="public-administration">overheid</tag>
   </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2017/news-20170419-01.de.xhtml b/news/2017/news-20170419-01.de.xhtml
index f32f9f9a50..7732204f9e 100644
--- a/news/2017/news-20170419-01.de.xhtml
+++ b/news/2017/news-20170419-01.de.xhtml
@@ -26,7 +26,7 @@
 		
 		<tags>
 			<tag key="front-page"/>
-			<tag key="digitalomat">Digital-o-Mat</tag>
+			<tag key="digital-o-mat">Digital-o-Mat</tag>
 			<tag key="elections">Landtagswahl</tag>
 			<tag key="de">Deutschland</tag>
 			<tag key="ayc">Ask your candidates</tag>
diff --git a/news/2017/news-20170419-01.en.xhtml b/news/2017/news-20170419-01.en.xhtml
index a02fdb3317..1d4a9e4c69 100644
--- a/news/2017/news-20170419-01.en.xhtml
+++ b/news/2017/news-20170419-01.en.xhtml
@@ -26,7 +26,7 @@
 		
 		<tags>
 			<tag key="front-page"/>
-			<tag key="digitalomat">Digital-o-Mat</tag>
+			<tag key="digital-o-mat">Digital-o-Mat</tag>
 			<tag key="elections">state election</tag>
 			<tag key="de">Germany</tag>
 			<tag key="ayc">Ask your candidates</tag>
diff --git a/news/2017/news-20170419-01.nl.xhtml b/news/2017/news-20170419-01.nl.xhtml
index 8197028d2d..8f0f13015a 100644
--- a/news/2017/news-20170419-01.nl.xhtml
+++ b/news/2017/news-20170419-01.nl.xhtml
@@ -28,7 +28,7 @@
 		
 		<tags>
 			<tag key="front-page"/>
-			<tag key="digitalomat">Digital-o-Mat</tag>
+			<tag key="digital-o-mat">Digital-o-Mat</tag>
 			<tag key="elections">deelstaatverkiezing</tag>
 			<tag key="de">Duitsland</tag>
 			<tag key="ayc">Vraag het uw kandidaten</tag>
diff --git a/news/2017/news-20170613-01.en.xhtml b/news/2017/news-20170613-01.en.xhtml
index 834d90d087..c172379202 100644
--- a/news/2017/news-20170613-01.en.xhtml
+++ b/news/2017/news-20170613-01.en.xhtml
@@ -78,7 +78,7 @@
 </body>
   <tags>
       <tag key="front-page"/>
-      <tag key="digitalsinglemarket">DigitalSingleMarket</tag>
+      <tag key="digital-single-market">DigitalSingleMarket</tag>
       <tag key="policy">policy</tag>
       <tag key="eif">EIF</tag>
       <tag key="openstandards">OpenStandards</tag>
diff --git a/news/2017/news-20170613-01.nl.xhtml b/news/2017/news-20170613-01.nl.xhtml
index 413e6ba4c0..c5ec4d69b1 100644
--- a/news/2017/news-20170613-01.nl.xhtml
+++ b/news/2017/news-20170613-01.nl.xhtml
@@ -40,7 +40,7 @@
 </body>
   <tags>
       <tag key="front-page"/>
-      <tag key="digitalsinglemarket">digitale interne markt</tag>
+      <tag key="digital-single-market">digitale interne markt</tag>
       <tag key="policy">beleid</tag>
       <tag key="eif">EIF</tag>
       <tag key="openstandards">Open Standaarden</tag>
diff --git a/news/2017/news-20170829-01.de.xhtml b/news/2017/news-20170829-01.de.xhtml
index 1e752eb402..b2dd90a149 100644
--- a/news/2017/news-20170829-01.de.xhtml
+++ b/news/2017/news-20170829-01.de.xhtml
@@ -12,7 +12,7 @@ Der <a href="http://bund.digital-o-mat.de/">Digital-O-Mat</a> macht die jeweilig
 
 </body>
   <tags>
-    <tag key="digitalomat">Digital-O-Mat</tag>
+    <tag key="digital-o-mat">Digital-O-Mat</tag>
     <tag key="elections">Bundestagswahl 2017</tag>
     <tag key="de">Deutschland</tag>
     <tag key="policy">Politik</tag>
diff --git a/news/2017/news-20170829-01.en.xhtml b/news/2017/news-20170829-01.en.xhtml
index 3b268b4cf3..3a079621d4 100644
--- a/news/2017/news-20170829-01.en.xhtml
+++ b/news/2017/news-20170829-01.en.xhtml
@@ -53,7 +53,7 @@ The <a href="http://bund.digital-o-mat.de/">Digital-O-Mat</a> highlights the par
 
 </body>
 <tags>
-  <tag key="digitalomat">Digital-O-Mat</tag>
+  <tag key="digital-o-mat">Digital-O-Mat</tag>
   <tag key="koalition-freies-wissen">Koalition Freies Wissen</tag>
   <tag key="elections">Federal elections 2017</tag>
   <tag key="de">Germany</tag>
diff --git a/news/2017/news-20170829-01.nl.xhtml b/news/2017/news-20170829-01.nl.xhtml
index de899eb138..70c99ca8a0 100644
--- a/news/2017/news-20170829-01.nl.xhtml
+++ b/news/2017/news-20170829-01.nl.xhtml
@@ -53,7 +53,7 @@
 
 </body>
 <tags>
-  <tag key="digitalomat">Digital-O-Mat</tag>
+  <tag key="digital-o-mat">Digital-O-Mat</tag>
   <tag key="koalition-freies-wissen">Koalition Freies Wissen</tag>
   <tag key="elections">Federale verkiezingen 2017</tag>
   <tag key="de">Duitsland</tag>
diff --git a/news/2017/news-20170905-01.de.xhtml b/news/2017/news-20170905-01.de.xhtml
index a4934bf185..ec3eb81ee7 100644
--- a/news/2017/news-20170905-01.de.xhtml
+++ b/news/2017/news-20170905-01.de.xhtml
@@ -95,7 +95,7 @@
   <tag key="elections">Bundestagswahl 2017</tag>
   <tag key="de">Deutschland</tag>
   <tag key="pmpc">Public Money Public Code</tag>
-  <tag key="digitalomat">Digital-O-Mat</tag>
+  <tag key="digital-o-mat">Digital-O-Mat</tag>
 </tags>
 <author id="albers" />
 <author id="schiessle" />
diff --git a/news/2017/news-20170908-01.en.xhtml b/news/2017/news-20170908-01.en.xhtml
index e4f80bb540..4aaf332a63 100644
--- a/news/2017/news-20170908-01.en.xhtml
+++ b/news/2017/news-20170908-01.en.xhtml
@@ -68,6 +68,6 @@
   <tag key="front-page"/>
   <tag key="copyright">Copyright</tag>
   <tag key="policy">Policy</tag>
-  <tag key="digitalsinglemarket">Digital Single Market</tag>
+  <tag key="digital-single-market">Digital Single Market</tag>
 </tags>
 </html>
diff --git a/news/2017/news-20170908-01.fr.xhtml b/news/2017/news-20170908-01.fr.xhtml
index af08bf1ade..937c404089 100644
--- a/news/2017/news-20170908-01.fr.xhtml
+++ b/news/2017/news-20170908-01.fr.xhtml
@@ -81,7 +81,7 @@
     <tag key="front-page"/>
     <tag key="copyright">Copyright</tag>
     <tag key="policy">Policy</tag>
-    <tag key="digitalsinglemarket">Digital Single Market</tag>
+    <tag key="digital-single-market">Digital Single Market</tag>
 </tags>
 <translators>MDDN, Stéphane, Vincent</translators>
 </html>
diff --git a/news/2017/news-20170908-01.nl.xhtml b/news/2017/news-20170908-01.nl.xhtml
index d7885ec753..aa4abd57e3 100644
--- a/news/2017/news-20170908-01.nl.xhtml
+++ b/news/2017/news-20170908-01.nl.xhtml
@@ -37,7 +37,7 @@ Vrije Software maakt het mogelijk en moedigt het aan dat iedereen kan wijzigen e
   <tag key="front-page"/>
   <tag key="copyright">auteursrecht</tag>
   <tag key="policy">beleid</tag>
-  <tag key="digitalsinglemarket">digitale interne markt</tag>
+  <tag key="digital-single-market">digitale interne markt</tag>
 </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2017/news-20170913-01.de.xhtml b/news/2017/news-20170913-01.de.xhtml
index 552b0472fc..067d58c3a8 100644
--- a/news/2017/news-20170913-01.de.xhtml
+++ b/news/2017/news-20170913-01.de.xhtml
@@ -86,7 +86,7 @@
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Public Code</tag>
-  <tag key="openletter">Offener Brief</tag>
+  <tag key="open-letter">Offener Brief</tag>
   <tag key="procurement">Öffentliche Auftragsvergabe</tag>
 </tags>
 </html>
diff --git a/news/2017/news-20170913-01.en.xhtml b/news/2017/news-20170913-01.en.xhtml
index 1ae7eab7ce..1f2c301ce4 100644
--- a/news/2017/news-20170913-01.en.xhtml
+++ b/news/2017/news-20170913-01.en.xhtml
@@ -131,7 +131,7 @@
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Public Code</tag>
-  <tag key="openletter">Open Letter</tag>
+  <tag key="open-letter">Open Letter</tag>
   <tag key="procurement">Public procurement</tag>
 </tags>
 </html>
diff --git a/news/2017/news-20170913-01.es.xhtml b/news/2017/news-20170913-01.es.xhtml
index 1e9640eb58..6adf00426c 100644
--- a/news/2017/news-20170913-01.es.xhtml
+++ b/news/2017/news-20170913-01.es.xhtml
@@ -103,7 +103,7 @@
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Dinero Público</tag>
-  <tag key="openletter">Carta abierta</tag>
+  <tag key="open-letter">Carta abierta</tag>
   <tag key="procurement">Mercado público</tag>
 </tags>
 </html>
diff --git a/news/2017/news-20170913-01.fr.xhtml b/news/2017/news-20170913-01.fr.xhtml
index 9ef8cd2921..424493289e 100644
--- a/news/2017/news-20170913-01.fr.xhtml
+++ b/news/2017/news-20170913-01.fr.xhtml
@@ -89,7 +89,7 @@ et <a href="https://www.youtube.com/watch?v=iuVUzg6x2yo">Youtube</a></li>
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Public Code</tag>
-  <tag key="openletter">Lettre ouverte</tag>
+  <tag key="open-letter">Lettre ouverte</tag>
   <tag key="procurement">Marchés publics</tag>
 </tags>
 </html>
diff --git a/news/2017/news-20170913-01.nl.xhtml b/news/2017/news-20170913-01.nl.xhtml
index dfcc641c98..20f3ad3e4b 100644
--- a/news/2017/news-20170913-01.nl.xhtml
+++ b/news/2017/news-20170913-01.nl.xhtml
@@ -153,7 +153,7 @@
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Publieke Code</tag>
-  <tag key="openletter">Open Brief</tag>
+  <tag key="open-letter">Open Brief</tag>
   <tag key="procurement">openbare aanbesteding</tag>
 </tags>
 <translator>Carmen Bianca Bakker, André Ockers</translator>
diff --git a/news/2017/news-20170913-01.zh.xhtml b/news/2017/news-20170913-01.zh.xhtml
index ca7650ea5d..2d15640972 100644
--- a/news/2017/news-20170913-01.zh.xhtml
+++ b/news/2017/news-20170913-01.zh.xhtml
@@ -84,7 +84,7 @@
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Public Code</tag>
-  <tag key="openletter">Open Letter</tag>
+  <tag key="open-letter">Open Letter</tag>
   <tag key="procurement">Public procurement</tag>
 </tags>
 </html>
diff --git a/news/2017/news-20171005-01.en.xhtml b/news/2017/news-20171005-01.en.xhtml
index c9f3bf17ba..55aa9397ed 100644
--- a/news/2017/news-20171005-01.en.xhtml
+++ b/news/2017/news-20171005-01.en.xhtml
@@ -84,9 +84,9 @@
 <tags>
   <tag key="front-page"/>
   <tag key="savecodeshare">Save Code Share</tag>
-  <tag key="openletter">Open Letter</tag>
+  <tag key="open-letter">Open Letter</tag>
   <tag key="copyright">Copyright</tag>
-  <tag key="digitalsinglemarket">Digital Single Market</tag>
+  <tag key="digital-single-market">Digital Single Market</tag>
   <tag key="policy">Policy</tag>
 </tags>
 <author id="malaja" />
diff --git a/news/2017/news-20171005-01.es.xhtml b/news/2017/news-20171005-01.es.xhtml
index 1f880c1797..42f384bf39 100644
--- a/news/2017/news-20171005-01.es.xhtml
+++ b/news/2017/news-20171005-01.es.xhtml
@@ -87,9 +87,9 @@
 <tags>
   <tag key="front-page"/>
   <tag key="savecodeshare">Save Code Share</tag>
-  <tag key="openletter">Open Letter</tag>
+  <tag key="open-letter">Open Letter</tag>
   <tag key="copyright">Copyright</tag>
-  <tag key="digitalsinglemarket">Digital Single Market</tag>
+  <tag key="digital-single-market">Digital Single Market</tag>
   <tag key="policy">Policy</tag>
 </tags>
 <author id="malaja" />
diff --git a/news/2017/news-20171005-01.nl.xhtml b/news/2017/news-20171005-01.nl.xhtml
index 2ec42c6ef8..7e5c816628 100644
--- a/news/2017/news-20171005-01.nl.xhtml
+++ b/news/2017/news-20171005-01.nl.xhtml
@@ -96,9 +96,9 @@ op samenwerkingsgebaseerde software-ontwikkeling.
 <tags>
   <tag key="front-page"/>
   <tag key="savecodeshare">Save Code Share</tag>
-  <tag key="openletter">Open Brief</tag>
+  <tag key="open-letter">Open Brief</tag>
   <tag key="copyright">auteursrecht</tag>
-  <tag key="digitalsinglemarket">digital interne markt</tag>
+  <tag key="digital-single-market">digital interne markt</tag>
   <tag key="policy">beleid</tag>
 </tags>
 <author id="malaja"/>
diff --git a/news/2017/news-20171130-01.en.xhtml b/news/2017/news-20171130-01.en.xhtml
index e7dbf58b7f..202cb57bcc 100644
--- a/news/2017/news-20171130-01.en.xhtml
+++ b/news/2017/news-20171130-01.en.xhtml
@@ -43,9 +43,9 @@
 	<tags>
 		<tag key="front-page"/>
 		<tag key="savecodeshare">Save Code Share</tag>
-		<tag key="openletter">Open Letter</tag>
+		<tag key="open-letter">Open Letter</tag>
 		<tag key="copyright">Copyright</tag>
-		<tag key="digitalsinglemarket">Digital Single Market</tag>
+		<tag key="digital-single-market">Digital Single Market</tag>
 		<tag key="policy">Policy</tag>
 		<tag key="savecodeshare">Article 13</tag>
 	</tags>
diff --git a/news/2017/news-20171130-01.nl.xhtml b/news/2017/news-20171130-01.nl.xhtml
index deffec0ef7..00d25d0fd1 100644
--- a/news/2017/news-20171130-01.nl.xhtml
+++ b/news/2017/news-20171130-01.nl.xhtml
@@ -45,9 +45,9 @@
         <tags>
                 <tag key="front-page"/>
                 <tag key="savecodeshare">Save Code Share</tag>
-                <tag key="openletter">open brief</tag>
+                <tag key="open-letter">open brief</tag>
                 <tag key="copyright">auteursrecht</tag>
-                <tag key="digitalsinglemarket">digitale interne markt</tag>
+                <tag key="digital-single-market">digitale interne markt</tag>
                 <tag key="policy">beleid</tag>
                 <tag key="savecodeshare">Artikel 13</tag>
         </tags>
diff --git a/news/2017/news-20171212-01.en.xhtml b/news/2017/news-20171212-01.en.xhtml
index 25f4d722f0..1d94e3006e 100644
--- a/news/2017/news-20171212-01.en.xhtml
+++ b/news/2017/news-20171212-01.en.xhtml
@@ -105,7 +105,7 @@ work.</p>
   <tag key="front-page"/>
   <tag key="radiodirective">Radio Lockdown</tag>
   <tag key="policy">Policy</tag>
-  <tag key="europeancommission">European Commission</tag>
+  <tag key="european-commission">European Commission</tag>
 </tags>
 <author id="mehl" />
 </html>
diff --git a/news/2017/news-20171212-01.nl.xhtml b/news/2017/news-20171212-01.nl.xhtml
index 8e3c7f081d..0600ba82b0 100644
--- a/news/2017/news-20171212-01.nl.xhtml
+++ b/news/2017/news-20171212-01.nl.xhtml
@@ -51,7 +51,7 @@ ontmoeting in het Europees Parlement</a>.</p>
   <tag key="front-page"/>
   <tag key="radiodirective">Radio-afschermingsrichtlijn</tag>
   <tag key="policy">beleid</tag>
-  <tag key="europeancommission">Europese Commissie</tag>
+  <tag key="european-commission">Europese Commissie</tag>
 </tags>
 <author id="mehl" />
 <translator>André Ockers</translator>
diff --git a/news/2018/news-20180215-01.en.xhtml b/news/2018/news-20180215-01.en.xhtml
index b14541eadf..6a43ab26f0 100644
--- a/news/2018/news-20180215-01.en.xhtml
+++ b/news/2018/news-20180215-01.en.xhtml
@@ -110,7 +110,7 @@ Software.</p>
    <tag key="policy">Policy</tag>
       <tag key="pmpc">Public Code</tag>
       <tag key="openstandards">Open Standards</tag>
-      <tag key="publicadministration">Public Administration</tag>
+      <tag key="public-administration">Public Administration</tag>
   <tag key="front-page"/>
 </tags>
 <author id="malaja" />
diff --git a/news/2018/news-20180215-01.sq.xhtml b/news/2018/news-20180215-01.sq.xhtml
index 4e8f903f98..ba9bf6f5df 100644
--- a/news/2018/news-20180215-01.sq.xhtml
+++ b/news/2018/news-20180215-01.sq.xhtml
@@ -58,7 +58,7 @@ Përndryshe, do të vazhdojmë të përballemi me keqkuptime mbi trajtimin e (pa
    <tag key="policy">Politika</tag>
       <tag key="pmpc">Kod Publik</tag>
       <tag key="openstandards">Standarde të Hapura</tag>
-      <tag key="publicadministration">Administrata Publike</tag>
+      <tag key="public-administration">Administrata Publike</tag>
   <tag key="front-page"/>
 </tags>
 <author id="malaja" />
diff --git a/news/2018/news-20180219-01.en.xhtml b/news/2018/news-20180219-01.en.xhtml
index b69ee27d72..4e7af0f5e7 100644
--- a/news/2018/news-20180219-01.en.xhtml
+++ b/news/2018/news-20180219-01.en.xhtml
@@ -43,7 +43,7 @@
    <tag key="ayc">Ask your Candidates</tag>
       <tag key="pmpc">Public Code</tag>
       <tag key="openstandards">OpenStandards</tag>
-      <tag key="publicadministration">Public Administration</tag>
+      <tag key="public-administration">Public Administration</tag>
       <tag key="it">Italy</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2018/news-20180219-01.es.xhtml b/news/2018/news-20180219-01.es.xhtml
index 6c5ea53c38..29813212e1 100644
--- a/news/2018/news-20180219-01.es.xhtml
+++ b/news/2018/news-20180219-01.es.xhtml
@@ -43,7 +43,7 @@
    <tag key="ayc">Ask your Candidates</tag>
       <tag key="pmpc">Public Code</tag>
       <tag key="openstandards">OpenStandards</tag>
-      <tag key="publicadministration">Public Administration</tag>
+      <tag key="public-administration">Public Administration</tag>
       <tag key="it">Italy</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2018/news-20180219-01.it.xhtml b/news/2018/news-20180219-01.it.xhtml
index 941bc178d3..9c4c83a695 100644
--- a/news/2018/news-20180219-01.it.xhtml
+++ b/news/2018/news-20180219-01.it.xhtml
@@ -74,7 +74,7 @@
    <tag key="ayc">Ask your Candidates</tag>
       <tag key="pmpc">Public Code</tag>
       <tag key="openstandards">Standard aperti</tag>
-      <tag key="publicadministration">Public Administration</tag>
+      <tag key="public-administration">Public Administration</tag>
       <tag key="it">Italia</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2018/news-20180219-01.nl.xhtml b/news/2018/news-20180219-01.nl.xhtml
index 762614f7b1..435a05e045 100644
--- a/news/2018/news-20180219-01.nl.xhtml
+++ b/news/2018/news-20180219-01.nl.xhtml
@@ -43,7 +43,7 @@
    <tag key="ayc">Vraag het uw kandidaten</tag>
       <tag key="pmpc">Publieke Code</tag>
       <tag key="openstandards">Open Standaarden</tag>
-      <tag key="publicadministration">Overheid</tag>
+      <tag key="public-administration">Overheid</tag>
       <tag key="it">Italië</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2018/news-20180219-01.sq.xhtml b/news/2018/news-20180219-01.sq.xhtml
index e28222400b..251483482b 100644
--- a/news/2018/news-20180219-01.sq.xhtml
+++ b/news/2018/news-20180219-01.sq.xhtml
@@ -43,7 +43,7 @@
    <tag key="ayc">Pyetni Kandidatët Tuaj</tag>
       <tag key="pmpc">Kod Publik</tag>
       <tag key="openstandards">Standarde të Hapur</tag>
-      <tag key="publicadministration">Administratë Publike</tag>
+      <tag key="public-administration">Administratë Publike</tag>
       <tag key="it">Itali</tag>
   <tag key="front-page"/>
 </tags>
diff --git a/news/2018/news-20180725-01.de.xhtml b/news/2018/news-20180725-01.de.xhtml
index ff03597bb7..4e4a992e88 100644
--- a/news/2018/news-20180725-01.de.xhtml
+++ b/news/2018/news-20180725-01.de.xhtml
@@ -98,7 +98,7 @@
     <tag key="front-page"/>
     <tag key="pmpc">Public Money? Public Code!</tag>
     <tag key="interview">Interview</tag>
-    <tag key="openletter">Open Letter</tag>
+    <tag key="open-letter">Open Letter</tag>
     <tag key="translations">Translations</tag>
 </tags>
 <author id="albers"/>
diff --git a/news/2018/news-20180725-01.en.xhtml b/news/2018/news-20180725-01.en.xhtml
index 46a8d70543..9ab9fe0c33 100644
--- a/news/2018/news-20180725-01.en.xhtml
+++ b/news/2018/news-20180725-01.en.xhtml
@@ -69,7 +69,7 @@ the buddies on your favourite social media channel to sign it too. </p>
       <tag key="front-page"/>
       <tag key="pmpc">Public Money? Public Code!</tag>
       <tag key="interview">Interview</tag>
-      <tag key="openletter">Open Letter</tag>
+      <tag key="open-letter">Open Letter</tag>
       <tag key="translations">Translations</tag>
   </tags>
   <author id="albers"/>
diff --git a/news/2018/news-20180725-01.es.xhtml b/news/2018/news-20180725-01.es.xhtml
index 606294a1b0..d5b521e300 100644
--- a/news/2018/news-20180725-01.es.xhtml
+++ b/news/2018/news-20180725-01.es.xhtml
@@ -75,7 +75,7 @@ o contactos de tu red social preferida, que la firmen también. </p>
       <tag key="front-page"/>
       <tag key="pmpc">¿Dinero público? ¡Código público!</tag>
       <tag key="interview">Entrevista</tag>
-      <tag key="openletter">Carta abierta</tag>
+      <tag key="open-letter">Carta abierta</tag>
       <tag key="translations">Traducciones</tag>
   </tags>
   <author id="albers"/>
diff --git a/news/2018/news-20180725-01.fr.xhtml b/news/2018/news-20180725-01.fr.xhtml
index 7ba58292cd..c9f63e90e4 100644
--- a/news/2018/news-20180725-01.fr.xhtml
+++ b/news/2018/news-20180725-01.fr.xhtml
@@ -80,7 +80,7 @@ canaux de vos réseaux sociaux favoris de la signer également.</p>
       <tag key="front-page"/>
       <tag key="pmpc">Public Money? Public Code!</tag>
       <tag key="interview">Interview</tag>
-      <tag key="openletter">Open Letter</tag>
+      <tag key="open-letter">Open Letter</tag>
       <tag key="translations">Translations</tag>
   </tags>
   <author id="albers"/>
diff --git a/news/2018/news-20180725-01.nl.xhtml b/news/2018/news-20180725-01.nl.xhtml
index 70b764fb96..700b007d0f 100644
--- a/news/2018/news-20180725-01.nl.xhtml
+++ b/news/2018/news-20180725-01.nl.xhtml
@@ -42,7 +42,7 @@ brief</a> te ondertekenen als u dat nog niet gedaan heeft. Vraag na het ondertek
       <tag key="front-page"/>
       <tag key="pmpc">Publiek Geld? Publieke Code!</tag>
       <tag key="interview">interview</tag>
-      <tag key="openletter">open brief</tag>
+      <tag key="open-letter">open brief</tag>
       <tag key="translations">vertalingen</tag>
   </tags>
   <author id="albers"/>
diff --git a/news/2018/news-20181010-01.de.xhtml b/news/2018/news-20181010-01.de.xhtml
index 7e048ad3dc..e06e2be436 100644
--- a/news/2018/news-20181010-01.de.xhtml
+++ b/news/2018/news-20181010-01.de.xhtml
@@ -54,7 +54,7 @@ beteiligten Parteien vergleichen. Themen des Digital-O-Mat sind unter anderem Tr
 <tag key="pmpc">Public Money Public Code</tag>
 <tag key="ayc">Ask Your Candidates</tag>
 <tag key="de">Deutschland</tag>
-<tag key="digitalomat">Digital-O-Mat</tag>
+<tag key="digital-o-mat">Digital-O-Mat</tag>
 </tags>
 <author id="albers"/>
 </html>
diff --git a/news/2018/news-20181010-01.nl.xhtml b/news/2018/news-20181010-01.nl.xhtml
index 71e778e4a1..c74896dc51 100644
--- a/news/2018/news-20181010-01.nl.xhtml
+++ b/news/2018/news-20181010-01.nl.xhtml
@@ -52,7 +52,7 @@ zich sterker voor Vrije Software zal inzetten. Wij verwachten daarom in een nieu
 <tag key="pmpc">Publiek Geld Publieke Code</tag>
 <tag key="ayc">Vraag het uw Kandidaten</tag>
 <tag key="de">Duitsland</tag>
-<tag key="digitalomat">Digital-O-Mat</tag>
+<tag key="digital-o-mat">Digital-O-Mat</tag>
 </tags>
 <author id="albers"/>
 <translator>André Ockers</translator>
diff --git a/news/2019/news-20190124-01.de.xhtml b/news/2019/news-20190124-01.de.xhtml
index 3665f92a4f..31d8288c4e 100644
--- a/news/2019/news-20190124-01.de.xhtml
+++ b/news/2019/news-20190124-01.de.xhtml
@@ -71,8 +71,8 @@
  	<tag key="pmpc">Public Money Public Code</tag>
  	<tag key="policy">Politik</tag>
 	<tag key="procurement">Öffentliche Beschaffung</tag>
-	<tag key="europeanparliament">Europäisches Parlament</tag>
-	<tag key="publicadministration">Öffentliche Verwaltung</tag>
+	<tag key="european-parliament">Europäisches Parlament</tag>
+	<tag key="public-administration">Öffentliche Verwaltung</tag>
  </tags>
 
 <image url="https://pics.fsfe.org/uploads/big/98e28c70f5ee02f3d6f979c05d8ae9c3.jpg" />
diff --git a/news/2019/news-20190124-01.en.xhtml b/news/2019/news-20190124-01.en.xhtml
index c44e75bdf8..b76d6a5e04 100644
--- a/news/2019/news-20190124-01.en.xhtml
+++ b/news/2019/news-20190124-01.en.xhtml
@@ -68,8 +68,8 @@
  	<tag key="pmpc">Public Money Public Code</tag>
  	<tag key="policy">Policy</tag>
 	<tag key="procurement">Public procurement</tag>
-	<tag key="europeanparliament">European Parliament</tag>
-	<tag key="publicadministration">Public Administration</tag>
+	<tag key="european-parliament">European Parliament</tag>
+	<tag key="public-administration">Public Administration</tag>
  </tags>
 
 <image url="https://pics.fsfe.org/uploads/big/98e28c70f5ee02f3d6f979c05d8ae9c3.jpg" />
diff --git a/news/2019/news-20190124-01.es.xhtml b/news/2019/news-20190124-01.es.xhtml
index 3dc9adaa6b..e66ad4aa77 100644
--- a/news/2019/news-20190124-01.es.xhtml
+++ b/news/2019/news-20190124-01.es.xhtml
@@ -67,8 +67,8 @@
  	<tag key="pmpc">Public Money Public Code</tag>
  	<tag key="policy">Policy</tag>
 	<tag key="procurement">Public procurement</tag>
-	<tag key="europeanparliament">European Parliament</tag>
-	<tag key="publicadministration">Public Administration</tag>
+	<tag key="european-parliament">European Parliament</tag>
+	<tag key="public-administration">Public Administration</tag>
  </tags>
 
 <image url="https://pics.fsfe.org/uploads/big/98e28c70f5ee02f3d6f979c05d8ae9c3.jpg" />
diff --git a/news/2019/news-20190124-01.fr.xhtml b/news/2019/news-20190124-01.fr.xhtml
index 35ce2a7b04..b4baf0d744 100644
--- a/news/2019/news-20190124-01.fr.xhtml
+++ b/news/2019/news-20190124-01.fr.xhtml
@@ -56,8 +56,8 @@
         <tag key="pmpc">Public Money Public Code</tag>
         <tag key="policy">Policy</tag>
         <tag key="procurement">Public procurement</tag>
-        <tag key="europeanparliament">European Parliament</tag>
-        <tag key="publicadministration">Public Administration</tag>
+        <tag key="european-parliament">European Parliament</tag>
+        <tag key="public-administration">Public Administration</tag>
     </tags>
 
     <image url="https://pics.fsfe.org/uploads/big/98e28c70f5ee02f3d6f979c05d8ae9c3.jpg" />
diff --git a/news/2019/news-20190124-01.nl.xhtml b/news/2019/news-20190124-01.nl.xhtml
index 3829185088..5967e50966 100644
--- a/news/2019/news-20190124-01.nl.xhtml
+++ b/news/2019/news-20190124-01.nl.xhtml
@@ -61,8 +61,8 @@
 		 <tag key="pmpc">Publiek Geld Publieke Code</tag>
 		 <tag key="policy">beleid</tag>
 		<tag key="procurement">publieke inkoop</tag>
-		<tag key="europeanparliament">Europees Parlement</tag>
-		<tag key="publicadministration">overheid</tag>
+		<tag key="european-parliament">Europees Parlement</tag>
+		<tag key="public-administration">overheid</tag>
  </tags>
  <translator>André Ockers</translator>
 
diff --git a/news/2019/news-20190326-01.de.xhtml b/news/2019/news-20190326-01.de.xhtml
index 8ad3a493e6..9992f85018 100644
--- a/news/2019/news-20190326-01.de.xhtml
+++ b/news/2019/news-20190326-01.de.xhtml
@@ -23,6 +23,6 @@
   <tag key="front-page"/>
   <tag key="savecodeshare">Save Code Share</tag>
   <tag key="copyright">copyright</tag>
-  <tag key="europeanparliament">europeanparliament</tag>
+  <tag key="european-parliament">europeanparliament</tag>
 </tags>
 </html>
diff --git a/news/2019/news-20190326-01.en.xhtml b/news/2019/news-20190326-01.en.xhtml
index fe6ffac0a5..6faddf8754 100644
--- a/news/2019/news-20190326-01.en.xhtml
+++ b/news/2019/news-20190326-01.en.xhtml
@@ -23,6 +23,6 @@
   <tag key="front-page"/>
   <tag key="savecodeshare">Save Code Share</tag>
   <tag key="copyright">copyright</tag>
-  <tag key="europeanparliament">europeanparliament</tag>
+  <tag key="european-parliament">europeanparliament</tag>
 </tags>
 </html>
diff --git a/news/2019/news-20190326-01.nl.xhtml b/news/2019/news-20190326-01.nl.xhtml
index cec98d8e51..a1c4840464 100644
--- a/news/2019/news-20190326-01.nl.xhtml
+++ b/news/2019/news-20190326-01.nl.xhtml
@@ -22,7 +22,7 @@
       <tag key="front-page"/>
       <tag key="savecodeshare">Save Code Share</tag>
       <tag key="copyright">auteursrecht</tag>
-      <tag key="europeanparliament">Europees Parlement</tag>
+      <tag key="european-parliament">Europees Parlement</tag>
     </tags>
 <translator>André Ockers</translator>
 </html>
diff --git a/news/2019/news-20190515-01.de.xhtml b/news/2019/news-20190515-01.de.xhtml
index 8a642dd234..5292019254 100644
--- a/news/2019/news-20190515-01.de.xhtml
+++ b/news/2019/news-20190515-01.de.xhtml
@@ -115,7 +115,7 @@
 </body>
 <tags>
 <tag key="front-page"/>
-<tag key="publicadministration">Public administration</tag>
+<tag key="public-administration">Public administration</tag>
 <tag key="de">Germany</tag>
 <tag key="limux">Limux</tag>
 <tag key="pmpc">Public Money Public Code</tag>
diff --git a/news/2019/news-20190515-01.en.xhtml b/news/2019/news-20190515-01.en.xhtml
index 99aca37749..71c123e3e2 100644
--- a/news/2019/news-20190515-01.en.xhtml
+++ b/news/2019/news-20190515-01.en.xhtml
@@ -51,7 +51,7 @@
 </body>
 <tags>
 <tag key="front-page"/>
-<tag key="publicadministration">Public administration</tag>
+<tag key="public-administration">Public administration</tag>
 <tag key="de">Germany</tag>
 <tag key="limux">Limux</tag>
 <tag key="pmpc">Public Money Public Code</tag>
diff --git a/news/2019/news-20190515-01.nl.xhtml b/news/2019/news-20190515-01.nl.xhtml
index d3726bf06a..0d0fb1602f 100644
--- a/news/2019/news-20190515-01.nl.xhtml
+++ b/news/2019/news-20190515-01.nl.xhtml
@@ -45,7 +45,7 @@
 </body>
 <tags>
 <tag key="front-page"/>
-<tag key="publicadministration">overheid</tag>
+<tag key="public-administration">overheid</tag>
 <tag key="de">Duitsland</tag>
 <tag key="limux">LiMux</tag>
 <tag key="pmpc">Publiek Geld Publieke Code</tag>
diff --git a/news/2019/news-20190515-02.de.xhtml b/news/2019/news-20190515-02.de.xhtml
index 1f6adb83b3..bc7cfc06ae 100644
--- a/news/2019/news-20190515-02.de.xhtml
+++ b/news/2019/news-20190515-02.de.xhtml
@@ -44,7 +44,7 @@
 
 <tags>
 <tag key="front-page"/>
-<tag key="publicadministration">Öffentliche Verwaltung</tag>
+<tag key="public-administration">Öffentliche Verwaltung</tag>
 <tag key="de">Deutschland</tag>
 <tag key="limux">Limux</tag>
 <tag key="pmpc">Public Money Public Code</tag>
diff --git a/news/2019/news-20190515-02.en.xhtml b/news/2019/news-20190515-02.en.xhtml
index e1b6ed54ab..9b48878a0b 100644
--- a/news/2019/news-20190515-02.en.xhtml
+++ b/news/2019/news-20190515-02.en.xhtml
@@ -43,7 +43,7 @@
 
 <tags>
 <tag key="front-page"/>
-<tag key="publicadministration">Public administration</tag>
+<tag key="public-administration">Public administration</tag>
 <tag key="de">Germany</tag>
 <tag key="limux">Limux</tag>
 <tag key="pmpc">Public Money Public Code</tag>
diff --git a/news/2019/news-20190515-02.nl.xhtml b/news/2019/news-20190515-02.nl.xhtml
index 4ba0161e19..78218392db 100644
--- a/news/2019/news-20190515-02.nl.xhtml
+++ b/news/2019/news-20190515-02.nl.xhtml
@@ -43,7 +43,7 @@
 
     <tags>
    <tag key="front-page"/>
-    <tag key="publicadministration">overheid</tag>
+    <tag key="public-administration">overheid</tag>
     <tag key="de">Duitsland</tag>
     <tag key="limux">Limux</tag>
     <tag key="pmpc">Publiek Geld Publieke Code</tag>
diff --git a/news/2019/news-20190806-01.en.xhtml b/news/2019/news-20190806-01.en.xhtml
index aac242f968..f2e68da74c 100644
--- a/news/2019/news-20190806-01.en.xhtml
+++ b/news/2019/news-20190806-01.en.xhtml
@@ -84,7 +84,7 @@
   <tags>
       <tag key="pmpc">Public Money? Public Code!</tag>
       <tag key="competition">competition</tag>
-      <tag key="publicadministration">Public Administration</tag>
+      <tag key="public-administration">Public Administration</tag>
       <tag key="procurement">Public Procurement</tag>
       <tag key="front-page"/>
   </tags>
diff --git a/news/2019/news-20190806-01.nl.xhtml b/news/2019/news-20190806-01.nl.xhtml
index e18fb14681..eea650f864 100644
--- a/news/2019/news-20190806-01.nl.xhtml
+++ b/news/2019/news-20190806-01.nl.xhtml
@@ -70,7 +70,7 @@
       <tags>
           <tag key="pmpc">Publiek Geld? Publieke Code!</tag>
           <tag key="competition">competitie</tag>
-          <tag key="publicadministration">overheid</tag>
+          <tag key="public-administration">overheid</tag>
           <tag key="procurement">publieke inkoop</tag>
           <tag key="front-page"/>
       </tags>
diff --git a/news/2019/news-20190827-01.de.xhtml b/news/2019/news-20190827-01.de.xhtml
index 32f965553f..55fa2ec986 100644
--- a/news/2019/news-20190827-01.de.xhtml
+++ b/news/2019/news-20190827-01.de.xhtml
@@ -52,7 +52,7 @@ href="https://ec.europa.eu/info/law/better-regulation/initiatives/ares-2018-6621
   <tag key="front-page"/>
   <tag key="radiodirective">Radio Lockdown</tag>
   <tag key="policy">Policy</tag>
-  <tag key="europeancommission">European Commission</tag>
+  <tag key="european-commission">European Commission</tag>
  </tags>
 
 <author id="ku" />
diff --git a/news/2019/news-20190827-01.en.xhtml b/news/2019/news-20190827-01.en.xhtml
index 048fd427f6..874626c59f 100644
--- a/news/2019/news-20190827-01.en.xhtml
+++ b/news/2019/news-20190827-01.en.xhtml
@@ -121,7 +121,7 @@ href="https://ec.europa.eu/info/law/better-regulation/initiatives/ares-2018-6621
   <tag key="front-page"/>
   <tag key="radiodirective">Radio Lockdown</tag>
   <tag key="policy">Policy</tag>
-  <tag key="europeancommission">European Commission</tag>
+  <tag key="european-commission">European Commission</tag>
  </tags>
 
 <author id="ku" />
diff --git a/news/2019/news-20190827-01.es.xhtml b/news/2019/news-20190827-01.es.xhtml
index 475196667a..dc1fd4ccf6 100644
--- a/news/2019/news-20190827-01.es.xhtml
+++ b/news/2019/news-20190827-01.es.xhtml
@@ -45,7 +45,7 @@ href="https://ec.europa.eu/info/law/better-regulation/initiatives/ares-2018-6621
   <tag key="front-page"/>
   <tag key="radiodirective">Directiva Radiofrecuencia</tag>
   <tag key="policy">Política</tag>
-  <tag key="europeancommission">Comisión Europea</tag>
+  <tag key="european-commission">Comisión Europea</tag>
  </tags>
 
 <author id="ku" />
diff --git a/news/2019/news-20190827-01.nl.xhtml b/news/2019/news-20190827-01.nl.xhtml
index 09e494ab42..324e84ff6d 100644
--- a/news/2019/news-20190827-01.nl.xhtml
+++ b/news/2019/news-20190827-01.nl.xhtml
@@ -38,7 +38,7 @@ href="https://ec.europa.eu/info/law/better-regulation/initiatives/ares-2018-6621
   <tag key="front-page"/>
   <tag key="radiodirective">afsluiten radiocommunicatie</tag>
   <tag key="policy">beleid</tag>
-  <tag key="europeancommission">Europese Commissie</tag>
+  <tag key="european-commission">Europese Commissie</tag>
  </tags>
 
 <author id="ku" />
diff --git a/news/2019/news-20191002-01.en.xhtml b/news/2019/news-20191002-01.en.xhtml
index 9a16338ba5..1002df4625 100644
--- a/news/2019/news-20191002-01.en.xhtml
+++ b/news/2019/news-20191002-01.en.xhtml
@@ -119,7 +119,7 @@ Rec 10: When developing software, the European Commission needs to follow its co
 
   </body>
   <tags>
-      <tag key="openletter">Open letter</tag>
+      <tag key="open-letter">Open letter</tag>
       <tag key="front-page"/>
       <tag key="policy">Policy</tag>
   </tags>
diff --git a/news/2019/news-20191002-01.nl.xhtml b/news/2019/news-20191002-01.nl.xhtml
index 60662e7de2..b2b1c737be 100644
--- a/news/2019/news-20191002-01.nl.xhtml
+++ b/news/2019/news-20191002-01.nl.xhtml
@@ -119,7 +119,7 @@ Aanbeveling 10: Wanneer zij software ontwikkelt moet de Europese Commissie haar
 
   </body>
   <tags>
-      <tag key="openletter">open brief</tag>
+      <tag key="open-letter">open brief</tag>
       <tag key="front-page"/>
       <tag key="policy">beleid</tag>
   </tags>
diff --git a/news/2020/news-20200424-01.en.xhtml b/news/2020/news-20200424-01.en.xhtml
index 25d0973827..acf9cdcea4 100644
--- a/news/2020/news-20200424-01.en.xhtml
+++ b/news/2020/news-20200424-01.en.xhtml
@@ -91,7 +91,7 @@ impact.</blockquote>
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Public Money? Public Code!</tag>
-  <tag key="publicadministration">Public Administration</tag>
+  <tag key="public-administration">Public Administration</tag>
   <tag key="policy">Policy</tag>
   <tag key="nl">Netherlands</tag>
 </tags>
diff --git a/news/2020/news-20200424-01.it.xhtml b/news/2020/news-20200424-01.it.xhtml
index 2f36f69c6c..3570d20e8c 100644
--- a/news/2020/news-20200424-01.it.xhtml
+++ b/news/2020/news-20200424-01.it.xhtml
@@ -38,7 +38,7 @@ href="https://publiccode.eu">aggiungere la tua firma</a> per avere un impatto ma
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Denaro pubblico? Codice pubblico!</tag>
-  <tag key="publicadministration">Pubblica amministrazione</tag>
+  <tag key="public-administration">Pubblica amministrazione</tag>
   <tag key="policy">Politica</tag>
   <tag key="nl">Paesi Bassi</tag>
 </tags>
diff --git a/news/2020/news-20200424-01.nl.xhtml b/news/2020/news-20200424-01.nl.xhtml
index cf80bb0e45..abf06a4d4a 100644
--- a/news/2020/news-20200424-01.nl.xhtml
+++ b/news/2020/news-20200424-01.nl.xhtml
@@ -39,7 +39,7 @@ De Free Software Foundation Europe ondertekende samen met meer dan 180 organisat
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Publiek Geld? Publieke Code!</tag> 
-  <tag key="publicadministration">overheid</tag> 
+  <tag key="public-administration">overheid</tag> 
   <tag key="policy">beleid</tag> 
   <tag key="nl">Nederland</tag>
 </tags>
diff --git a/news/2020/news-20200506-01.de.xhtml b/news/2020/news-20200506-01.de.xhtml
index d3013aec98..a1267d5065 100644
--- a/news/2020/news-20200506-01.de.xhtml
+++ b/news/2020/news-20200506-01.de.xhtml
@@ -47,7 +47,7 @@ kontaktieren und sie davon zu überzeugen, Freie Software als Standard zu nutzen
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Public Money? Public Code!</tag>
-  <tag key="publicadministration">Public Administration</tag>
+  <tag key="public-administration">Public Administration</tag>
   <tag key="policy">Policy</tag>
   <tag key="limux">LiMux</tag>
   </tags>
diff --git a/news/2020/news-20200506-01.en.xhtml b/news/2020/news-20200506-01.en.xhtml
index 2ccea102c4..22f4c1c959 100644
--- a/news/2020/news-20200506-01.en.xhtml
+++ b/news/2020/news-20200506-01.en.xhtml
@@ -46,7 +46,7 @@ the standard. You are invited to add your signature to make a bigger impact on <
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Public Money? Public Code!</tag>
-  <tag key="publicadministration">Public Administration</tag>
+  <tag key="public-administration">Public Administration</tag>
   <tag key="policy">Policy</tag>
   <tag key="limux">LiMux</tag>
   </tags>
diff --git a/news/2020/news-20200506-01.it.xhtml b/news/2020/news-20200506-01.it.xhtml
index 0b5e5d6a26..e8ab871aa6 100644
--- a/news/2020/news-20200506-01.it.xhtml
+++ b/news/2020/news-20200506-01.it.xhtml
@@ -32,7 +32,7 @@ La Free Software Foundation Europe, insieme ad altre 180 organizzazioni civili e
 <tags>
   <tag key="front-page"/>
   <tag key="pmpc">Denaro pubblico? Codice pubblico!</tag>
-  <tag key="publicadministration">Pubblica amministrazione</tag>
+  <tag key="public-administration">Pubblica amministrazione</tag>
   <tag key="policy">Politica</tag>
   <tag key="limux">LiMux</tag>
   </tags>
diff --git a/news/2020/news-20200506-01.nl.xhtml b/news/2020/news-20200506-01.nl.xhtml
index 897baf080b..cf91f54186 100644
--- a/news/2020/news-20200506-01.nl.xhtml
+++ b/news/2020/news-20200506-01.nl.xhtml
@@ -33,7 +33,7 @@
     <tags>
       <tag key="front-page"/>
       <tag key="pmpc">Publiek Geld? Publieke Code!</tag>
-      <tag key="publicadministration">overheid</tag>
+      <tag key="public-administration">overheid</tag>
       <tag key="policy">beleid</tag>
       <tag key="limux">LiMux</tag>
       </tags>
diff --git a/news/2020/news-20200519-01.en.xhtml b/news/2020/news-20200519-01.en.xhtml
index 78dc284b0e..c1f14b965b 100644
--- a/news/2020/news-20200519-01.en.xhtml
+++ b/news/2020/news-20200519-01.en.xhtml
@@ -29,7 +29,7 @@
   <tag key="competition">Competition</tag>
   <tag key="antitrust">Antitrust</tag>
   <tag key="policy">Policy</tag>
-  <tag key="europeancommission">European Commission</tag>
+  <tag key="european-commission">European Commission</tag>
 </tags>
 <author id="lasota" />
 <discussion href="https://community.fsfe.org/t/470"/>
diff --git a/news/2020/news-20200519-01.es.xhtml b/news/2020/news-20200519-01.es.xhtml
index 57fddfa964..0b5b71a7ac 100644
--- a/news/2020/news-20200519-01.es.xhtml
+++ b/news/2020/news-20200519-01.es.xhtml
@@ -30,7 +30,7 @@
   <tag key="competition">Competencia</tag>
   <tag key="antitrust">Antitrust</tag>
   <tag key="policy">Política</tag>
-  <tag key="europeancommission">Comisión Europea</tag>
+  <tag key="european-commission">Comisión Europea</tag>
 </tags>
 <author id="lasota"/>
 <discussion href="https://community.fsfe.org/t/470"/>
diff --git a/news/2020/news-20200519-01.it.xhtml b/news/2020/news-20200519-01.it.xhtml
index 049f25fc0f..d121b5b80b 100644
--- a/news/2020/news-20200519-01.it.xhtml
+++ b/news/2020/news-20200519-01.it.xhtml
@@ -29,7 +29,7 @@
   <tag key="competition">Concorrenza</tag>
   <tag key="antitrust">Antitrust</tag>
   <tag key="policy">Politica</tag>
-  <tag key="europeancommission">Commissione Europea</tag>
+  <tag key="european-commission">Commissione Europea</tag>
 </tags>
 <author id="lasota" />
 <discussion href="https://community.fsfe.org/t/470"/>
diff --git a/news/2020/news-20200519-01.nl.xhtml b/news/2020/news-20200519-01.nl.xhtml
index 3845f0bb53..b5f9292f42 100644
--- a/news/2020/news-20200519-01.nl.xhtml
+++ b/news/2020/news-20200519-01.nl.xhtml
@@ -29,7 +29,7 @@
       <tag key="competition">Mededinging</tag>
       <tag key="antitrust">Antitrust</tag>
       <tag key="policy">Beleid</tag>
-      <tag key="europeancommission">Europese Commissie</tag>
+      <tag key="european-commission">Europese Commissie</tag>
     </tags>
     <author id="lasota" />
     <discussion href="https://community.fsfe.org/t/470"/>
diff --git a/news/2020/news-20200610-01.de.xhtml b/news/2020/news-20200610-01.de.xhtml
index e28a8105ce..39ae1b41e0 100644
--- a/news/2020/news-20200610-01.de.xhtml
+++ b/news/2020/news-20200610-01.de.xhtml
@@ -58,7 +58,7 @@
 <tag key="front-page"/>
 <tag key="pmpc">Public Money? Public Code!</tag>
 <tag key="de">Deutschland</tag>
-<tag key="publicadministration">Öffentliche Verwaltung</tag>
+<tag key="public-administration">Öffentliche Verwaltung</tag>
 </tags>
 
 
diff --git a/news/2020/news-20200610-01.en.xhtml b/news/2020/news-20200610-01.en.xhtml
index dfb7296aa2..21260bf0ea 100644
--- a/news/2020/news-20200610-01.en.xhtml
+++ b/news/2020/news-20200610-01.en.xhtml
@@ -69,7 +69,7 @@
 <tag key="front-page"/>
 <tag key="pmpc">Public Money? Public Code!</tag>
 <tag key="de">Germany</tag>
-<tag key="publicadministration">Public Administration</tag>
+<tag key="public-administration">Public Administration</tag>
 </tags>
 
 
diff --git a/news/2020/news-20200610-01.it.xhtml b/news/2020/news-20200610-01.it.xhtml
index 7a3963e95f..187a9b9659 100644
--- a/news/2020/news-20200610-01.it.xhtml
+++ b/news/2020/news-20200610-01.it.xhtml
@@ -68,7 +68,7 @@
 <tag key="front-page"/>
 <tag key="pmpc">Denaro pubblico? Codice pubblico!</tag>
 <tag key="de">Germania</tag>
-<tag key="publicadministration">Pubblica Amministrazione</tag>
+<tag key="public-administration">Pubblica Amministrazione</tag>
 </tags>
 
 
diff --git a/news/2020/news-20200610-01.nl.xhtml b/news/2020/news-20200610-01.nl.xhtml
index ea2b3fdb65..64291af081 100644
--- a/news/2020/news-20200610-01.nl.xhtml
+++ b/news/2020/news-20200610-01.nl.xhtml
@@ -55,7 +55,7 @@
     <tag key="front-page"/>
     <tag key="pmpc">Publieke Geld? Publieke Code!</tag>
     <tag key="de">Duitsland</tag>tag>
-    <tag key="publicadministration">Overheid</tag>
+    <tag key="public-administration">Overheid</tag>
     </tags>
 
 
diff --git a/news/2020/news-20200630-01.de.xhtml b/news/2020/news-20200630-01.de.xhtml
index 835a068b0f..b0714ca4e4 100644
--- a/news/2020/news-20200630-01.de.xhtml
+++ b/news/2020/news-20200630-01.de.xhtml
@@ -135,7 +135,7 @@
 <tag key="interview">Interview</tag>
 <tag key="de">Deutschland</tag>
 <tag key="tools">Werkzeuge</tag>
-<tag key="publicadministration">Öffentliche Verwaltung</tag>
+<tag key="public-administration">Öffentliche Verwaltung</tag>
 </tags>
 
 <discussion href="https://community.fsfe.org/t/481"/>
diff --git a/news/2020/news-20200630-01.en.xhtml b/news/2020/news-20200630-01.en.xhtml
index 2f4f005f57..f50a724018 100644
--- a/news/2020/news-20200630-01.en.xhtml
+++ b/news/2020/news-20200630-01.en.xhtml
@@ -136,7 +136,7 @@
 <tag key="interview">Interview</tag>
 <tag key="de">Germany</tag>
 <tag key="tools">Tools</tag>
-<tag key="publicadministration">Public Administration</tag>
+<tag key="public-administration">Public Administration</tag>
 </tags>
 
 <discussion href="https://community.fsfe.org/t/481"/>
diff --git a/news/2020/news-20200630-01.it.xhtml b/news/2020/news-20200630-01.it.xhtml
index b7c039bdfc..eb20566572 100644
--- a/news/2020/news-20200630-01.it.xhtml
+++ b/news/2020/news-20200630-01.it.xhtml
@@ -134,7 +134,7 @@
 <tag key="interview">Intervista</tag>
 <tag key="de">Germania</tag>
 <tag key="tools">Strumenti</tag>
-<tag key="publicadministration">Pubblica amministrazione</tag>
+<tag key="public-administration">Pubblica amministrazione</tag>
 </tags>
 
 <discussion href="https://community.fsfe.org/t/481"/>
diff --git a/news/2020/news-20200630-01.nl.xhtml b/news/2020/news-20200630-01.nl.xhtml
index 564131b8e1..5a898a9397 100644
--- a/news/2020/news-20200630-01.nl.xhtml
+++ b/news/2020/news-20200630-01.nl.xhtml
@@ -123,7 +123,7 @@
 <tag key="interview">Interview</tag>
 <tag key="de">Duitsland</tag>
 <tag key="tools">Gereedschappen</tag>
-<tag key="publicadministration">Overheid</tag>
+<tag key="public-administration">Overheid</tag>
 </tags>
 
 <discussion href="https://community.fsfe.org/t/481"/>
diff --git a/news/2020/news-20200820-01.en.xhtml b/news/2020/news-20200820-01.en.xhtml
index 7f29869686..0ce153c69b 100644
--- a/news/2020/news-20200820-01.en.xhtml
+++ b/news/2020/news-20200820-01.en.xhtml
@@ -67,7 +67,7 @@
 <tag key="front-page"/>
 <tag key="copyright">Copyright</tag>
 <tag key="competition">Competition</tag>
-<tag key="europeancommission">European Commission</tag>
+<tag key="european-commission">European Commission</tag>
 <tag key="patents">Patents</tag>
 </tags>
 
diff --git a/news/2020/news-20200820-01.it.xhtml b/news/2020/news-20200820-01.it.xhtml
index 31b1179c82..7fe1c5a5ab 100644
--- a/news/2020/news-20200820-01.it.xhtml
+++ b/news/2020/news-20200820-01.it.xhtml
@@ -69,7 +69,7 @@
 <tag key="front-page"/>
 <tag key="copyright">Copyright</tag>
 <tag key="competition">Concorrenza</tag>
-<tag key="europeancommission">Commissione Europea</tag>
+<tag key="european-commission">Commissione Europea</tag>
 <tag key="patents">Brevetti</tag>
 </tags>
 
diff --git a/news/2020/news-20200820-01.nl.xhtml b/news/2020/news-20200820-01.nl.xhtml
index cb0c219961..bd419c3024 100644
--- a/news/2020/news-20200820-01.nl.xhtml
+++ b/news/2020/news-20200820-01.nl.xhtml
@@ -67,7 +67,7 @@
 <tag key="front-page"/>
 <tag key="copyright">auteursrecht</tag>
 <tag key="competition">concurrentie</tag>
-<tag key="europeancommission">Europese Commissie</tag>
+<tag key="european-commission">Europese Commissie</tag>
 <tag key="patents">patenten</tag>
 </tags>
 
diff --git a/news/2020/news-20200910-01.de.xhtml b/news/2020/news-20200910-01.de.xhtml
index 2752450246..4f6e3041b7 100644
--- a/news/2020/news-20200910-01.de.xhtml
+++ b/news/2020/news-20200910-01.de.xhtml
@@ -82,7 +82,7 @@
 <tags>
 <tag key="front-page"/>
 <tag key="pmpc">Public Money? Public Code!</tag>
-<tag key="publicadministration">Öffentliche Verwaltung</tag>
+<tag key="public-administration">Öffentliche Verwaltung</tag>
 </tags>
 
 <discussion href="https://community.fsfe.org/t/508"/>  
diff --git a/news/2020/news-20200910-01.en.xhtml b/news/2020/news-20200910-01.en.xhtml
index 81df9cd2ea..c889a1a350 100644
--- a/news/2020/news-20200910-01.en.xhtml
+++ b/news/2020/news-20200910-01.en.xhtml
@@ -80,7 +80,7 @@
 <tags>
 <tag key="front-page"/>
 <tag key="pmpc">Public Money? Public Code!</tag>
-<tag key="publicadministration">Public Administration</tag>
+<tag key="public-administration">Public Administration</tag>
 </tags>
 	
 <discussion href="https://community.fsfe.org/t/508"/>  
diff --git a/news/nl/nl-201006.de.xhtml b/news/nl/nl-201006.de.xhtml
index d9331eafc6..145f51abaa 100644
--- a/news/nl/nl-201006.de.xhtml
+++ b/news/nl/nl-201006.de.xhtml
@@ -59,7 +59,7 @@ und <a
 	
 <tags>
   <tag key="newsletter"/>  
-  <tag key="europeancommission"/>  
+  <tag key="european-commission"/>  
   <tag key="openstandards">OGG Theora</tag>  
   <tag key="eif"/>  
   <tag key="openstandards"/>
diff --git a/news/nl/nl-201006.el.xhtml b/news/nl/nl-201006.el.xhtml
index c837ea8220..6d1cc64d66 100644
--- a/news/nl/nl-201006.el.xhtml
+++ b/news/nl/nl-201006.el.xhtml
@@ -121,7 +121,7 @@ Dradio ο οποίος αναμεταδίδει το πρόγραμμά του 
 	
 <tags>
   <tag key="newsletter"/>  
-  <tag key="europeancommission"/>  
+  <tag key="european-commission"/>  
   <tag key="openstandards">OGG Theora</tag>  
   <tag key="eif"/>  
   <tag key="openstandards"/>
diff --git a/news/nl/nl-201006.en.xhtml b/news/nl/nl-201006.en.xhtml
index a2eb42f857..b58a465f38 100644
--- a/news/nl/nl-201006.en.xhtml
+++ b/news/nl/nl-201006.en.xhtml
@@ -126,7 +126,7 @@ discussion@lists.fsfe.org.</p>
 	
 <tags>
   <tag key="newsletter"/>  
-  <tag key="europeancommission"/>  
+  <tag key="european-commission"/>  
   <tag key="openstandards">OGG Theora</tag>  
   <tag key="eif"/>  
   <tag key="openstandards"/>
diff --git a/news/nl/nl-201006.fr.xhtml b/news/nl/nl-201006.fr.xhtml
index df1559d3fb..a2d76d7318 100644
--- a/news/nl/nl-201006.fr.xhtml
+++ b/news/nl/nl-201006.fr.xhtml
@@ -57,7 +57,7 @@ et <a
 	
 <tags>
   <tag key="newsletter"/>  
-  <tag key="europeancommission"/>  
+  <tag key="european-commission"/>  
   <tag key="openstandards">OGG Theora</tag>  
   <tag key="eif"/>  
   <tag key="openstandards"/>
diff --git a/news/nl/nl-201007.de.xhtml b/news/nl/nl-201007.de.xhtml
index 2a231a276c..eac5c777b2 100644
--- a/news/nl/nl-201007.de.xhtml
+++ b/news/nl/nl-201007.de.xhtml
@@ -149,7 +149,7 @@
   <tag key="newsletter"/>  
   <tag key="gpl">GNU GPL</tag>  
   <tag key="licensing"/>  
-  <tag key="europeancommission"/>  
+  <tag key="european-commission"/>  
   <tag key="tech-teams"/>  
 </tags>
 
diff --git a/news/nl/nl-201007.el.xhtml b/news/nl/nl-201007.el.xhtml
index 656d57d976..9284773356 100644
--- a/news/nl/nl-201007.el.xhtml
+++ b/news/nl/nl-201007.el.xhtml
@@ -132,7 +132,7 @@
   <tag key="newsletter"/>  
   <tag key="gpl">GNU GPL</tag>  
   <tag key="licensing"/>  
-  <tag key="europeancommission"/>  
+  <tag key="european-commission"/>  
   <tag key="tech-teams"/>  
 </tags>
 
diff --git a/news/nl/nl-201007.en.xhtml b/news/nl/nl-201007.en.xhtml
index 048f503630..cb93896f26 100644
--- a/news/nl/nl-201007.en.xhtml
+++ b/news/nl/nl-201007.en.xhtml
@@ -142,7 +142,7 @@
   <tag key="newsletter"/>  
   <tag key="gpl">GNU GPL</tag>  
   <tag key="licensing"/>  
-  <tag key="europeancommission"/>  
+  <tag key="european-commission"/>  
   <tag key="tech-teams"/>
 </tags>
 
diff --git a/news/nl/nl-201007.es.xhtml b/news/nl/nl-201007.es.xhtml
index d9bf87c9ea..0cb1fdee61 100644
--- a/news/nl/nl-201007.es.xhtml
+++ b/news/nl/nl-201007.es.xhtml
@@ -107,7 +107,7 @@ Garantiza las cuartas libertades y adicione la condición que esas libertades se
   <tag key="newsletter"/>  
   <tag key="gpl">GNU GPL</tag>  
   <tag key="licensing"/>  
-  <tag key="europeancommission"/>  
+  <tag key="european-commission"/>  
   <tag key="tech-teams"/>  
 </tags>
 
diff --git a/news/nl/nl-201007.fr.xhtml b/news/nl/nl-201007.fr.xhtml
index f6631c069d..83280251e8 100644
--- a/news/nl/nl-201007.fr.xhtml
+++ b/news/nl/nl-201007.fr.xhtml
@@ -178,7 +178,7 @@
   <tag key="newsletter"/>  
   <tag key="gpl">GNU GPL</tag>  
   <tag key="licensing"/>  
-  <tag key="europeancommission"/>  
+  <tag key="european-commission"/>  
   <tag key="tech-teams"/>  
 </tags>
 
diff --git a/news/nl/nl-201008.de.xhtml b/news/nl/nl-201008.de.xhtml
index 2cd3ff1df3..3058d9fef3 100644
--- a/news/nl/nl-201008.de.xhtml
+++ b/news/nl/nl-201008.de.xhtml
@@ -199,7 +199,7 @@ von Ausstellungsständen</a> zu verbessern.</li>
 <tags>
   <tag key="newsletter"/>  
   <tag key="openstandards"/>  
-  <tag key="publicadministration"/>  
+  <tag key="public-administration"/>  
   <tag key="de"/>  
   <tag key="rmll"/>  
 </tags>
diff --git a/news/nl/nl-201008.el.xhtml b/news/nl/nl-201008.el.xhtml
index 757f048ffe..77162a2f08 100644
--- a/news/nl/nl-201008.el.xhtml
+++ b/news/nl/nl-201008.el.xhtml
@@ -173,7 +173,7 @@ Cornelia Rogall-Grothe <a href="/news/2010/news-20100705-01.el.html">ανέλυ
 <tags>
   <tag key="newsletter"/>  
   <tag key="openstandards"/>  
-  <tag key="publicadministration"/>  
+  <tag key="public-administration"/>  
   <tag key="de"/>  
   <tag key="rmll"/>  
 </tags>
diff --git a/news/nl/nl-201008.en.xhtml b/news/nl/nl-201008.en.xhtml
index 9a5625151e..6fef4190c3 100644
--- a/news/nl/nl-201008.en.xhtml
+++ b/news/nl/nl-201008.en.xhtml
@@ -183,7 +183,7 @@ booths</a>.</li> </ul>
 <tags>
   <tag key="newsletter"/>  
   <tag key="openstandards"/>  
-  <tag key="publicadministration"/>  
+  <tag key="public-administration"/>  
   <tag key="de"/>  
   <tag key="rmll"/>  
 </tags>
diff --git a/news/nl/nl-201008.es.xhtml b/news/nl/nl-201008.es.xhtml
index b110cb9874..2651889e2d 100644
--- a/news/nl/nl-201008.es.xhtml
+++ b/news/nl/nl-201008.es.xhtml
@@ -184,7 +184,7 @@ los puestos</a>.</li> </ul>
 <tags>
   <tag key="newsletter"/>  
   <tag key="openstandards"/>  
-  <tag key="publicadministration"/>  
+  <tag key="public-administration"/>  
   <tag key="de"/>  
   <tag key="rmll"/>  
 </tags>
diff --git a/news/nl/nl-201008.fr.xhtml b/news/nl/nl-201008.fr.xhtml
index 25cd304a04..e3ef9c645e 100644
--- a/news/nl/nl-201008.fr.xhtml
+++ b/news/nl/nl-201008.fr.xhtml
@@ -95,7 +95,7 @@ Agrégation des Blogs de la
 <tags>
   <tag key="newsletter"/>  
   <tag key="openstandards"/>  
-  <tag key="publicadministration"/>  
+  <tag key="public-administration"/>  
   <tag key="de"/>  
   <tag key="rmll"/>  
   
diff --git a/news/nl/nl-201709.de.xhtml b/news/nl/nl-201709.de.xhtml
index cbb9f57382..a7636a334c 100644
--- a/news/nl/nl-201709.de.xhtml
+++ b/news/nl/nl-201709.de.xhtml
@@ -101,7 +101,7 @@
     <tag key="newsletter"/>
     <tag key="reuse">Reuse.Software</tag>
     <tag key="pmpc">Public Money Public Code</tag>
-    <tag key="digitalomat">Digital-O-Mat</tag>
+    <tag key="digital-o-mat">Digital-O-Mat</tag>
     <tag key="savecodeshare">Save Code Share</tag>
     <tag key="sha">SHA2017</tag>
   </tags>
diff --git a/news/nl/nl-201709.en.xhtml b/news/nl/nl-201709.en.xhtml
index 96ab604986..86792b737b 100644
--- a/news/nl/nl-201709.en.xhtml
+++ b/news/nl/nl-201709.en.xhtml
@@ -100,7 +100,7 @@
     <tag key="newsletter"/>
     <tag key="reuse">Reuse.Software</tag>
     <tag key="pmpc">Public Money Public Code</tag>
-    <tag key="digitalomat">Digital-O-Mat</tag>
+    <tag key="digital-o-mat">Digital-O-Mat</tag>
     <tag key="savecodeshare">Save Code Share</tag>
     <tag key="sha">SHA2017</tag>
   </tags>
diff --git a/news/nl/nl-201709.fr.xhtml b/news/nl/nl-201709.fr.xhtml
index c4fb89d5a4..82c3638ba0 100644
--- a/news/nl/nl-201709.fr.xhtml
+++ b/news/nl/nl-201709.fr.xhtml
@@ -138,7 +138,7 @@ Erik Albers
 <tag key="newsletter"/>
 <tag key="reuse">Reuse.Software</tag>
 <tag key="pmpc">Public Money Public Code</tag>
-<tag key="digitalomat">Digital-O-Mat</tag>
+<tag key="digital-o-mat">Digital-O-Mat</tag>
 <tag key="savecodeshare">Save Code Share</tag>
 <tag key="sha">SHA2017</tag>
 </tags>
diff --git a/news/nl/nl-201709.nl.xhtml b/news/nl/nl-201709.nl.xhtml
index d16b2d0a9b..1be00f8573 100644
--- a/news/nl/nl-201709.nl.xhtml
+++ b/news/nl/nl-201709.nl.xhtml
@@ -98,7 +98,7 @@
     <tag key="newsletter"/>
     <tag key="reuse">Reuse.Software</tag>
     <tag key="pmpc">Public Money Public Code</tag>
-    <tag key="digitalomat">Digital-O-Mat</tag>
+    <tag key="digital-o-mat">Digital-O-Mat</tag>
     <tag key="savecodeshare">Save Code Share</tag>
     <tag key="sha">SHA2017</tag>
   </tags>
diff --git a/news/nl/nl-201709.sq.xhtml b/news/nl/nl-201709.sq.xhtml
index 0823bf39fc..d5cd3244bd 100644
--- a/news/nl/nl-201709.sq.xhtml
+++ b/news/nl/nl-201709.sq.xhtml
@@ -100,7 +100,7 @@
     <tag key="newsletter"/>
     <tag key="reuse">Reuse.Software</tag>
     <tag key="pmpc">Para Publike, Kod Publik</tag>
-    <tag key="digitalomat">Digital-O-Mat</tag>
+    <tag key="digital-o-mat">Digital-O-Mat</tag>
     <tag key="savecodeshare">Save Code Share</tag>
     <tag key="sha">SHA2017</tag>
   </tags>
diff --git a/news/nl/nl-201810.en.xhtml b/news/nl/nl-201810.en.xhtml
index 9b9b4b5e06..f55405095a 100644
--- a/news/nl/nl-201810.en.xhtml
+++ b/news/nl/nl-201810.en.xhtml
@@ -82,7 +82,7 @@
     <tag key="newsletter"/>
     <tag key="microsoft">Microsoft</tag>
     <tag key="patents">Software Patents</tag>
-    <tag key="digitalomat">Digital-O-Mat</tag>
+    <tag key="digital-o-mat">Digital-O-Mat</tag>
     <tag key="sfscon">SFSCon</tag>
   </tags>
   <author id="albers" />
diff --git a/news/nl/nl-201810.nl.xhtml b/news/nl/nl-201810.nl.xhtml
index 9b1e748c72..564bfbca85 100644
--- a/news/nl/nl-201810.nl.xhtml
+++ b/news/nl/nl-201810.nl.xhtml
@@ -78,7 +78,7 @@
     <tag key="newsletter"/>
     <tag key="microsoft">Microsoft</tag>
     <tag key="patents">software-octrooien</tag>
-    <tag key="digitalomat">Digital-O-Mat</tag>
+    <tag key="digital-o-mat">Digital-O-Mat</tag>
     <tag key="sfscon">SFSCon</tag>
   </tags>
   <author id="albers" />
diff --git a/news/nl/nl-201904.en.xhtml b/news/nl/nl-201904.en.xhtml
index 06d3bc4061..0a1d986f53 100644
--- a/news/nl/nl-201904.en.xhtml
+++ b/news/nl/nl-201904.en.xhtml
@@ -108,7 +108,7 @@
   <tags>
 	<tag key="front-page"/>
     <tag key="newsletter">Newsletter</tag>
-    <tag key="webathon">Web-a-thon</tag>
+    <tag key="tech-teams">Web-a-thon</tag>
     <tag key="pmpc">Public Money? Public Code!</tag>
     <tag key="coc">Code of Conduct</tag>
     <tag key="copyright">Copyright</tag>
diff --git a/news/nl/nl-201904.nl.xhtml b/news/nl/nl-201904.nl.xhtml
index eca26e8669..7f3843d595 100644
--- a/news/nl/nl-201904.nl.xhtml
+++ b/news/nl/nl-201904.nl.xhtml
@@ -110,7 +110,7 @@
       <tags>
             <tag key="front-page"/>
         <tag key="newsletter">Nieuwsbrief</tag>
-        <tag key="webathon">Web-a-thon</tag>
+        <tag key="tech-teams">Web-a-thon</tag>
         <tag key="pmpc">Publiek Geld? Publieke Code!</tag>
         <tag key="coc">Gedragscode</tag>
         <tag key="copyright">Auteursrecht</tag>
diff --git a/news/nl/nl-201905.de.xhtml b/news/nl/nl-201905.de.xhtml
index a926c86bc4..9ecb453eba 100644
--- a/news/nl/nl-201905.de.xhtml
+++ b/news/nl/nl-201905.de.xhtml
@@ -157,7 +157,7 @@ Kontakt mit den Abgeordneten Ihrer Region auf. Wir haben <a href="https://wiki.f
     <tag key="newsletter">Newsletter</tag>
     <tag key="pmpc">Public Money? Public Code!</tag>
     <tag key="elections">EU Elections</tag>
-    <tag key="europeanparliament">European Parliament</tag>
+    <tag key="european-parliament">European Parliament</tag>
   </tags>
   <author id="mancheva" />
   <author id="albers" />
diff --git a/news/nl/nl-201905.en.xhtml b/news/nl/nl-201905.en.xhtml
index 58be8deafc..b11b5ac6fa 100644
--- a/news/nl/nl-201905.en.xhtml
+++ b/news/nl/nl-201905.en.xhtml
@@ -94,7 +94,7 @@
     <tag key="newsletter">Newsletter</tag>
     <tag key="pmpc">Public Money? Public Code!</tag>
     <tag key="elections">EU Elections</tag>
-    <tag key="europeanparliament">European Parliament</tag>
+    <tag key="european-parliament">European Parliament</tag>
   </tags>
   <author id="mancheva" />
   <author id="albers" />
diff --git a/news/nl/nl-201905.es.xhtml b/news/nl/nl-201905.es.xhtml
index ec030be079..e91a77d1c2 100644
--- a/news/nl/nl-201905.es.xhtml
+++ b/news/nl/nl-201905.es.xhtml
@@ -94,7 +94,7 @@
     <tag key="newsletter">boletín</tag>
     <tag key="pmpc">¿Dinero público? ¡Código Público!</tag>
     <tag key="elections">Elecciones Europeas</tag>
-    <tag key="europeanparliament">El Parlamento Europeo</tag>
+    <tag key="european-parliament">El Parlamento Europeo</tag>
   </tags>
   <author id="mancheva" />
   <author id="albers" />
diff --git a/news/nl/nl-201905.nl.xhtml b/news/nl/nl-201905.nl.xhtml
index cb7d0e4d43..c9fd27c4b9 100644
--- a/news/nl/nl-201905.nl.xhtml
+++ b/news/nl/nl-201905.nl.xhtml
@@ -94,7 +94,7 @@
     <tag key="newsletter">nieuwsbrief</tag>
     <tag key="pmpc">Publiek Geld? Publieke Code!</tag>
     <tag key="elections">EU-verkiezingen</tag>
-    <tag key="europeanparliament">Europees Parlement</tag>
+    <tag key="european-parliament">Europees Parlement</tag>
   </tags>
   <author id="mancheva" />
   <author id="albers" />
diff --git a/news/nl/nl-202006.en.xhtml b/news/nl/nl-202006.en.xhtml
index 4930136b75..3332133de0 100644
--- a/news/nl/nl-202006.en.xhtml
+++ b/news/nl/nl-202006.en.xhtml
@@ -87,7 +87,7 @@
         <tag key="front-page"/>
 		<tag key="newsletter">Newsletter</tag>
 		<tag key="routers">Router Freedom</tag>
-		<tag key="europeanparliament">European Parliament</tag>
+		<tag key="european-parliament">European Parliament</tag>
 		<tag key="nl">Netherlands</tag>
 		<tag key="competition">Competition Law</tag>
 		<tag key="pmpc">Public Money? Public Code!</tag>
diff --git a/news/nl/nl-202006.es.xhtml b/news/nl/nl-202006.es.xhtml
index fd52d61e68..0303b0a0f1 100644
--- a/news/nl/nl-202006.es.xhtml
+++ b/news/nl/nl-202006.es.xhtml
@@ -88,7 +88,7 @@
         <tag key="front-page"/>
                 <tag key="newsletter">Boletín</tag>
                 <tag key="routers">La Libertad del Enrutador</tag>
-                <tag key="europeanparliament">Parlamento Europeo</tag>
+                <tag key="european-parliament">Parlamento Europeo</tag>
                 <tag key="nl">Holanda</tag>
                 <tag key="competition">Ley de Competencia</tag>
                 <tag key="pmpc">¿Dinero Público? - ¡Código Público!</tag>
diff --git a/news/nl/nl-202006.fr.xhtml b/news/nl/nl-202006.fr.xhtml
index 2452916887..6d74ee15dd 100644
--- a/news/nl/nl-202006.fr.xhtml
+++ b/news/nl/nl-202006.fr.xhtml
@@ -87,7 +87,7 @@
             <tag key="front-page"/>
             <tag key="newsletter">Lettre d'information</tag>
             <tag key="routers">Liberté des Routeurs</tag>
-            <tag key="europeanparliament">Parlement Européen</tag>
+            <tag key="european-parliament">Parlement Européen</tag>
             <tag key="nl">Hollande</tag>
             <tag key="competition">Loi de Concurrence</tag>
             <tag key="pmpc">Argent Public ? Code Public !</tag>
diff --git a/news/nl/nl-202006.it.xhtml b/news/nl/nl-202006.it.xhtml
index f63ae779f4..4d92c44002 100644
--- a/news/nl/nl-202006.it.xhtml
+++ b/news/nl/nl-202006.it.xhtml
@@ -87,7 +87,7 @@
         <tag key="front-page"/>
 		<tag key="newsletter">Newsletter</tag>
 		<tag key="routers">Libertà del Router</tag>
-		<tag key="europeanparliament">Parlamento Europeo</tag>
+		<tag key="european-parliament">Parlamento Europeo</tag>
 		<tag key="nl">Paesi Bassi</tag>
 		<tag key="competition">Legge sulla concorrenza</tag>
 		<tag key="pmpc">Denaro pubblico? Codice pubblico!</tag>
diff --git a/news/nl/nl-202006.nl.xhtml b/news/nl/nl-202006.nl.xhtml
index 612496c690..7404ada6ba 100644
--- a/news/nl/nl-202006.nl.xhtml
+++ b/news/nl/nl-202006.nl.xhtml
@@ -87,7 +87,7 @@
         <tag key="front-page"/>
         <tag key="newsletter">Nieuwsbrief</tag>
         <tag key="routers">Routervrijheid</tag>
-        <tag key="europeanparliament">Europees Parlement</tag>
+        <tag key="european-parliament">Europees Parlement</tag>
         <tag key="nl">Nederland</tag>
         <tag key="competition">Mededingingswet</tag>
         <tag key="pmpc">Publiek Geld? Publieke Code!</tag>
diff --git a/news/nl/nl-202008.en.xhtml b/news/nl/nl-202008.en.xhtml
index e8d7fab047..05e7b20b12 100644
--- a/news/nl/nl-202008.en.xhtml
+++ b/news/nl/nl-202008.en.xhtml
@@ -80,7 +80,7 @@
         <tag key="front-page"/>
 		<tag key="newsletter">Newsletter</tag>
 		<tag key="pmpc">Public Money? Public Code!</tag>
-		<tag key="openscience">Open Science</tag>
+		<tag key="open-science">Open Science</tag>
 		<tag key="limux">Munich</tag>
 		<tag key="copyright">Copyright</tag>
   </tags>
diff --git a/news/nl/nl-202008.es.xhtml b/news/nl/nl-202008.es.xhtml
index 88ef383107..e395d51287 100644
--- a/news/nl/nl-202008.es.xhtml
+++ b/news/nl/nl-202008.es.xhtml
@@ -143,7 +143,7 @@ deseando saber de ti!</p>
         <tag key="front-page"/>
 		<tag key="newsletter">Boletín</tag>
 		<tag key="pmpc">¿Dinero Público? ¡Código Publico!</tag>
-		<tag key="openscience">Ciencia Abierta</tag>
+		<tag key="open-science">Ciencia Abierta</tag>
 		<tag key="limux">Munich</tag>
 		<tag key="copyright">Copyright</tag>
   </tags>
diff --git a/news/nl/nl-202008.fr.xhtml b/news/nl/nl-202008.fr.xhtml
index 525cfb48c8..2250fa36e3 100644
--- a/news/nl/nl-202008.fr.xhtml
+++ b/news/nl/nl-202008.fr.xhtml
@@ -77,7 +77,7 @@
         <tag key="front-page"/>
         <tag key="newsletter">Lettre d'informations</tag>
         <tag key="pmpc">Argent Public ? Code Public !</tag>
-        <tag key="openscience">Science Ouverte</tag>
+        <tag key="open-science">Science Ouverte</tag>
         <tag key="limux">Munich</tag>
         <tag key="copyright">Droit d'Auteur</tag>
   </tags>
diff --git a/news/nl/nl-202008.it.xhtml b/news/nl/nl-202008.it.xhtml
index 1b7ee00d77..5f3448e4dd 100644
--- a/news/nl/nl-202008.it.xhtml
+++ b/news/nl/nl-202008.it.xhtml
@@ -81,7 +81,7 @@
         <tag key="front-page"/>
 		<tag key="newsletter">Newsletter</tag>
 		<tag key="pmpc">Denaro pubblico? Codice pubblico!</tag>
-		<tag key="openscience">Open Science</tag>
+		<tag key="open-science">Open Science</tag>
 		<tag key="limux">Monaco</tag>
 		<tag key="copyright">Copyright</tag>
   </tags>
diff --git a/news/nl/nl-202008.nl.xhtml b/news/nl/nl-202008.nl.xhtml
index e2f973ff59..fc63c21613 100644
--- a/news/nl/nl-202008.nl.xhtml
+++ b/news/nl/nl-202008.nl.xhtml
@@ -80,7 +80,7 @@
             <tag key="front-page"/>
             <tag key="newsletter">nieuwsbrief</tag>
             <tag key="pmpc">Publiek Geld? Publieke Code!</tag>
-            <tag key="openscience">Open Wetenschap</tag>
+            <tag key="open-science">Open Wetenschap</tag>
             <tag key="limux">München</tag>
             <tag key="copyright">auteursrecht</tag>
       </tags>