diff --git a/gestion/annuaires_pg.py b/gestion/annuaires_pg.py
index 0869e968..7c7e8762 100755
--- a/gestion/annuaires_pg.py
+++ b/gestion/annuaires_pg.py
@@ -214,7 +214,7 @@ uplink_prises={ 'a' :
  # peuvent être utiles à connaître
  401: 'uplink->batp0', 402: 'uplink->batp-1',
  403: 'uplink->batp2', 403: 'uplink->batp-3',
- 405: 'libre-service', 406: 'uplink->backbone',
+ 405: 'libre-service', 406: 'uplink->bato-1',
 },
  'o' :
  { 
@@ -230,7 +230,7 @@ uplink_prises={ 'a' :
  'A2': 'komaz-ens', 'B2': 'multiprise-wifi',
  'A3': 'sable',     'B3': 'dyson',
  'A4': 'komaz',     'B4': 'fy',
- 'A5': 'malloc-1',  'B5': 'switch-ilo',
+ 'A5': 'zbee'    ,  'B5': 'switch-ilo',
                     'B6': 'vigile 0B',
                     'B7': 'daath',
                     'B8': 'batb',
diff --git a/gestion/gen_confs/adherents.py b/gestion/gen_confs/adherents.py
index fd9eb5a2..e09a2a89 100644
--- a/gestion/gen_confs/adherents.py
+++ b/gestion/gen_confs/adherents.py
@@ -46,7 +46,7 @@ class del_user:
                     import traceback
                     traceback.print_exc()
 
-    def delete_daath(self):
+    def delete_zbee(self):
         cprint(u'Archivage fichiers utilisateur', 'gras')
         for args in self.args:
             anim('\t' + args)
@@ -54,7 +54,7 @@ class del_user:
                 login, home = args.split(',')
                 if not login or not home:
                     raise ValueError('Argument invalide')
-                if home.startswith('/home/') and hostname == "daath":
+                if home.startswith('/home/') and hostname == "zbee":
                     home = "/home-adh/" + home[6:]
                 warn = ''
                 f = '%s/files/%s_%s.tar.bz2' % ('/home-adh/cimetiere',
@@ -85,8 +85,8 @@ class del_user:
                     traceback.print_exc()
 
     def reconfigure(self):
-        if hostname == "daath":
-            self.delete_daath()
+        if hostname == "zbee":
+            self.delete_zbee()
         elif hostname == "owl":
             self.delete_directory(u"Suppression des fichiers index de dovecot",
                                   "/var/dovecot-indexes/%s")
diff --git a/gestion/gen_confs/firewall_new.py b/gestion/gen_confs/firewall_new.py
index 5a2efb06..4f54da49 100755
--- a/gestion/gen_confs/firewall_new.py
+++ b/gestion/gen_confs/firewall_new.py
@@ -1310,7 +1310,7 @@ class firewall_zamok(firewall_crans) :
 
         # Pour le nfs (le paquet à laisser passer n'a pas d'owner)
         iptables("-A SERV_OUT_ADM -d fx.adm.crans.org -j ACCEPT")
-        iptables("-A SERV_OUT_ADM -d daath.adm.crans.org -j ACCEPT")
+        iptables("-A SERV_OUT_ADM -d nfs.adm.crans.org -j ACCEPT")
 
         # Rien d'autre ne passe
         iptables("-A SERV_OUT_ADM -j REJECT --reject-with icmp-net-prohibited")
diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py
index f95bd840..b8a6aef3 100755
--- a/gestion/gen_confs/generate.py
+++ b/gestion/gen_confs/generate.py
@@ -50,7 +50,7 @@ class base_reconfigure:
         'blacklist_autodisc_upload': __blacklist_servers,
         'blacklist_autodisc_p2p': __blacklist_servers,
         'blacklist_bloq': __blacklist_servers,
-        'del_user': [ 'daath-del_user', 'owl-del_user', 'zamok-del_user' ]
+        'del_user': [ 'zbee-del_user', 'owl-del_user', 'zamok-del_user' ]
         }
     #Y R U Aliasing !
     __service_develop.update({
@@ -221,7 +221,7 @@ class zamok(base_reconfigure):
         from adherents import del_user
         self._do(del_user(args))
 
-class daath(base_reconfigure):
+class zbee(base_reconfigure):
     def home(self, args):
         from adherents import home
         self._do(home(args))