diff --git a/htdocs/banniere.php b/htdocs/banniere.php
index fe1c2a3..2096597 100644
--- a/htdocs/banniere.php
+++ b/htdocs/banniere.php
@@ -28,16 +28,8 @@
       <li><a href="contact.php">Contact</a></li>
       <li class="has-dropdown"><a href="">Langue</a>
         <ul class="dropdown">
-          <?php foreach ($registered_languages as $lang) { ?>
-          <?php
-          $current_dir= basename (getcwd ());
-          if ($current_dir == "htdocs")
-            $len= 1;
-          else
-            $len= 4;
-          $link= substr_replace ($_SERVER['REQUEST_URI'], $lang['loc'], 0, $len);
-          ?>
-          <li><a href="<?php echo $link; ?>"><?php echo $lang['name']; ?></a></li>
+          <?php foreach ($registered_languages as $code => $lang) { ?>
+          <li><a href="<?php echo url_translate ($_SERVER['REQUEST_URI'], $code); ?>"><?php echo $lang['name']; ?></a></li>
           <?php } ?>
         </ul>
       </li>
diff --git a/htdocs/en/a-propos-april-et-expolibre.php b/htdocs/en/about-april-and-libreexpo.php
similarity index 100%
rename from htdocs/en/a-propos-april-et-expolibre.php
rename to htdocs/en/about-april-and-libreexpo.php
diff --git a/htdocs/en/a-propos.php b/htdocs/en/about.php
similarity index 100%
rename from htdocs/en/a-propos.php
rename to htdocs/en/about.php
diff --git a/htdocs/en/modeles-libres.php b/htdocs/en/beyond-free-software.php
similarity index 97%
rename from htdocs/en/modeles-libres.php
rename to htdocs/en/beyond-free-software.php
index 8afc3dc..61e3e5e 100644
--- a/htdocs/en/modeles-libres.php
+++ b/htdocs/en/beyond-free-software.php
@@ -1,3 +1,4 @@
+<?php include ("../lib/i18n.php"); ?>
 <!DOCTYPE html>
 <!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
 <html class="no-js" lang="en" >
diff --git a/htdocs/en/telecharger.php b/htdocs/en/download.php
similarity index 100%
rename from htdocs/en/telecharger.php
rename to htdocs/en/download.php
diff --git a/htdocs/en/exposer.php b/htdocs/en/exhibit.php
similarity index 100%
rename from htdocs/en/exposer.php
rename to htdocs/en/exhibit.php
diff --git a/htdocs/en/exposition.php b/htdocs/en/exhibition.php
similarity index 97%
rename from htdocs/en/exposition.php
rename to htdocs/en/exhibition.php
index 5f433c7..8fef6cf 100644
--- a/htdocs/en/exposition.php
+++ b/htdocs/en/exhibition.php
@@ -1,3 +1,4 @@
+<?php include ("../lib/i18n.php"); ?>
 <!DOCTYPE html>
 <!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
 <html class="no-js" lang="en" >
diff --git a/htdocs/en/logiciel-libre-au-quotidien.php b/htdocs/en/free-libre-software-in-daily-life.php
similarity index 97%
rename from htdocs/en/logiciel-libre-au-quotidien.php
rename to htdocs/en/free-libre-software-in-daily-life.php
index 3f7c6d0..d3d3f28 100644
--- a/htdocs/en/logiciel-libre-au-quotidien.php
+++ b/htdocs/en/free-libre-software-in-daily-life.php
@@ -1,3 +1,4 @@
+<?php include ("../lib/i18n.php"); ?>
 <!DOCTYPE html>
 <!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
 <html class="no-js" lang="en" >
diff --git a/htdocs/en/logiciels-libres-pour-education.php b/htdocs/en/free-libre-software-in-education.php
similarity index 97%
rename from htdocs/en/logiciels-libres-pour-education.php
rename to htdocs/en/free-libre-software-in-education.php
index c9c5c6e..55a9aec 100644
--- a/htdocs/en/logiciels-libres-pour-education.php
+++ b/htdocs/en/free-libre-software-in-education.php
@@ -1,3 +1,4 @@
+<?php include ("../lib/i18n.php"); ?>
 <!DOCTYPE html>
 <!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
 <html class="no-js" lang="en" >
diff --git a/htdocs/en/logiciel-libre.php b/htdocs/en/free-libre-software.php
similarity index 97%
rename from htdocs/en/logiciel-libre.php
rename to htdocs/en/free-libre-software.php
index 1f6509f..2ed923d 100644
--- a/htdocs/en/logiciel-libre.php
+++ b/htdocs/en/free-libre-software.php
@@ -1,3 +1,4 @@
+<?php include ("../lib/i18n.php"); ?>
 <!DOCTYPE html>
 <!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
 <html class="no-js" lang="en" >
diff --git a/htdocs/en/licences-logiciels-libres.php b/htdocs/en/free-licenses.php
similarity index 97%
rename from htdocs/en/licences-logiciels-libres.php
rename to htdocs/en/free-licenses.php
index 56c543b..1476c6f 100644
--- a/htdocs/en/licences-logiciels-libres.php
+++ b/htdocs/en/free-licenses.php
@@ -1,3 +1,4 @@
+<?php include ("../lib/i18n.php"); ?>
 <!DOCTYPE html>
 <!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
 <html class="no-js" lang="en" >
diff --git a/htdocs/en/formats-ouverts.php b/htdocs/en/open-formats.php
similarity index 97%
rename from htdocs/en/formats-ouverts.php
rename to htdocs/en/open-formats.php
index af84d71..1b66a7f 100644
--- a/htdocs/en/formats-ouverts.php
+++ b/htdocs/en/open-formats.php
@@ -1,3 +1,4 @@
+<?php include ("../lib/i18n.php"); ?>
 <!DOCTYPE html>
 <!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
 <html class="no-js" lang="en" >
diff --git a/htdocs/en/enjeux-du-logiciel-libre.php b/htdocs/en/what-is-at-stake-with-free-software.php
similarity index 97%
rename from htdocs/en/enjeux-du-logiciel-libre.php
rename to htdocs/en/what-is-at-stake-with-free-software.php
index df5efaa..b2132b9 100644
--- a/htdocs/en/enjeux-du-logiciel-libre.php
+++ b/htdocs/en/what-is-at-stake-with-free-software.php
@@ -1,3 +1,4 @@
+<?php include ("../lib/i18n.php"); ?>
 <!DOCTYPE html>
 <!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
 <html class="no-js" lang="en" >
