diff --git a/generators/bind/bind.rb b/generators/bind/bind.rb
index 2c2a218b3b7f6763104efbad4e591ae386e2f61a..d310389e1167952e598c370591fce0c4f04a130e 100644
--- a/generators/bind/bind.rb
+++ b/generators/bind/bind.rb
@@ -38,15 +38,15 @@ global_hash["sites"].each { |site_uid, site_hash|
 
     cluster_hash.fetch('nodes').each_sort_by_node_uid { |node_uid, node_hash|
 
-      network_interfaces = {}
-      node_hash.fetch('network_interfaces').each { |net_uid, net_hash|
-        network_interfaces[net_uid] = {"ip"=>net_hash["ip"], "mounted"=>net_hash["mounted"]}
+      network_adapters = {}
+      node_hash.fetch('network_adapters').each { |net_uid, net_hash|
+        network_adapters[net_uid] = {"ip"=>net_hash["ip"], "mounted"=>net_hash["mounted"]}
       }
       node_hash.fetch('kavlan').each { |net_uid, ip|
-        network_interfaces[net_uid] = {"ip"=>ip, "mounted"=>nil}
+        network_adapters[net_uid] = {"ip"=>ip, "mounted"=>nil}
       } if node_hash['kavlan']
 
-      network_interfaces.each { |net_uid, net_hash|
+      network_adapters.each { |net_uid, net_hash|
 
         entries[cluster_uid] = {}          unless entries[cluster_uid]
         entries[cluster_uid][net_uid] = [] unless entries[cluster_uid][net_uid]
diff --git a/generators/dhcp/dhcp.rb b/generators/dhcp/dhcp.rb
index 6478df793e4190d3e4a053d2abac1630e7e99ca8..90ab5deb36b04a8af9a5377dc4d83fac0392d010 100644
--- a/generators/dhcp/dhcp.rb
+++ b/generators/dhcp/dhcp.rb
@@ -10,22 +10,22 @@ global_hash = load_yaml_file_hierarchy("../../input/grid5000/")
 
 # Get the mac and ip of a node. Throw exception if error.
 def get_network_info(node_hash, network_interface)
-  # Get node_hash["network_interfaces"][network_interface]["ip"] and node_hash["network_interfaces"][network_interface]["mac"]
-  node_network_interfaces = node_hash.fetch("network_interfaces")
+  # Get node_hash["network_adapters"][network_interface]["ip"] and node_hash["network_adapters"][network_interface]["mac"]
+  node_network_adapters = node_hash.fetch("network_adapters")
   
   # For the production network, find the mounted interface (either eth0 or eth1)
   neti = network_interface
   if neti == "eth" then
-    if node_network_interfaces.fetch("eth0").fetch("mounted")
+    if node_network_adapters.fetch("eth0").fetch("mounted")
       neti = "eth0"
-    elsif node_network_interfaces.fetch("eth1").fetch("mounted")
+    elsif node_network_adapters.fetch("eth1").fetch("mounted")
       neti = "eth1"
     else
       raise 'neither eth0 nor eth1 have the property "mounted" set to "true"'
       end
   end
   
-  node_network_interface = node_network_interfaces.fetch(neti)
+  node_network_interface = node_network_adapters.fetch(neti)
   
   raise '"mac" is nil' unless node_mac = node_network_interface.fetch("mac")
   raise '"ip" is nil'  unless node_ip  = node_network_interface.fetch("ip")
@@ -35,7 +35,7 @@ end
 
 def write_dhcp_file(data)
   if data["nodes"].nil?
-    puts "Error in #{__method__}: no entry for \"#{data['filename']}\" at #{data['site_uid']} (#{data['network_interfaces']})."
+    puts "Error in #{__method__}: no entry for \"#{data['filename']}\" at #{data['site_uid']} (#{data['network_adapters']})."
     return "" 
   end
 
@@ -61,7 +61,7 @@ global_hash["sites"].each { |site_uid, site_hash|
                       "filename"            => "cluster-" + cluster_uid + ".conf",
                       "site_uid"            => site_uid,
                       "nodes"               => cluster_hash.fetch('nodes'),
-                      "network_interfaces"  => ["eth", "bmc"],
+                      "network_adapters"  => ["eth", "bmc"],
                     })
   }
   
@@ -71,7 +71,7 @@ global_hash["sites"].each { |site_uid, site_hash|
                       "filename"            => key + ".conf",
                       "site_uid"            => site_uid,
                       "nodes"               => site_hash['nodes'],
-                      "network_interfaces"  => ["eth"],
+                      "network_adapters"  => ["eth"],
                     })
   }
 
diff --git a/generators/dhcp/templates/dhcp.erb b/generators/dhcp/templates/dhcp.erb
index 1a44ab011795c1a00ae803b612f307ac2dba2ce3..57ee4daf858be67e3cb71626a22b69f9e5a85020 100644
--- a/generators/dhcp/templates/dhcp.erb
+++ b/generators/dhcp/templates/dhcp.erb
@@ -5,7 +5,7 @@
 <%
   site_uid = data.fetch('site_uid')
 
-  data.fetch('network_interfaces').each { |network_interface|
+  data.fetch('network_adapters').each { |network_interface|
 %>
 group {
 <%
diff --git a/generators/oar-properties/lib/lib-oar-properties.rb b/generators/oar-properties/lib/lib-oar-properties.rb
index f28da140222514b8f9c4f26cf6ad1bd7d243a68d..23bfb355ebe784a695bbce75d1e95cff3a93530c 100755
--- a/generators/oar-properties/lib/lib-oar-properties.rb
+++ b/generators/oar-properties/lib/lib-oar-properties.rb
@@ -24,8 +24,8 @@ def get_node_properties(cluster_uid, cluster, node_uid, node)
     return h if node.size == 1 # for dead nodes, additional information is most likely missing from the ref-repository.
   end
 
-  main_network_adapter = node['network_interfaces'].values.find{ |na| na['enabled'] && na['mounted'] && na['interface'] =~ /ethernet/i && !na['management'] }
-  main_network_adapter = node['network_interfaces'].values.find{ |na| na['enabled'] && na['mounted'] }
+  main_network_adapter = node['network_adapters'].values.find{ |na| na['enabled'] && na['mounted'] && na['interface'] =~ /ethernet/i && !na['management'] }
+  main_network_adapter = node['network_adapters'].values.find{ |na| na['enabled'] && na['mounted'] }
   raise MissingProperty, "Node #{node_uid} does not have a main network_adapter" unless main_network_adapter
 
   #  h['host']            = main_network_adapter['network_address']
@@ -45,32 +45,32 @@ def get_node_properties(cluster_uid, cluster, node_uid, node)
   h['cputype']         = [node['processor']['model'], node['processor']['version']].join(' ')
   h['cpufreq']         = node['processor']['clock_speed']/1_000_000_000.0
   h['disktype']        = (node['block_devices'].first[1] || {})['interface']
-  h['ethnb']           = node['network_interfaces'].values.select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mounted'] == true || nb['mountable'] == true}.length
+  h['ethnb']           = node['network_adapters'].values.select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mounted'] == true || nb['mountable'] == true}.length
 
-  eth10g               = node['network_interfaces'].values.select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mounted'] == true || nb['mountable'] == true}
+  eth10g               = node['network_adapters'].values.select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mounted'] == true || nb['mountable'] == true}
   h['eth10g']          = eth10g.detect{|na| na['rate'] == 10_000_000_000}.nil? ? false : true
 
-  ib10g                = node['network_interfaces'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 10_000_000_000}
+  ib10g                = node['network_adapters'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 10_000_000_000}
   h['ib10g']           = ib10g ? true : false
   h['ib10gmodel']      = ib10g ? ib10g['version'] : 'none'
 
-  ib20g                = node['network_interfaces'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 20_000_000_000}
+  ib20g                = node['network_adapters'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 20_000_000_000}
   h['ib20g']           = ib20g ? true : false
   h['ib20gmodel']      = ib20g ? ib20g['version'] : 'none'
 
-  ib40g                = node['network_interfaces'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 40_000_000_000}
+  ib40g                = node['network_adapters'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 40_000_000_000}
   h['ib40g']           = ib40g ? true : false
   h['ib40gmodel']      = ib40g ? ib40g['version'] : 'none'
 
-  ib56g                = node['network_interfaces'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 56_000_000_000}
+  ib56g                = node['network_adapters'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 56_000_000_000}
   h['ib56g']           = ib56g ? true : false
   h['ib56gmodel']      = ib56g ? ib56g['version'] : 'none'
 
-  myri10g              = node['network_interfaces'].values.detect{|na| na['interface'] =~ /myri/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 10_000_000_000}
+  myri10g              = node['network_adapters'].values.detect{|na| na['interface'] =~ /myri/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 10_000_000_000}
   h['myri10g']         = myri10g ? true : false
   h['myri10gmodel']    = myri10g ? myri10g['version'] : 'none'
 
-  myri2g               = node['network_interfaces'].values.detect{|na| na['interface'] =~ /myri/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 2_000_000_000}
+  myri2g               = node['network_adapters'].values.detect{|na| na['interface'] =~ /myri/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 2_000_000_000}
   h['myri2g']          = myri2g ? true : false
   h['myri2gmodel']     = myri2g ? myri2g['version'] : 'none'
 
diff --git a/generators/reference-api/reference-api.rb b/generators/reference-api/reference-api.rb
index bf4221a2d40cde40b2b5967abe4232f3b67404de..6d967c115409aac3ded4b4a1d7729c963e8a9725 100755
--- a/generators/reference-api/reference-api.rb
+++ b/generators/reference-api/reference-api.rb
@@ -110,14 +110,6 @@ global_hash["sites"].each do |site_uid, site|
       node["monitoring"] = {}   unless node.key?("monitoring")
       node["monitoring"]["wattmeter"] = false unless node["monitoring"].key?("wattmeter")
 
-      # Rename keys
-      node["storage_devices"] = node.delete("block_devices")
-      node["network_adapters"] = node.delete("network_interfaces")
-      if node.key?("chassis")
-        node["chassis"]["name"]   = node["chassis"].delete("product_name")
-        node["chassis"]["serial"] = node["chassis"].delete("serial_number")
-      end
-
       # Delete keys
       node["storage_devices"].keys.each { |key| 
         node["storage_devices"][key].delete("timeread")  if node["storage_devices"][key].key?("timeread")
diff --git a/input/example/sites/rouen/clusters/pomme/nodes/pomme-1.yml b/input/example/sites/rouen/clusters/pomme/nodes/pomme-1.yml
index a78dfa53d3c405b7427398109f8eb3d70b52fdf5..16d63a294ddd4157581aabd4e87b2f7ddbaf6d5c 100644
--- a/input/example/sites/rouen/clusters/pomme/nodes/pomme-1.yml
+++ b/input/example/sites/rouen/clusters/pomme/nodes/pomme-1.yml
@@ -4,7 +4,7 @@ pomme-1:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:9e:13
diff --git a/input/example/sites/rouen/clusters/pomme/nodes/pomme-2.yml b/input/example/sites/rouen/clusters/pomme/nodes/pomme-2.yml
index 369263b53e9cb15b64e3b1c30514f184d5d1daa4..0e03f2a62c596e1dbfb159c482db950e7058028f 100644
--- a/input/example/sites/rouen/clusters/pomme/nodes/pomme-2.yml
+++ b/input/example/sites/rouen/clusters/pomme/nodes/pomme-2.yml
@@ -4,7 +4,7 @@ pomme-2:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:9e:13
diff --git a/input/example/sites/rouen/clusters/pomme/pomme.yml b/input/example/sites/rouen/clusters/pomme/pomme.yml
index f58ab7511bd6a72c75230dde47232495745c4bb5..f215ee93b7bac3c5fe429e6456748b68f1cac3ae 100644
--- a/input/example/sites/rouen/clusters/pomme/pomme.yml
+++ b/input/example/sites/rouen/clusters/pomme/pomme.yml
@@ -25,7 +25,7 @@ nodes:
         interface: SCSI
         driver: mptspi
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         device: eth0
         rate: 1000000000
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml b/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml
index a343bf4aa6ab8fa10aa0d85c134b27c66c205e13..a3ab60e289d9c8e12e393d0a26f924916191916f 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml
@@ -22,12 +22,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/adonis_manual.yaml b/input/grid5000/sites/grenoble/clusters/adonis/adonis_manual.yaml
index 07467757313c94b2440afbeb06f839f2a7910da7..1a404c5aa2be181b6ea0ee5ba930390eb0748b42 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/adonis_manual.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/adonis_manual.yaml
@@ -1,7 +1,7 @@
 ---
 nodes:
   adonis-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:11'
@@ -15,7 +15,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:12'
@@ -29,7 +29,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:13'
@@ -43,7 +43,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:14'
@@ -57,7 +57,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:15'
@@ -71,7 +71,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:16'
@@ -85,7 +85,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:17'
@@ -99,7 +99,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:18'
@@ -113,7 +113,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:19'
@@ -127,7 +127,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:20'
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
index b22f85082a522768e996fec357dd865c79441baa..2e9bb7475ec9c00654ce864b66783b4e31bb6ca9 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
@@ -4,7 +4,7 @@ adonis-1:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -15,7 +15,7 @@ adonis-1:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:55
@@ -51,9 +51,9 @@ adonis-1:
       mac: 00:30:48:cc:b0:58
       ip: 172.17.18.1
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
index 9c0f15b19312640dcad780b4d9af4154cd52c0c2..8e2a39c7f45e41fd8d488185fd6f44ac18470e92 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
@@ -8,7 +8,7 @@ adonis-10:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:69
@@ -43,7 +43,7 @@ adonis-10:
     bmc:
       mac: 00:30:48:cc:ad:df
       ip: 172.17.18.10
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -51,9 +51,9 @@ adonis-10:
       rev: 3.0
       vendor: Western Digital
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
index ab57a0c3479125d77611a270339cbfd717eb5096..33f307240364bbc3877c323e1a4e4062ed7bfd22 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
@@ -4,7 +4,7 @@ adonis-2:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -15,7 +15,7 @@ adonis-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:59
@@ -53,9 +53,9 @@ adonis-2:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
index ca69d9528d78c7bd6e0c66a38c5536980e39dee1..5bb4e2ca3e1c7821011d8f3c77524d30a9e92040 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
@@ -4,7 +4,7 @@ adonis-3:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:49
@@ -39,7 +39,7 @@ adonis-3:
     bmc:
       mac: 00:30:48:cc:b5:f6
       ip: 172.17.18.3
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -53,9 +53,9 @@ adonis-3:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
index 998a4451069e31d6dd6c8747600d114e94839325..9950bb7733a46bb5e5f6f11f261e0f6450cecc74 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
@@ -4,7 +4,7 @@ adonis-4:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -15,7 +15,7 @@ adonis-4:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:45
@@ -53,9 +53,9 @@ adonis-4:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
index b37b0396320e3d26eb5ed98d22d3450218de015b..152f032efcc4e9dbadde7c49bf97cf8a11e0aa36 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
@@ -4,7 +4,7 @@ adonis-5:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:14:65
@@ -39,7 +39,7 @@ adonis-5:
     bmc:
       mac: 00:30:48:cc:af:61
       ip: 172.17.18.5
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -51,9 +51,9 @@ adonis-5:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
index bb566cfc55bcb33dd646c7a65c7b74072f5ed188..59d9b450f9ff864b73f623764d7b9e27161aa5af 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
@@ -4,7 +4,7 @@ adonis-6:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:42:65
@@ -43,7 +43,7 @@ adonis-6:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -51,9 +51,9 @@ adonis-6:
       rev: 3.0
       vendor: Western Digital
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
index d71f5d4f14c4061eb76baa08203b31cbf84f4f3c..a4b0ec442d889c4c11e818bcd66e201f6b23e0db 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
@@ -4,14 +4,14 @@ adonis-7:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064
       rev: 3.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:41
@@ -51,9 +51,9 @@ adonis-7:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
index c40ac280c10f4bbc9144a657be573720e8041231..0053a5b7eceba55a86fcb0782249c7dbeb145e9b 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
@@ -8,14 +8,14 @@ adonis-8:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064
       rev: 3.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:51
@@ -51,9 +51,9 @@ adonis-8:
       mac: 00:30:48:cc:b6:6d
       ip: 172.17.18.8
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
index bb4da83ad475d5e16e44ec7cff870ec2a67183ae..058c46ce73c02c64ee7ffeb86f0fbffd1ab075bd 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
@@ -4,7 +4,7 @@ adonis-9:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:25:90:ff:ff:2f:f1:49
@@ -43,7 +43,7 @@ adonis-9:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -51,9 +51,9 @@ adonis-9:
       rev: 3.0
       vendor: Western Digital
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/edel.yaml b/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
index 8ddbaca62a12932cd67a7d21244a99f8759f30e9..ebcd0a63956b1da74cc6fcba93374c24b5aed98e 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
@@ -22,12 +22,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
         storage: SSD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/grenoble/clusters/edel/edel_manual.yaml b/input/grid5000/sites/grenoble/clusters/edel/edel_manual.yaml
index 3bf3093cd79d733e868aa86b1507dc1f004ef051..363696791a48ccbad5bc5968d5468843e5484a88 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/edel_manual.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/edel_manual.yaml
@@ -1,362 +1,362 @@
 ---
 nodes:
   edel-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/5
   edel-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/6
   edel-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/7
   edel-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/8
   edel-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/9
   edel-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/10
   edel-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/11
   edel-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/12
   edel-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/13
   edel-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/14
   edel-11:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/15
   edel-12:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/16
   edel-13:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/17
   edel-14:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/18
   edel-15:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/19
   edel-16:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/20
   edel-17:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/21
   edel-18:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-1
         switch_port: Gi1/0/22
   edel-19:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/5
   edel-20:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/6
   edel-21:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/7
   edel-22:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/8
   edel-23:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/9
   edel-24:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/10
   edel-25:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/11
   edel-26:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/12
   edel-27:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/13
   edel-28:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/14
   edel-29:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/15
   edel-30:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/16
   edel-31:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/17
   edel-32:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/18
   edel-33:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/19
   edel-34:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/20
   edel-35:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/21
   edel-36:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-2
         switch_port: Gi1/0/22
   edel-37:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/5
   edel-38:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/6
   edel-39:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/7
   edel-40:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/8
   edel-41:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/9
   edel-42:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/10
   edel-43:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/11
   edel-44:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/12
   edel-45:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/13
   edel-46:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/14
   edel-47:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/15
   edel-48:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/16
   edel-49:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/17
   edel-50:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/18
   edel-51:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/19
   edel-52:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/20
   edel-53:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/21
   edel-54:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-3
         switch_port: Gi1/0/22
   edel-55:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/5
   edel-56:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/6
   edel-57:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/7
   edel-58:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/8
   edel-59:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/9
   edel-60:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/10
   edel-61:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/11
   edel-62:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/12
   edel-63:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/13
   edel-64:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/14
   edel-65:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/15
   edel-66:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/16
   edel-67:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/17
   edel-68:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/18
   edel-69:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/19
   edel-70:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/20
   edel-71:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/21
   edel-72:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sw-edel-4
         switch_port: Gi1/0/22
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
index c31d29eea8921c3a44014d54e4c05732914e8303..a6b7ae3ab4114c32b759c52b4ea2a466ae24d262 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
@@ -4,7 +4,7 @@ edel-1:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:9e
@@ -49,7 +49,7 @@ edel-1:
     bmc:
       mac: 08:00:38:36:af:df
       ip: 172.17.17.1
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-1:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
index 67764ac755b1c4d21f66930fb44b64c9a862db9a..d19bc9c4f33204c53f80b43c59fcb7fe910433c5 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
@@ -4,13 +4,13 @@ edel-10:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:5f
@@ -56,9 +56,9 @@ edel-10:
       mac: 08:00:38:35:a3:ca
       ip: 172.17.17.10
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
index 684957724a2342eec883ef1c91b1bbb2d02e6939..eba2dd5356378c29a70878a8325af1d9bb82eafb 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
@@ -4,13 +4,13 @@ edel-11:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:59
@@ -56,9 +56,9 @@ edel-11:
       mac: 08:00:38:35:a3:c8
       ip: 172.17.17.11
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
index c2737afdcf39c23b047ecc583299683a16d2128e..051b8c83f96a0eb39551885f8cbf70f16ff65000 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
@@ -4,13 +4,13 @@ edel-12:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:5b
@@ -58,9 +58,9 @@ edel-12:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
index d5bc0a49d8ed971de5c79a78fd0270f7adc817ea..3366a937b563a9113e9da5a40a962f8406979bfb 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
@@ -4,7 +4,7 @@ edel-13:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:cb
@@ -49,7 +49,7 @@ edel-13:
     bmc:
       mac: 08:00:38:35:a3:ee
       ip: 172.17.17.13
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
@@ -58,9 +58,9 @@ edel-13:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
index 4f656d6d6fe023953a6be13f0f98b0fe9491041f..415e3c13fd584c20af4b9e541b42d1614b5746d3 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
@@ -4,7 +4,7 @@ edel-14:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:83
@@ -49,7 +49,7 @@ edel-14:
     bmc:
       mac: 08:00:38:35:a3:d6
       ip: 172.17.17.14
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
@@ -58,9 +58,9 @@ edel-14:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
index 82765c6c42f63f190d5e99df34a5b7e52833823e..762eb05a2c7d99a1548bb785ab9ed1e8f83e297f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
@@ -4,7 +4,7 @@ edel-15:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:fb
@@ -49,16 +49,16 @@ edel-15:
     bmc:
       mac: 08:00:38:35:a3:fe
       ip: 172.17.17.15
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
index e93c4440cf2ca067b86bb6682406f574763a971c..5f239c79b75091ea0a17c8cd96dd633635d6439a 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
@@ -8,7 +8,7 @@ edel-16:
       model: Virtual Floppy
       device: sdb
       rev: 1.0
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -18,7 +18,7 @@ edel-16:
       model: Virtual Floppy
       device: sdb
       rev: 1.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:c3
@@ -66,9 +66,9 @@ edel-16:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
index 2ab7a64bb9c661adbe194de03721d3f71f6372ab..2be5579edb176605bc8abfa80ac13221f9c560ad 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
@@ -4,13 +4,13 @@ edel-17:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C300-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 7.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6e
@@ -58,9 +58,9 @@ edel-17:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
index 9120bacc009a2d97e71bc92f59837dff66b3f800..7d8665749f1b60bf4daa46ac5c9ac36b962ec480 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
@@ -4,7 +4,7 @@ edel-18:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:44
@@ -49,16 +49,16 @@ edel-18:
     bmc:
       mac: 08:00:38:35:a3:c1
       ip: 172.17.17.18
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
index 14a3394c92167b9a1d0d6b2fdfa4c64d2d4d138c..3369d5eb2ea70648f1e451fdcb3e15b5b3e5de14 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
@@ -4,7 +4,7 @@ edel-19:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:b9
@@ -49,7 +49,7 @@ edel-19:
     bmc:
       mac: 08:00:38:35:a3:e8
       ip: 172.17.17.19
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-19:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
index 042684e6bb967504e5fea9351b44867f0a81a4a6..95e5bb2f2cbba7443e90e237540366712c34840c 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
@@ -4,7 +4,7 @@ edel-2:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:62:7d
@@ -49,7 +49,7 @@ edel-2:
     bmc:
       mac: 08:00:38:36:b0:d4
       ip: 172.17.17.2
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
@@ -58,9 +58,9 @@ edel-2:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
index 5c03119bf2f07392fee0c80314630d445bd8704a..7d6ab7de17754a16bb1de00273b54b63c8523ca7 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
@@ -4,7 +4,7 @@ edel-20:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:35
@@ -49,16 +49,16 @@ edel-20:
     bmc:
       mac: 08:00:38:35:a3:bc
       ip: 172.17.17.20
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
index a9ee6958bf2aadc2ebfff6a2a33130c39720146b..57b7c2024f2fcd0e81579e61bfb0a48900701153 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
@@ -4,7 +4,7 @@ edel-21:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:70
@@ -49,7 +49,7 @@ edel-21:
     bmc:
       mac: 08:00:38:35:a4:25
       ip: 172.17.17.21
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-21:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
index 0bf17971c59890a0315eca44d2cbdb3fa427db61..d9c725e41b9549934e8768f75d2b1441aca986a0 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
@@ -4,13 +4,13 @@ edel-22:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6b
@@ -58,9 +58,9 @@ edel-22:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
index 068bac267f7d681367489ad365c20cd5e0914ec7..d8dce4067368a6e92453c40964d888a95c68a88a 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
@@ -4,7 +4,7 @@ edel-23:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c2
@@ -49,16 +49,16 @@ edel-23:
     bmc:
       mac: 08:00:38:35:a3:eb
       ip: 172.17.17.23
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
index f90f2e27e7427be63289b21057bf2fbb6a4e982a..cf67847074b5c1c286aabf1848546b011f713ce5 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
@@ -4,13 +4,13 @@ edel-24:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:3a
@@ -58,9 +58,9 @@ edel-24:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
index 78f64d838fdf85911dc936a5bf6fb789314ac178..92f53849983f21942893c2d9931dafdf7def13c5 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
@@ -4,13 +4,13 @@ edel-25:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:15
@@ -58,9 +58,9 @@ edel-25:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
index 98bd6347bea235800f299efd7a1c88e021a50d80..4389e17746da06097192e2326682ceb923ae0f4f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
@@ -4,13 +4,13 @@ edel-26:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ff
@@ -56,9 +56,9 @@ edel-26:
       mac: 08:00:38:35:a3:aa
       ip: 172.17.17.26
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
index 233130e7b480c6005fe9e7976fe21f100d49c92d..da1022a0c76b4ee98486376a9f33798c6da83ca1 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
@@ -4,7 +4,7 @@ edel-27:
     release_date: 12/20/2010
     vendor: INSYDE
     version: Thurley.3.59.48.0028_BUILD_NCB_N0017
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:5e
@@ -49,7 +49,7 @@ edel-27:
     bmc:
       mac: 08:00:38:35:a4:1f
       ip: 172.17.17.27
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-27:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
index d79281b60e9f9768da6173e43ffe70310fd15897..ba7353d98b45319dcc2496a0b84f70eaa483a033 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
@@ -4,13 +4,13 @@ edel-28:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:6d
@@ -58,9 +58,9 @@ edel-28:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
index 458b7370ea9a9b1e6836978934a0759f12bd4908..ebea7897505ca24680bc894f4a70b9e8c3fdcfef 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
@@ -4,13 +4,13 @@ edel-29:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9e
@@ -56,9 +56,9 @@ edel-29:
       mac: 08:00:38:35:a3:df
       ip: 172.17.17.29
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
index 14ecfc8fd185399ee3814a44645a96d822d5c577..23f9ce905476161365880670b2ec6d14b135e76e 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
@@ -4,7 +4,7 @@ edel-3:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:53
@@ -49,7 +49,7 @@ edel-3:
     bmc:
       mac: 08:00:38:35:a3:c6
       ip: 172.17.17.3
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
@@ -58,9 +58,9 @@ edel-3:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
index ff902385fe42b3b16800eb810a71cb366a438ab3..2463e9900bdc453558d6b02c66b0f065a79e0d40 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
@@ -4,13 +4,13 @@ edel-30:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:98
@@ -58,9 +58,9 @@ edel-30:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
index a13069b67ad6684629c79efed011482d8ce67b47..597254eff76d9055f63b79666de26c9eb4e2a664 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
@@ -4,13 +4,13 @@ edel-31:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ce:de
@@ -56,9 +56,9 @@ edel-31:
       mac: 08:00:38:35:a5:9f
       ip: 172.17.17.31
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
index b898fddbfbfb3350c49dd293380821ff5e8f7cf1..84c8b4cec1c68698fef9164b9a63ee82be44e186 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
@@ -4,13 +4,13 @@ edel-32:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ea
@@ -56,9 +56,9 @@ edel-32:
       mac: 08:00:38:35:a3:a3
       ip: 172.17.17.32
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
index 89df03bd4475533af403f9113bdddccd541d8b6b..01f8b8452bfe027e70023652c8e210bcbefe9c09 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
@@ -4,7 +4,7 @@ edel-33:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid:  20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:73
@@ -49,7 +49,7 @@ edel-33:
     bmc:
       mac: 08:00:38:35:a4:26
       ip: 172.17.17.33
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
@@ -58,9 +58,9 @@ edel-33:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
index 3fcbfc1f68e50b6c7b59f20a31eaadf6c98f5b02..93a970dc76dcc24cb31503e1f978320c7bcb8dfa 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
@@ -4,13 +4,13 @@ edel-34:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C300-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 7.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:74
@@ -58,9 +58,9 @@ edel-34:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
index ae7c86e23de33421b979301993bb1e5478a93a32..898904298371283cf60453601b6ea50db2d2f653 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
@@ -4,13 +4,13 @@ edel-35:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:14
@@ -58,9 +58,9 @@ edel-35:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
index 22e3e6ef39499859ce7d02276a9f0986996ac107..2aba1938bbf78a11fc9aceead8d9cc86a8eee0f9 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
@@ -4,13 +4,13 @@ edel-36:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:da
@@ -56,9 +56,9 @@ edel-36:
       mac: 08:00:38:35:a3:f3
       ip: 172.17.17.3
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
index 89f992c87f7b6415ccd35c5e6481354c95d42236..8e421fbd08e2a6a6f9d1ec0cfd2efca34ded3dd3 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
@@ -4,13 +4,13 @@ edel-37:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:8a
@@ -56,9 +56,9 @@ edel-37:
       mac: 08:00:38:36:af:83
       ip: 172.17.17.37
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
index f2ceb8bc23a01b3e727a3da16b30ea69573d9e3f..7077ca885eedb0e14e2df0a71ee996091336b105 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
@@ -4,7 +4,7 @@ edel-38:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bc
@@ -49,16 +49,16 @@ edel-38:
     bmc:
       mac: 08:00:38:35:a3:e9
       ip: 172.17.17.38
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
index 2ad3ba76846d49f3d1b6dd0ce997d3869e8f45e2..1432e88d16e1ea57a5b5c569f335cc5ad8f84be4 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
@@ -4,13 +4,13 @@ edel-39:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:40
@@ -56,9 +56,9 @@ edel-39:
       mac: 08:00:38:35:a4:15
       ip: 172.17.17.39
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
index aaf85617517c873450a5e2a7c5cb57883219a390..fb72531a02d875c53d8dbcfc8f76c03cb60d108f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
@@ -4,13 +4,13 @@ edel-4:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:2d:73
@@ -56,9 +56,9 @@ edel-4:
       mac: 08:00:38:36:9f:26
       ip: 172.17.17.4
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
index 12a0204483de9c18f9d50f80633450a988fae02c..a116c95b06b8acad1769a3852e89300450f1e236 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
@@ -4,7 +4,7 @@ edel-40:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:7d
@@ -49,16 +49,16 @@ edel-40:
     bmc:
       mac: 08:00:38:35:a3:d4
       ip: 172.17.17.40
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
index 3c75fd7f7ed1cf7145a35c86a27292b83fb5b846..31dc4aed1ee758fb68ffa365726c9a2e1e1ed9bb 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
@@ -4,7 +4,7 @@ edel-41:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:62:77
@@ -49,7 +49,7 @@ edel-41:
     bmc:
       mac: 08:00:38:36:b0:d2
       ip: 172.17.17.41
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-41:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
index 65e257d2567038ede1ce09754cf1a99a75d9eaf2..f42c30a6eadc8de505c56c39efaab43558524899 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
@@ -4,7 +4,7 @@ edel-42:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:29:c5
@@ -49,7 +49,7 @@ edel-42:
     bmc:
       mac: 08:00:38:36:9d:ec
       ip: 172.17.17.42
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-42:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
index 88c831064113e0ea21aca7a4d8c4248ba9ab4fcf..889a82e716eed6777426f8eb0ff6ca0c277b1731 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
@@ -4,7 +4,7 @@ edel-43:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bf
@@ -49,7 +49,7 @@ edel-43:
     bmc:
       mac: 08:00:38:35:a3:ea
       ip: 172.17.17.43
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-43:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
index 65aeabb95c1339dbd5532dbe3a35b882bf3d3271..bd79d111405b4a68eee55e6e38e16310fe2a2fa8 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
@@ -4,13 +4,13 @@ edel-44:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:80
@@ -58,9 +58,9 @@ edel-44:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
index a9f5b753260b41559e1f24bb41053ec15b8925f5..c93bde8485987101bfe47ebe6eba5ae0dbe27e17 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
@@ -4,7 +4,7 @@ edel-45:
     release_date: 12/20/2010
     vendor: INSYDE
     version: Thurley.3.59.48.0028_BUILD_NCB_N0017
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:34
@@ -49,7 +49,7 @@ edel-45:
     bmc:
       mac: 08:00:38:35:a4:11
       ip: 172.17.17.45
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-45:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
index a6882bd01bbff74b44c58c2f84ef2c9b853b93ce..43ecf87669071f4bdb37160dc544cc7968d50a74 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
@@ -4,13 +4,13 @@ edel-46:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:f0
@@ -56,9 +56,9 @@ edel-46:
       mac: 08:00:38:35:a3:a5
       ip: 172.17.17.46
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
index 56d4e1d204152ba37dae16796ba51229a307793b..d8e9d6bf799882f992b7ad9d028b0d28958c550f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
@@ -4,13 +4,13 @@ edel-47:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9b
@@ -56,9 +56,9 @@ edel-47:
       mac: 08:00:38:35:a3:de
       ip: 172.17.17.47
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
index 424a43ae19a061bbfd407d5b64ad6e4f652a40bf..b28e66e9d3ff7543d76edacd3ed67b8f5ca359d3 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
@@ -4,13 +4,13 @@ edel-48:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:29
@@ -58,9 +58,9 @@ edel-48:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
index 4308aa89e313aed35820308e5c4e081add3da499..05eba1da064e6fc51c542d067cc7bd74f0c5938e 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
@@ -4,7 +4,7 @@ edel-49:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:92
@@ -49,16 +49,16 @@ edel-49:
     bmc:
       mac: 08:00:38:35:a3:db
       ip: 172.17.17.49
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
index 3754291dbf73da20f7803fb79d77ca7d7e580042..0d865495ebff1f167d4af918b0028216fd2c3a74 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
@@ -4,7 +4,7 @@ edel-5:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8
@@ -49,7 +49,7 @@ edel-5:
     bmc:
       mac: 08:00:38:36:af:9d
       ip: 172.17.17.5
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-5:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
index d76d23c3bf2a1dfd74721306fdfd96b094b32097..ccadfa4dcedd514490d0124474fc804c0bd5d8ee 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
@@ -4,13 +4,13 @@ edel-50:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:19
@@ -58,9 +58,9 @@ edel-50:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
index 51c92f9357345282c00ea2a5921400923355399c..c75b167007f1d04dcc8bca448380e20329807fb6 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
@@ -4,13 +4,13 @@ edel-51:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:61
@@ -56,9 +56,9 @@ edel-51:
       mac: 08:00:38:35:a4:20
       ip: 172.17.17.51
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
index f1bcd343a14ef4a4c50290169bae9ea3be02a96b..10577f4f41ed8ceb4dd033594b8b3cf5132420d1 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
@@ -4,13 +4,13 @@ edel-52:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:28
@@ -56,9 +56,9 @@ edel-52:
       mac: 08:00:38:35:a4:0d
       ip: 172.17.17.52
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
index 6890f3f67c83ceb1b47b6104106b65e6c11ec466..eeb6f39bc07086765ada05578f1580042c3cc485 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
@@ -4,7 +4,7 @@ edel-53:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:4f
@@ -49,16 +49,16 @@ edel-53:
     bmc:
       mac: 08:00:38:35:a4:1a
       ip: 172.17.17.53
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
index 791951b9631402f30bd99d0f8e10d82f08c688ec..42eaa43afa04867f469fc57472eda563524b6d91 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
@@ -4,7 +4,7 @@ edel-54:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8
@@ -49,7 +49,7 @@ edel-54:
     bmc:
       mac: 08:00:38:35:a4:1d
       ip: 172.17.17.54
-  block_devices:
+  storage_devices:
     sda:
       model: C200-MTFDBAA060M
       device: sda
@@ -58,9 +58,9 @@ edel-54:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
index 91110cce26cb92d8023c24ed2983c97618dc024f..ba0aba08a5bf8cc62a75f8f9d632de451df4fefe 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
@@ -4,7 +4,7 @@ edel-55:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:dd
@@ -49,16 +49,16 @@ edel-55:
     bmc:
       mac: 08:00:38:35:a3:f4
       ip: 172.17.17.55
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
index 2d05ffeb83215d450bb2e58e1571c8f780916432..5e2da0f3014bbb94450cc5ac36b285d3e11ecbde 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
@@ -4,7 +4,7 @@ edel-56:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:01
@@ -49,7 +49,7 @@ edel-56:
     bmc:
       mac: 08:00:38:35:a4:00
       ip: 172.17.17.56
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-56:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
index 26d50895c116e61661de48c43b1b36ec6fb223dc..581817d107c14aaa89ac8de3abb21a0f1773121d 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
@@ -4,7 +4,7 @@ edel-57:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:86
@@ -49,7 +49,7 @@ edel-57:
     bmc:
       mac: 08:00:38:35:a3:d7
       ip: 172.17.17.57
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-57:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
index 0703d10b1147776e05bb55728b7384c9aca65436..7dc4b3002519eaf2fb503c6836e2897a67c6e7a8 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
@@ -4,13 +4,13 @@ edel-58:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:0d
@@ -58,9 +58,9 @@ edel-58:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
index d6929f251443bfb52b5c05e1fe2e2ab1865b702a..e77e2ddd97922dd1599776d244473f85a4c8aa83 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
@@ -4,7 +4,7 @@ edel-59:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:08
@@ -49,16 +49,16 @@ edel-59:
     bmc:
       mac: 08:00:38:35:a3:ad
       ip: 172.17.17.59
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
index c12201090ebde397ff195ffaf1963214aed6a16c..92936cab75fb119ee2ebb6dda71bfd8d066d7457 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
@@ -4,7 +4,7 @@ edel-6:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:54:8e
@@ -49,7 +49,7 @@ edel-6:
     bmc:
       mac: 08:00:38:36:ac:2f
       ip: 172.17.17.6
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-6:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
index b9c22d043b5729a77131ed01ac8c1bea048c40c6..079004877b0da6796f07c497819b77f84b709e05 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
@@ -4,13 +4,13 @@ edel-60:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:37
@@ -58,9 +58,9 @@ edel-60:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
index 1e16968bbb1b363f5cb8a7ef58cf3703635a7be1..97ca5ebe64f9814fda87d54f8a2c11641640bd3b 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
@@ -4,7 +4,7 @@ edel-61:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:0b
@@ -49,16 +49,16 @@ edel-61:
     bmc:
       mac: 08:00:38:35:a3:ae
       ip: 172.17.17.61
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
index a1bcad13c5b338915da93f8960eee6d8597ce925..193f7fd9b18f6ee04a865572d698f6aef41ecb1c 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
@@ -4,7 +4,7 @@ edel-62:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c8
@@ -49,16 +49,16 @@ edel-62:
     bmc:
       mac: 08:00:38:35:a3:ed
       ip: 172.17.17.62
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
index 075e3aa60f592e635a66a9c8038b72c83e0720d6..53fc643162b1960a064e9f41ec06195d1e8cb61c 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
@@ -4,7 +4,7 @@ edel-63:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:8c
@@ -49,7 +49,7 @@ edel-63:
     bmc:
       mac: 08:00:38:35:a3:d9
       ip: 172.17.17.63
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-63:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
index ffb22f12e16d9f3259635c116dbe047ba1681c07..9fc31b99d417d116859e1f199985ef5117e44e8c 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
@@ -4,7 +4,7 @@ edel-64:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
@@ -14,7 +14,7 @@ edel-64:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:cc:9e
@@ -60,9 +60,9 @@ edel-64:
       mac: 08:00:38:35:a4:df
       ip: 172.17.17.64
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
index c6646bcb3da429462913c5b090dce4ac4f4291eb..48d4460b3e87e2b2495cd91dd9e7a5255e933556 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
@@ -4,7 +4,7 @@ edel-65:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:d7
@@ -49,7 +49,7 @@ edel-65:
     bmc:
       mac: 08:00:38:35:a3:f2
       ip: 172.17.17.65
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-65:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
index 6e886906270c382ff4a2567a2276f47af09b216e..5b3f03bbae75d71826a86fdcf540172c60d3c685 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
@@ -4,7 +4,7 @@ edel-66:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:1f
@@ -49,7 +49,7 @@ edel-66:
     bmc:
       mac: 08:00:38:35:a4:0a
       ip: 172.17.17.66
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-66:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
index 42dc5a7cf4dafb1abef1b89448816a8711ccf225..ec5f5a8d9fabb85b56f17dea975f7bfa75112f8c 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
@@ -4,13 +4,13 @@ edel-67:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:f8
@@ -58,9 +58,9 @@ edel-67:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
index a7ce9a814fe71dedf8f10c97c611f6b1db264510..82a6aea54756934d117bf4b78fab98f64e4a8e50 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
@@ -4,7 +4,7 @@ edel-68:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:89
@@ -49,16 +49,16 @@ edel-68:
     bmc:
       mac: 08:00:38:35:a3:d8
       ip: 172.17.17.68
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
index cfa237a3064dc70df88fe72f68e5ebe0e31efaa5..9bb204a9f9f75dc58a6ac8980f1d8e85e434da8a 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
@@ -4,13 +4,13 @@ edel-69:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9d
@@ -58,9 +58,9 @@ edel-69:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
index 9ebac144e1d59f859255d56ee64b046a01980b71..0c4eb8e4df971c451598ed49ee1065e4144b861d 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
@@ -4,13 +4,13 @@ edel-7:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA064M
       device: sda
       size: 64023257088
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:e1
@@ -56,9 +56,9 @@ edel-7:
       mac: 08:00:38:35:a3:a0
       ip: 172.17.17.7
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
index ca2c00e25c05bba038398a2ed7765c516ea2876d..0585d33ba10c1ceb712fbbb70cc69a725620d52f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
@@ -4,13 +4,13 @@ edel-70:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9a
@@ -56,9 +56,9 @@ edel-70:
       mac: 08:00:38:35:a4:33
       ip: 172.17.17.70
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
index 935fcb62f674028887adf3dc45d8c6693be010e1..3ca8e8b376810c31f65e4dc47706b78149bfb4c0 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
@@ -4,7 +4,7 @@ edel-71:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:1a
@@ -49,7 +49,7 @@ edel-71:
     bmc:
       mac: 08:00:38:35:a3:b3
       ip: 172.17.17.71
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-71:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
index 60dc5c0241c8265044bc7fd8cfbef71ac8a5356e..dd4902019780d16825904e907011f115beb64263 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
@@ -4,13 +4,13 @@ edel-72:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:cb
@@ -58,9 +58,9 @@ edel-72:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
index 4b55c6bf5f6964c05ea26f8db3e1840e018e6ca3..b5ee86f21166f63d78757fc4572a8e93355f0dd0 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
@@ -4,13 +4,13 @@ edel-8:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
       size: 128035676160
       rev: 40.0
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:02
@@ -56,9 +56,9 @@ edel-8:
       mac: 08:00:38:35:a3:ab
       ip: 172.17.17.8
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
index fb0a14ce3bb42ce1c8fd29e93dd42aaa5bc74475..6eb1759a5968fdcf9c63e24e4a484e4464cd2222 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
@@ -4,7 +4,7 @@ edel-9:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c5
@@ -49,7 +49,7 @@ edel-9:
     bmc:
       mac: 08:00:38:35:a3:ec
       ip: 172.17.17.9
-  block_devices:
+  storage_devices:
     sda:
       model: C400-MTFDDAA128M
       device: sda
@@ -58,9 +58,9 @@ edel-9:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "123456789"
+    serial: "123456789"
     manufacturer: INSYDE
-    product_name: Thurley
+    name: Thurley
   main_memory:
     ram_size: 25769803776
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml b/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
index 1566b37221eda4d496978dfb1efc9eb9db94dc35..cd0bba42e5b1b3f90302da8b460a6d5484712740 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
@@ -22,12 +22,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ata_piix
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         rate: 1.0e+9
         bridged: false
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/genepi_manual.yaml b/input/grid5000/sites/grenoble/clusters/genepi/genepi_manual.yaml
index 6d45fbdd4c78430ae9f5886869cd8f00f813e37a..c6478a7c15f40613cf13973cab4d6f978e54aa87 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/genepi_manual.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/genepi_manual.yaml
@@ -1,171 +1,171 @@
 ---
 nodes:
   genepi-1:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:22'
   genepi-2:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:42'
   genepi-3:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:21'
   genepi-4:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:40'
   genepi-5:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:19'
   genepi-6:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
   genepi-7:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:20'
   genepi-8:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:39'
   genepi-9:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:18'
   genepi-10:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:37'
   genepi-11:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:9'
   genepi-12:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:38'
   genepi-13:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:17'
   genepi-14:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:29'
   genepi-15:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:7'
   genepi-16:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:25'
   genepi-17:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:6'
   genepi-18:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:27'
   genepi-19:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:16'
   genepi-20:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:31'
   genepi-21:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:10'
   genepi-22:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:32'
   genepi-23:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:14'
   genepi-24:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:30'
   genepi-25:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:15'
   genepi-26:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:8'
   genepi-27:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:4'
   genepi-28:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:33'
   genepi-29:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:3'
   genepi-30:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:28'
   genepi-31:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:13'
   genepi-32:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:34'
   genepi-33:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '4:5'
   genepi-34:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-grenoble
         switch_port: '3:26'
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
index ae8757a655081e6a191c357977e8ca5b00d1c34a..1ae3d8332486284bc4b351d511c772f4bdf9a0ad 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
@@ -4,7 +4,7 @@ genepi-1:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -15,7 +15,7 @@ genepi-1:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:b9
@@ -81,6 +81,6 @@ genepi-1:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00183
+    serial: XAN-SM5P-00183
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
index d263f4be9654114bc280277a1ba6b35e30a90a64..9a8da9005e7d828d5d7f7cbeac73f1a21f57b039 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
@@ -4,14 +4,14 @@ genepi-10:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a5
@@ -81,6 +81,6 @@ genepi-10:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00187
+    serial: XAN-SM5S-00187
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
index 05908588ba6b3d32d7a6b427a79193634ec04812..6405db66c312176c870086c25066a8c67c61af11 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
@@ -4,14 +4,14 @@ genepi-11:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:54:31
@@ -81,6 +81,6 @@ genepi-11:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00188
+    serial: XAN-SM5P-00188
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
index eaea7e044b0ca4cf121c2e79e7325298925670ba..939a20b856e46db062b0fd2e2d1996341da48358 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
@@ -4,14 +4,14 @@ genepi-12:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a1
@@ -81,6 +81,6 @@ genepi-12:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00188
+    serial: XAN-SM5S-00188
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
index 44afa1abe573a18bbbcf0f9d73845048a419c77d..c091de3fc8fb8cf4556b08a6ba93d8c8c0b9f1a3 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
@@ -8,7 +8,7 @@ genepi-13:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c9
@@ -54,7 +54,7 @@ genepi-13:
     bmc:
       mac: 00:30:48:96:d4:9a
       ip: 172.17.16.13
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-13:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00189
+    serial: XAN-SM5P-00189
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
index 005f2e43767987f7e1cf8a1b5ccf7c9d81b3abd3..5a8d508903f128024244af7d1ec1bc4eafefb939 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
@@ -4,7 +4,7 @@ genepi-14:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -15,7 +15,7 @@ genepi-14:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:cd
@@ -81,6 +81,6 @@ genepi-14:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00189
+    serial: XAN-SM5S-00189
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
index bf65b2aa60d290e4f6a37d15767ee751b8d30fbc..7c76d08acf274934888fc738fe3dd895873e1470 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
@@ -4,7 +4,7 @@ genepi-15:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d9
@@ -50,7 +50,7 @@ genepi-15:
     bmc:
       mac: 00:30:48:96:d3:2f
       ip: 172.17.16.15
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-15:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00190
+    serial: XAN-SM5P-00190
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
index 3ddc0b0c5abd4ec58ed3077ce960f2391c774194..917ed4ae499d78bfafef32571e639a40d474a8e6 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
@@ -4,7 +4,7 @@ genepi-16:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e9
@@ -54,7 +54,7 @@ genepi-16:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-16:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00190
+    serial: XAN-SM5S-00190
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
index 4867cd48f566790e81f9859cba42eab25775fdbf..dd34517a51c329096d5c65f9d0cf75010b635dec 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
@@ -8,7 +8,7 @@ genepi-17:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e1
@@ -54,7 +54,7 @@ genepi-17:
     bmc:
       mac: 00:30:48:96:d2:42
       ip: 172.17.16.17
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-17:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00191
+    serial: XAN-SM5P-00191
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
index 5cdd424f7140d3fa03ed0d116a37a22650d83210..7510788a88187760a0bd59b23a263a5a3a8b85af 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
@@ -4,14 +4,14 @@ genepi-18:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d5
@@ -81,6 +81,6 @@ genepi-18:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00119
+    serial: XAN-SM5S-00119
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
index 6beaecc8bbb0730b52e4c16536d52a1ccf16cc60..9598d0b62457caded8678907fa2533ff112d36d3 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
@@ -4,14 +4,14 @@ genepi-19:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5d
@@ -81,6 +81,6 @@ genepi-19:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00192
+    serial: XAN-SM5P-00192
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
index 58561acf572030582fe4acdffe0ec8001954e75e..98a3dccfb32d76f9bd9b6c371075aa26a28d3247 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
@@ -4,7 +4,7 @@ genepi-2:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:d5
@@ -50,7 +50,7 @@ genepi-2:
     bmc:
       mac: 00:30:48:96:d1:e2
       ip: 172.17.16.2
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-2:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00183
+    serial: XAN-SM5S-00183
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
index 57581d4876b57bb7108fc24aaa78d8a285054631..c6301ad7ef5c6aab12e352b06274b9dd6df66fea 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
@@ -8,7 +8,7 @@ genepi-20:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e5
@@ -54,7 +54,7 @@ genepi-20:
     bmc:
       mac: 00:30:48:96:d3:bf
       ip: 172.17.16.20
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-20:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00192
+    serial: XAN-SM5S-00192
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
index 9429d93e017c3ebb4c4c7dc558682efe3407009c..54dcd12b9f22f349d3adac6a6016f605a27dca61 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
@@ -4,14 +4,14 @@ genepi-21:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d1
@@ -81,6 +81,6 @@ genepi-21:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00193
+    serial: XAN-SM5P-00193
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
index 6dd5c1fc452aae52f30d6e4c7f718bec5fc3df83..8e6b02b8ca51ca43fc20f62b486939643a237c6b 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
@@ -8,7 +8,7 @@ genepi-22:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c1
@@ -54,7 +54,7 @@ genepi-22:
     bmc:
       mac: 00:30:48:96:d2:fd
       ip: 172.17.16.22
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-22:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00193
+    serial: XAN-SM5S-00193
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
index bc168fd8338f9da728772e5d6626ad1ac77dcdfa..af5ce034f287c2531a77bd1f92e76200069a2208 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
@@ -4,7 +4,7 @@ genepi-23:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -15,7 +15,7 @@ genepi-23:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:31
@@ -81,6 +81,6 @@ genepi-23:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00194
+    serial: XAN-SM5P-00194
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
index c3757794f6cd4669d560c6f6085ac40749a9fd3a..7bf4b4120b3858fc34ac6280b38c2279c09e24b3 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
@@ -4,7 +4,7 @@ genepi-24:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:01
@@ -50,7 +50,7 @@ genepi-24:
     bmc:
       mac: 00:30:48:96:d6:ff
       ip: 172.17.16.24
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-24:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00194
+    serial: XAN-SM5S-00194
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
index 1eada5a6f2f8c987e1a904363d6764b561d1b172..e6554cdd388a0711924cb5fb47c1716a3c180a6d 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
@@ -8,14 +8,14 @@ genepi-25:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:01
@@ -81,6 +81,6 @@ genepi-25:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00195
+    serial: XAN-SM5P-00195
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
index b7b414df84c2df02f38e70984cee0147def025fe..ab5036c219c9338cc610ee15fda1ee1766ff4023 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
@@ -4,14 +4,14 @@ genepi-26:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:fd
@@ -81,6 +81,6 @@ genepi-26:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00195
+    serial: XAN-SM5S-00195
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
index 49a06ea291c18fd56b18f354b907168b338b6be6..e5022b3cac811d4fedee7fed50ff7de86c0e3b85 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
@@ -4,7 +4,7 @@ genepi-27:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -15,7 +15,7 @@ genepi-27:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:31
@@ -81,6 +81,6 @@ genepi-27:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00196
+    serial: XAN-SM5P-00196
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
index 151080110315494eb9a1fe1b30f5263c79e84536..f768a7dd639447a15968fc9eac51938824a5f70a 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
@@ -4,7 +4,7 @@ genepi-28:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:59
@@ -54,7 +54,7 @@ genepi-28:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-28:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00196
+    serial: XAN-SM5S-00196
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
index 8a2fe1316f8b7516919dcf32ae37f848965dba3c..9013cb701c8b16ff569c76bd5f060cbeecaa2aba 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
@@ -4,7 +4,7 @@ genepi-29:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:b5
@@ -54,7 +54,7 @@ genepi-29:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-29:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00197
+    serial: XAN-SM5P-00197
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
index 2c13edcffeded7c5d39ee17fb4601471fcda2886..bc604feb47487c13ce0d128bb2bd21ab5cc9e7bc 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
@@ -4,7 +4,7 @@ genepi-3:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a9
@@ -50,7 +50,7 @@ genepi-3:
     bmc:
       mac: 00:30:48:96:d3:44
       ip: 172.17.16.3
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-3:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00184
+    serial: XAN-SM5P-00184
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
index b7a24aa95b1ae731e534258673b29461a0ab5a30..d87794f3b03a8bad8e1d05185e1805b9ccdfb280 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
@@ -4,7 +4,7 @@ genepi-30:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:61
@@ -54,7 +54,7 @@ genepi-30:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-30:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00197
+    serial: XAN-SM5S-00197
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
index 400b34389dd34a2dbceacc37af4fab4910bf74f2..6960b9fc59b61e56ed1778ca16ee5fad94f6b638 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
@@ -4,7 +4,7 @@ genepi-31:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:65
@@ -50,7 +50,7 @@ genepi-31:
     bmc:
       mac:
       ip: 172.17.16.31
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-31:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00198
+    serial: XAN-SM5P-00198
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
index 855c39bf85c285da87216cadfa8d2b93588a95f0..bc59b797b0c596486e6ca9c27385e43a7bd905e6 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
@@ -4,7 +4,7 @@ genepi-32:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ed
@@ -54,7 +54,7 @@ genepi-32:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-32:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00198
+    serial: XAN-SM5S-00198
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
index eb41e724ebef60d62d7c98a69b72ae22b0ecabab..74ef4261c345e33d981d4814aa28cf3c6cd80a79 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
@@ -4,7 +4,7 @@ genepi-33:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:05
@@ -50,7 +50,7 @@ genepi-33:
     bmc:
       mac: 00:30:48:96:d2:dc
       ip: 172.17.16.33
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-33:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00199
+    serial: XAN-SM5P-00199
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
index 17202ec5a20805592dc8fae6cc2b5d826d29e04b..9a0d0e929ba6ace0059ce76581768be98b079312 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
@@ -4,14 +4,14 @@ genepi-34:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:55
@@ -81,6 +81,6 @@ genepi-34:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00199
+    serial: XAN-SM5S-00199
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
index 94d3d1ff277cb24e1b88440ba2591d36e3f435a3..28c2050c96bd64efb7c54b855e428b478296521d 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
@@ -4,7 +4,7 @@ genepi-4:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -15,7 +15,7 @@ genepi-4:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:bd
@@ -81,6 +81,6 @@ genepi-4:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00184
+    serial: XAN-SM5S-00184
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
index a687c50212528895a522a837839f019ddf8f29b0..d0fe438aa0f625ba3c69b2642aba755913234b61 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
@@ -4,7 +4,7 @@ genepi-5:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:0d
@@ -54,7 +54,7 @@ genepi-5:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-5:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00185
+    serial: XAN-SM5P-00185
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
index 624167d0253eed6f181fce3be2ca3931c0ce83d0..0bea4166af3859dd4ada51359ce770b7faaaccf7 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
@@ -4,14 +4,14 @@ genepi-6:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:2d
@@ -81,6 +81,6 @@ genepi-6:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00185
+    serial: XAN-SM5S-00185
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
index cc1ea707e2c203ce2294610c20eb13b5bc35d872..6cd18b8d587c05f9bfa3d535ae6bde8c68d33cf0 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
@@ -4,14 +4,14 @@ genepi-7:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
       size: 164696555520
       rev: 6.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:ad
@@ -81,6 +81,6 @@ genepi-7:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00186
+    serial: XAN-SM5P-00186
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
index ddcc56cf36849c9c458bf6c8931d746eabdbfc99..9680617632f1f1ddb8a5e5e49c268baa2dff42d4 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
@@ -4,7 +4,7 @@ genepi-8:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -15,7 +15,7 @@ genepi-8:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:19
@@ -81,6 +81,6 @@ genepi-8:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5S-00186
+    serial: XAN-SM5S-00186
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
index f1e25bcb1c3fd1581c522998b492c3d0a9077c5e..cc8c100714e41abc131ae8d28dfc719970a22d15 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
@@ -8,7 +8,7 @@ genepi-9:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:15
@@ -54,7 +54,7 @@ genepi-9:
     bmc:
       mac: 00:30:48:96:d4:8e
       ip: 172.17.16.9
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD1600YS-01S
       device: sda
@@ -81,6 +81,6 @@ genepi-9:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number: XAN-SM5P-00187
+    serial: XAN-SM5P-00187
     manufacturer: Bull SAS
-    product_name: Novascale Universal
+    name: Novascale Universal
diff --git a/input/grid5000/sites/lille/clusters/chimint/chimint.yaml b/input/grid5000/sites/lille/clusters/chimint/chimint.yaml
index 11bbc4c13baf1de2053c8137c6908c037bd4ec0c..905dd1a3a9341d00b965044b013c857b423cee40 100644
--- a/input/grid5000/sites/lille/clusters/chimint/chimint.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/chimint.yaml
@@ -21,13 +21,13 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: megaraid_sas
         raid: 0
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         rate: 1000000000
         bridged: true
diff --git a/input/grid5000/sites/lille/clusters/chimint/chimint_manual.yaml b/input/grid5000/sites/lille/clusters/chimint/chimint_manual.yaml
index f2fbf2b10c4ed3844a3f1c30a0431dd5b6b566e9..871b2d5b50869b8a7d5048949e2ab41e8195a514 100644
--- a/input/grid5000/sites/lille/clusters/chimint/chimint_manual.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/chimint_manual.yaml
@@ -1,83 +1,83 @@
 ---
 nodes:
   chimint-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/7
   chimint-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/9
   chimint-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/8
   chimint-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/11
   chimint-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/10
   chimint-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/12
   chimint-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/14
   chimint-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/13
   chimint-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/15
   chimint-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/16
   chimint-11:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/17
   chimint-12:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/18
   chimint-13:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/19
   chimint-14:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/20
   chimint-15:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/23
   chimint-16:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/22
   chimint-17:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/21
   chimint-18:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/24
   chimint-19:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/28
   chimint-20:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi3/27
   
\ No newline at end of file
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml
index dfbd7a2ee9cd3b485eb6f4c4c8adebb7feb0a2d3..8c9546da147f4d444bdbe41d0a3eb262d13b195d 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml
@@ -8,14 +8,14 @@ chimint-1:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
       size: 292326211584
       rev: 2.1
       vendor: DELL
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,9 +43,9 @@ chimint-1:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: DQM1Z4J
+    serial: DQM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml
index ead8a64e48f80662733505adb52637194c8df435..ef64ae8a20badf5a2179da926e524bb78bbc6c01 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml
@@ -4,7 +4,7 @@ chimint-10:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -33,7 +33,7 @@ chimint-10:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -43,9 +43,9 @@ chimint-10:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 9QM1Z4J
+    serial: 9QM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml
index b7d3c99127166749714eb6736576821d6eaacd1f..a849863488a55aa4ae92756f84ff2e35371dd2b9 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml
@@ -8,7 +8,7 @@ chimint-11:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -33,7 +33,7 @@ chimint-11:
     bmc:
       mac: 84:2b:2b:70:c9:9f
       ip: 172.17.33.111
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -43,9 +43,9 @@ chimint-11:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: BRM1Z4J
+    serial: BRM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml
index 287e24e6a93e3799db3bf43dcea79038f6d64532..10dd629dd6f9391bd94c20ac66505ed6bc436a4f 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml
@@ -4,7 +4,7 @@ chimint-12:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -29,7 +29,7 @@ chimint-12:
     bmc:
       mac: 84:2b:2b:72:d5:ec
       ip: 172.17.33.112
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -41,9 +41,9 @@ chimint-12:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: BQM1Z4J
+    serial: BQM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
index 8e69e7b5e781848b6127476a8aecb52ff934dd44..a733e2035737964b9c23cf76fee62b2effa8963e 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
@@ -4,7 +4,7 @@ chimint-13:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -29,7 +29,7 @@ chimint-13:
     bmc:
       mac: 84:2b:2b:71:f1:26
       ip: 172.17.33.113
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -41,9 +41,9 @@ chimint-13:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 9RM1Z4J
+    serial: 9RM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml
index 3e657db441bb4abffc14ef3750ca7b142f6f5348..b408d0cb733fd3153801cf5009e77a350e76da53 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml
@@ -8,14 +8,14 @@ chimint-14:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
       size: 292326211584
       rev: 2.1
       vendor: DELL
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,9 +43,9 @@ chimint-14:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: CQM1Z4J
+    serial: CQM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml
index 19677ffdab078d9b83726f54c98c10b7e8ab0d89..aab932f7294ada0aecff898e46a06f8c84f097f5 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml
@@ -4,7 +4,7 @@ chimint-15:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -15,7 +15,7 @@ chimint-15:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,9 +43,9 @@ chimint-15:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: HQM1Z4J
+    serial: HQM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml
index 161d3fe2c349059a776947a0a55cc50409a93868..a5a1d2a09b27e2e0685fd0cc082bb07e374a2e65 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml
@@ -8,7 +8,7 @@ chimint-16:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -33,7 +33,7 @@ chimint-16:
     bmc:
       mac: 84:2b:2b:72:d5:dd
       ip: 172.17.33.116
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -43,9 +43,9 @@ chimint-16:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: JQM1Z4J
+    serial: JQM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml
index 23230428910db51ba3090be18b0704e28557880d..12263e42e43f74ee40db06dd553d8880a7a9ad34 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml
@@ -4,7 +4,7 @@ chimint-17:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -29,7 +29,7 @@ chimint-17:
     bmc:
       mac: 84:2b:2b:70:f6:94
       ip: 172.17.33.117
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -43,9 +43,9 @@ chimint-17:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 8QM1Z4J
+    serial: 8QM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml
index fb61c7801cba60ad87a79fc04fdac6081931d451..5095b4c735d21cdcf76ce720ebf6708b88b6ae86 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml
@@ -8,14 +8,14 @@ chimint-18:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
       size: 292326211584
       rev: 2.1
       vendor: DELL
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ chimint-18:
       mac: 84:2b:2b:72:d7:8b
       ip: 172.17.33.118
   chassis:
-    serial_number: GQM1Z4J
+    serial: GQM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml
index a48578aad9f5e499f44fc23e0cfe613d75ab0eef..e590f4facda167f9b62164b25aa9e3f0a79b534f 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml
@@ -4,7 +4,7 @@ chimint-19:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -29,7 +29,7 @@ chimint-19:
     bmc:
       mac: 84:2b:2b:70:c6:23
       ip: 172.17.33.119
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -41,9 +41,9 @@ chimint-19:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 1RM1Z4J
+    serial: 1RM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml
index d7bb556f0990af5036cf04f891d6c7552e112233..00c31e433b7f61b75e1868cd4b84b81dd9d63c6a 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml
@@ -8,14 +8,14 @@ chimint-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
       size: 292326211584
       rev: 2.1
       vendor: DELL
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ chimint-2:
       mac: 84:2b:2b:70:4f:4e
       ip: 172.17.33.102
   chassis:
-    serial_number: 8RM1Z4J
+    serial: 8RM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml
index 67e1716765291377cc1d8e7939cc5176134fbbaf..0de86dfecf06dd421c0639d5dee210fac04a8ab6 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml
@@ -8,7 +8,7 @@ chimint-20:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -33,7 +33,7 @@ chimint-20:
     bmc:
       mac: 84:2b:2b:70:c3:d7
       ip: 172.17.33.120
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -43,9 +43,9 @@ chimint-20:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 7RM1Z4J
+    serial: 7RM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml
index 2bbbf840679976faa3e203dcae31ca240bc38038..62c6de1621b6425efc3ec43beedae26abf33f59d 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml
@@ -4,7 +4,7 @@ chimint-3:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -29,7 +29,7 @@ chimint-3:
     bmc:
       mac: 84:2b:2b:70:4e:20
       ip: 172.17.33.103
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -41,9 +41,9 @@ chimint-3:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 2RM1Z4J
+    serial: 2RM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml
index f4ca39e239cac776e57eb2530a281184600f351e..f156077a9b16f64ee03187e8019059e98e89612c 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml
@@ -4,7 +4,7 @@ chimint-4:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -29,7 +29,7 @@ chimint-4:
     bmc:
       mac: 84:2b:2b:48:31:45
       ip: 172.17.33.104
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -41,9 +41,9 @@ chimint-4:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 3RM1Z4J
+    serial: 3RM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml
index 74dd8a88e1ddce1c7b1ffe60fe5c1e0f407e9cfd..eb93e8b17772d162bf874f077b9ffd4a265d52bb 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml
@@ -4,7 +4,7 @@ chimint-5:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -15,7 +15,7 @@ chimint-5:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ chimint-5:
       mac: 84:2b:2b:70:cc:94
       ip: 172.17.33.105
   chassis:
-    serial_number: 6RM1Z4J
+    serial: 6RM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml
index 05461acbdc774f420d8e4ffe1e3e8ba3e2b00b31..7de3a9a90168a719ccf34b464f887c0bcaabb60a 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml
@@ -4,14 +4,14 @@ chimint-6:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
       size: 292326211584
       rev: 2.1
       vendor: DELL
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,9 +43,9 @@ chimint-6:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: FQM1Z4J
+    serial: FQM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml
index d2bbc974f2eaedf6cb8d1abe0157a01a513e7e10..14b26d6600cf2174c5c4a0712cadc00c5b53aa25 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml
@@ -4,7 +4,7 @@ chimint-7:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -33,7 +33,7 @@ chimint-7:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -41,9 +41,9 @@ chimint-7:
       rev: 2.1
       vendor: DELL
   chassis:
-    serial_number: 5RM1Z4J
+    serial: 5RM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml
index 76f6ddf6d1b82abfe8a076ac84921cccbc5863d0..749fac463f65f46d09134ee17cfbc73b269cf4c4 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml
@@ -8,14 +8,14 @@ chimint-8:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
       size: 292326211584
       rev: 2.1
       vendor: DELL
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ chimint-8:
       mac: 84:2b:2b:72:da:c5
       ip: 172.17.33.108
   chassis:
-    serial_number: CRM1Z4J
+    serial: CRM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml
index 366090d08dd5e8aac2f2ae726bb79fb84b5effef..bce7a913f93caa50316d8bd046e6d9a8afd7f32b 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml
@@ -4,7 +4,7 @@ chimint-9:
     version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -29,7 +29,7 @@ chimint-9:
     bmc:
       mac: 84:2b:2b:72:cb:e5
       ip: 172.17.33.109
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H700
       device: sda
@@ -41,9 +41,9 @@ chimint-9:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 4RM1Z4J
+    serial: 4RM1Z4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml b/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
index 731999b6a3746c8d0fa3c4750359db541e637d86..75b411a1ed861e509320b9e5e9cb1f7622dd2956 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
@@ -20,12 +20,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:    
         interface: SATA II
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: false
         vendor: Intel
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/chinqchint_manual.yaml b/input/grid5000/sites/lille/clusters/chinqchint/chinqchint_manual.yaml
index 3851dd7b907d7669ed5e2f740eff7a7de82c8eda..bce0a7e9a1d5a56d8013266c30fbeb5d7db1d88f 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/chinqchint_manual.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/chinqchint_manual.yaml
@@ -1,187 +1,187 @@
 ---
 nodes:
   chinqchint-1:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/1
   chinqchint-2:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/2
   chinqchint-3:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/3
   chinqchint-4:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/4
   chinqchint-5:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/5
   chinqchint-6:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/6
   chinqchint-7:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/7
   chinqchint-8:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/8
   chinqchint-9:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/9
   chinqchint-10:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/10
   chinqchint-11:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/11
   chinqchint-12:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/12
   chinqchint-13:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi4/26
   chinqchint-14:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi4/29
   chinqchint-15:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/15
   chinqchint-16:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/16
   chinqchint-17:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/17
   chinqchint-18:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/18
   chinqchint-19:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/19
   chinqchint-20:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/20
   chinqchint-21:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/21
   chinqchint-22:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/22
   chinqchint-23:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/23
   chinqchint-24:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/24
   chinqchint-25:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/25
   chinqchint-26:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/26
   chinqchint-27:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/27
   chinqchint-28:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/28
   chinqchint-29:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/29
   chinqchint-30:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/30
   chinqchint-31:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/31
   chinqchint-32:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/32
   chinqchint-33:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/33
   chinqchint-34:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi4/30
   chinqchint-35:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi4/31
   chinqchint-36:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi4/28
   chinqchint-37:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/37
   chinqchint-38:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/38
   chinqchint-39:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/39
   chinqchint-40:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi2/40
   chinqchint-41:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi3/1
   chinqchint-42:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi3/2
   chinqchint-43:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi3/3
   chinqchint-44:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi3/4
   chinqchint-45:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi3/5
   chinqchint-46:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi3/41
   
\ No newline at end of file
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
index 0d1b5f65209399ff8c5f277a4fde242b130d3e97..219b3d0230f0ba5d0efefb8a33d6620589744817 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
@@ -4,7 +4,7 @@ chinqchint-1:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-1:
     bmc:
       mac: 00:30:48:96:07:e5
       ip: 172.17.34.101
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-1:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004740
+    serial: X0004740
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
index 605f3cf2bbbb6123ad6e697bcb05b154929979c0..9f6db864ebee7ac38ca9b71911e86375c9e1e9ff 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
@@ -4,7 +4,7 @@ chinqchint-10:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,7 +44,7 @@ chinqchint-10:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-10:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004760
+    serial: X0004760
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
index cf283de20c02479ab5315e9e06459e22be128320..596c7bc8908358d6f455b6aa94eed81cfc7495ab 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
@@ -4,7 +4,7 @@ chinqchint-11:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -14,7 +14,7 @@ chinqchint-11:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-11:
       mac:
       ip: 172.17.34.111
   chassis:
-    serial_number: X0004758
+    serial: X0004758
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
index de41fb81722c6aac86e49c4ad97df3b0f075ce1a..7759b1b4ba3799ea8ed495225dacaa50c9cd477e 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
@@ -4,7 +4,7 @@ chinqchint-12:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -14,7 +14,7 @@ chinqchint-12:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -53,9 +53,9 @@ chinqchint-12:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004758
+    serial: X0004758
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
index f4f28780dcb394d959291fb801ee70f48711edca..c503d3144268af166edf43ceca237c14aea64b7f 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
@@ -8,13 +8,13 @@ chinqchint-13:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -53,9 +53,9 @@ chinqchint-13:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004757
+    serial: X0004757
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
index 5aa5f60aacbe3a516263fe8c8e9391e94780074c..e0bb5f2d8ea9e18810e4dd91fcf52a4833917d45 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
@@ -8,13 +8,13 @@ chinqchint-14:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -53,9 +53,9 @@ chinqchint-14:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004757
+    serial: X0004757
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
index 0b3eb223fa69db2b365be8d4a828fbddf28fd02e..e6f2455583d59264cd216aa7b362d91a1c31e723 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
@@ -4,7 +4,7 @@ chinqchint-15:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -14,7 +14,7 @@ chinqchint-15:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-15:
       mac: 00:30:48:96:25:b9
       ip: 172.17.34.115
   chassis:
-    serial_number: X0004741
+    serial: X0004741
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
index 1d236db420ace18561d8bc834dbe402669b9dda8..3dc9414239fce0f1ddac086151d4cc4f55175a5c 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
@@ -4,7 +4,7 @@ chinqchint-16:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,7 +44,7 @@ chinqchint-16:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-16:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004741
+    serial: X0004741
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
index 127250c55f3158c3f4d1180a6d5676156b982a7e..5e636a31d7ddd981e6bcfe4ce65112c7fd264aa3 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
@@ -4,7 +4,7 @@ chinqchint-17:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-17:
     bmc:
       mac: 00:30:48:96:26:5a
       ip: 172.17.34.117
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-17:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004746
+    serial: X0004746
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
index cb6bd00cd685b3c247785a03df140e78b0416928..5e9e25c257b452730dd5926bffd6bdba190ebf0a 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
@@ -4,7 +4,7 @@ chinqchint-18:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-18:
     bmc:
       mac: 00:30:48:96:25:76
       ip: 172.17.34.118
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-18:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004746
+    serial: X0004746
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
index 4fd193bfeeb3dbbb42cd9079be584e599dd1543a..1516266c4e5d013d7141f4ff7d164dc1f5d6c85a 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
@@ -4,7 +4,7 @@ chinqchint-19:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -14,7 +14,7 @@ chinqchint-19:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-19:
       mac: 00:30:48:96:25:de
       ip: 172.17.34.119
   chassis:
-    serial_number: X0004748
+    serial: X0004748
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
index 488531b88a78697597983fc4adcf0d8749455fc7..b37a3cd3401b90a63edfd1fa6b16d5fdb5e7b6f9 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
@@ -8,13 +8,13 @@ chinqchint-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-2:
       mac: 00:30:48:96:25:67
       ip: 172.17.34.102
   chassis:
-    serial_number: X0004740
+    serial: X0004740
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
index 17a79d0bbaca4085e649b28344c974a3f4b71b92..3b605a9461f89ecf08c4f5e05d6144fb8c643653 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
@@ -4,7 +4,7 @@ chinqchint-20:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-20:
     bmc:
       mac: 00:30:48:96:25:c7
       ip: 172.17.34.120
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-20:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004748
+    serial: X0004748
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
index 59346970a118a21741c6db8013a946a13643c8b6..a722d1a59aa32f5dc56535a2541139e76f1a7b8c 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
@@ -8,7 +8,7 @@ chinqchint-21:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,16 +44,16 @@ chinqchint-21:
     bmc:
       mac: 00:30:48:94:4a:34
       ip: 172.17.34.121
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
   chassis:
-    serial_number: X1------
+    serial: X1------
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
index 33536bdbc77a03a9ef5ee53c872dd7d9e39dd0c8..bab0789a73125c3dc1f18f7512720a4efc0bd502 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
@@ -4,7 +4,7 @@ chinqchint-22:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,7 +44,7 @@ chinqchint-22:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-22:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004739
+    serial: X0004739
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
index eda1db011ca109f3394f311dfee64b00c0316447..a248722b21ef75c83b9aea5dc05e26bf6d90d1dd 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
@@ -8,7 +8,7 @@ chinqchint-23:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,7 +44,7 @@ chinqchint-23:
     bmc:
       mac: 00:30:48:94:2c:9c
       ip: 172.17.34.123
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-23:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004752
+    serial: X0004752
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
index 6191eb702eb1d2efbcbebc8c59e01c00d77c0668..bbcf68d704386134b063d3cf2228c888694619f9 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
@@ -4,7 +4,7 @@ chinqchint-24:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -14,7 +14,7 @@ chinqchint-24:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-24:
       mac: 00:30:48:94:2d:76
       ip: 172.17.34.124
   chassis:
-    serial_number: X0004752
+    serial: X0004752
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
index ab8b390dcb8f8bddfd046192718cf9c02951ff52..69242cb3eb9194f8b14d871a694f4cee0e584e3a 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
@@ -4,7 +4,7 @@ chinqchint-25:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-25:
     bmc:
       mac: 00:30:48:9b:1a:cf
       ip: 172.17.34.125
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-25:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004755
+    serial: X0004755
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
index cbbf7bdabc204c136469a2f5b7cf6ff11ce157f3..e7692b015dc2ad4dca3c31bc7469d39c5f87f5ff 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
@@ -8,7 +8,7 @@ chinqchint-26:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,16 +44,16 @@ chinqchint-26:
     bmc:
       mac: 00:30:48:96:26:54
       ip: 172.17.34.126
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
   chassis:
-    serial_number: X0004755
+    serial: X0004755
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
index 86355ffcbbabae99df58144cac5a45d80657bd4a..a843433da980623efc29ec7ecd71b2ef8bfbaf9d 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
@@ -4,7 +4,7 @@ chinqchint-27:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-27:
     bmc:
       mac: 00:30:48:96:25:63
       ip: 172.17.34.127
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -51,9 +51,9 @@ chinqchint-27:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: X0004747
+    serial: X0004747
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
index 104ecafd809303714a9de7bf49cfb9518bffd009..eea2da79bb725eb227661724095307497e50329e 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
@@ -4,7 +4,7 @@ chinqchint-28:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -14,7 +14,7 @@ chinqchint-28:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-28:
       mac: 00:30:48:96:26:b2
       ip: 172.17.34.128
   chassis:
-    serial_number: X0004747
+    serial: X0004747
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
index 8bdffee36302e91c953b86522accbb09ccc954b1..046183998bdbace7fbba938cd2473d9b8aba3476 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
@@ -4,7 +4,7 @@ chinqchint-29:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-29:
     bmc:
       mac: 00:30:48:94:37:d3
       ip: 172.17.34.129
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-29:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004753
+    serial: X0004753
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
index 4efa0ceedd633fa4952acf0c92d2dad2ef557d0b..9cc2359d46581f04d71f5328932d0783ca1fb1de 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
@@ -8,13 +8,13 @@ chinqchint-3:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-3:
       mac: 00:30:48:94:4a:7e
       ip: 172.17.34.103
   chassis:
-    serial_number: X0004742
+    serial: X0004742
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
index 79dca13aeb1a2d73a09dc7844ffe9572e32ccb98..e72f3a27cf983e7dd8606037e4f7fdb7a46b5c24 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
@@ -8,7 +8,7 @@ chinqchint-30:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,7 +44,7 @@ chinqchint-30:
     bmc:
       mac:
       ip: 172.17.34.130
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-30:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004753
+    serial: X0004753
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
index 945644c6cb510e938ddc827fa03ead64aa7e5e8a..9971a029f610d1c6f239835e4312379572f07ee9 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
@@ -4,7 +4,7 @@ chinqchint-31:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,7 +44,7 @@ chinqchint-31:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-31:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004759
+    serial: X0004759
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
index d6a5b245acd62e71171961a8a5e67aa2f9b7a223..f01065bca49a43eb56777617571878f65f495506 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
@@ -8,7 +8,7 @@ chinqchint-32:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,7 +44,7 @@ chinqchint-32:
     bmc:
       mac:
       ip: 172.17.34.132
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-32:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004759
+    serial: X0004759
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
index 04b6ccc9490642c3e8811d2f7d703d78aa92b101..88800c4424efdf7b7ec9d0b36cd575d3655d621f 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
@@ -4,7 +4,7 @@ chinqchint-33:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-33:
     bmc:
       mac:
       ip: 172.17.34.133
-  block_devices:
+  storage_devices:
     sda:
       model: ST3250620NS
       device: sda
@@ -53,9 +53,9 @@ chinqchint-33:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004754
+    serial: X0004754
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
index 9b3e967f129c1ea57b4dc19ef63ee031aab1fc1d..9d9ba02c49463cc2dd7a32c68718ed1cc0337426 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
@@ -8,13 +8,13 @@ chinqchint-34:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -53,9 +53,9 @@ chinqchint-34:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004754
+    serial: X0004754
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
index 4e922d867fbe6546e36b14b19f88a6e4d0d7a0b9..abc3a7058fee558941df47106b1d1beeed3f3548 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
@@ -4,7 +4,7 @@ chinqchint-35:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-35:
     bmc:
       mac:
       ip: 172.17.34.135
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-35:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004743
+    serial: X0004743
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
index baa2ba2dd0d6a7ff00da95025a6efa850010300a..3f941f2a0c28834ae4ed152c8b761ab087258729 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
@@ -4,7 +4,7 @@ chinqchint-36:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-36:
     bmc:
       mac:
       ip: 172.17.34.136
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-36:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004743
+    serial: X0004743
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
index fc0a5daf80f2053247914b04f191e3c50429409c..e173422e01e3f3f4c4d35e70ab4f2164f80bb4f4 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
@@ -8,7 +8,7 @@ chinqchint-37:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,7 +44,7 @@ chinqchint-37:
     bmc:
       mac:
       ip: 172.17.34.137
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-37:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004751
+    serial: X0004751
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
index ad2a7c804a3d41d9ea31c39cc67e32e9447fe16a..564a20b91da79f274dfc12f6cff618628f8fb68b 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
@@ -4,7 +4,7 @@ chinqchint-38:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,7 +44,7 @@ chinqchint-38:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-38:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004751
+    serial: X0004751
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
index 31434777d14e4acd93a201ac627f9a6ba22e9ba5..b0ee7dd7e803c65ac1acea91ee82142d1d316336 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
@@ -4,7 +4,7 @@ chinqchint-39:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,7 +44,7 @@ chinqchint-39:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -55,9 +55,9 @@ chinqchint-39:
       device: sdb
       rev: 0.01
   chassis:
-    serial_number: X0004738
+    serial: X0004738
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
index 7255935185aac50dd24584f06e9cea6f1417b247..b2cd9833acd369c0453ebaf52a782c5bfd640068 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
@@ -8,7 +8,7 @@ chinqchint-4:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,16 +44,16 @@ chinqchint-4:
     bmc:
       mac: 00:30:48:94:44:21
       ip: 172.17.34.104
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
   chassis:
-    serial_number: X0004742
+    serial: X0004742
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
index 1f968fa2f347fddda2d4c5555bdd716c4a92601c..fd4014f39865cfdaa538c9527fc58371688abee9 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
@@ -4,7 +4,7 @@ chinqchint-40:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-40:
     bmc:
       mac: 00:30:48:94:4b:4c
       ip: 172.17.34.140
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-40:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004738
+    serial: X0004738
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
index 096c8f3dacb2709b5bd8d171b93afdd0b827f85c..6cd860d48c4a80695353ad497874bf0ce0d69a47 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
@@ -4,13 +4,13 @@ chinqchint-41:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-41:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: X0004756
+    serial: X0004756
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
index 68d4880c80f1846912d0ab342ecedd6e28a5494e..b3f5e3602b8658b9b7584f7eea552215f128a677 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
@@ -4,13 +4,13 @@ chinqchint-42:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-42:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: X0004756
+    serial: X0004756
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
index 71dd3dbd61eb1a761703ce88504588f0ad7d4a44..0280da1a93f9519f15166b4f53fdd83dfb0b6af8 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
@@ -8,13 +8,13 @@ chinqchint-43:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-43:
       mac: 00:30:48:96:25:e1
       ip: 172.17.34.143
   chassis:
-    serial_number: X0004750
+    serial: X0004750
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
index abc2a6290d388b8fe4ab56907f18208415c42bfb..bf8fa46c997d8f744ba4b36532f9bac6c931e091 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
@@ -4,7 +4,7 @@ chinqchint-44:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-44:
     bmc:
       mac: 00:30:48:96:25:d1
       ip: 172.17.34.144
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-44:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004750
+    serial: X0004750
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
index 5b823e30627cad41721b5b746d52be6930652175..f0292720eccc6f1b25de88bc453898406ae13ac0 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
@@ -4,7 +4,7 @@ chinqchint-45:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,16 +44,16 @@ chinqchint-45:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
   chassis:
-    serial_number: X0004749
+    serial: X0004749
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
index 07a934598fbb7634a23e9ae7e7d45277ebf6520e..9052a160b1d851b484b1ddb3a4fab72be8c84eb6 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
@@ -4,7 +4,7 @@ chinqchint-46:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-46:
     bmc:
       mac: 00:30:48:96:08:02
       ip: 172.17.34.146
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-46:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004750
+    serial: X0004750
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
index fb55af3f2a948d878abc354dbdc903c4e09bd9b4..6f45e23dbb2426233c71dd14d945e8e3a3728959 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
@@ -4,7 +4,7 @@ chinqchint-5:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-5:
     bmc:
       mac: 00:30:48:96:25:dd
       ip: 172.17.34.105
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-5:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004745
+    serial: X0004745
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
index a95ebec9ca93bd1250a528c0fbacd44f2d283241..6ceb3af9a14bafab89f080a9c9e7a3281b259516 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
@@ -8,13 +8,13 @@ chinqchint-6:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -51,9 +51,9 @@ chinqchint-6:
       mac: 00:30:48:96:25:e0
       ip: 172.17.34.106
   chassis:
-    serial_number: X0004745
+    serial: X0004745
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
index 8a41e43abb703408d7a773ed7b16c80ebd435f20..a019bba202253f158d045c3f7582ed3a1d74dd27 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
@@ -8,7 +8,7 @@ chinqchint-7:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,16 +44,16 @@ chinqchint-7:
     bmc:
       mac: 00:30:48:96:07:fa
       ip: 172.17.34.107
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
   chassis:
-    serial_number: X0004744
+    serial: X0004744
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
index 1168ee15c50672554cac3d5be0991e7d6c3a2c3a..184b4d82a955cd99162b74239cfb896a128b8e83 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
@@ -4,7 +4,7 @@ chinqchint-8:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -40,7 +40,7 @@ chinqchint-8:
     bmc:
       mac: 00:30:48:96:07:e4
       ip: 172.17.34.108
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
@@ -53,9 +53,9 @@ chinqchint-8:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: X0004750
+    serial: X0004750
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   main_memory:
     ram_size: 8393850880
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
index e39c95c6ccd795a30e3bc484302da59f8f2b1acf..8af22e3fd66c929b68e9c0d7a0266ec5c93338ad 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
@@ -4,7 +4,7 @@ chinqchint-9:
     version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: false
       rate: 10000000000
@@ -44,16 +44,16 @@ chinqchint-9:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDT72502
       device: sda
       size: 250059350016
       rev: A7EA
   chassis:
-    serial_number: X0004760
+    serial: X0004760
     manufacturer: SGI.COM
-    product_name: AltixXE310
+    name: AltixXE310
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml b/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml
index 3e353aa7c985daa233c0ecf107821678b240386e..4f7ebfb0c1ac94802532fbbd8073184b1585846c 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml
@@ -23,13 +23,13 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: mptsas
         raid: 0
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         rate: 1000000000
         vendor: Intel
diff --git a/input/grid5000/sites/lille/clusters/chirloute/chirloute_manual.yaml b/input/grid5000/sites/lille/clusters/chirloute/chirloute_manual.yaml
index db5fe94554e60ce0d942719b81f0fa7b69ede81e..3f2964f6feabb7f10e467f8a166510658c15dc03 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/chirloute_manual.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/chirloute_manual.yaml
@@ -1,7 +1,7 @@
 ---
 nodes:
   chirloute-1:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi4/25
     gpu:
@@ -9,7 +9,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-S2050
   chirloute-2:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi3/25
     gpu:
@@ -17,7 +17,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-S2050
   chirloute-3:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi4/44
     gpu:
@@ -25,7 +25,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-S2050
   chirloute-4:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi3/26
     gpu:
@@ -33,7 +33,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-S2050
   chirloute-5:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi4/23
     gpu:
@@ -41,7 +41,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-S2050
   chirloute-6:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi3/31
     gpu:
@@ -49,7 +49,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-S2050
   chirloute-7:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi4/23
     gpu:
@@ -57,7 +57,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-S2050
   chirloute-8:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch_port: Gi3/32
     gpu:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
index 9e66a4cc684b9ee9b104ba4c9987613cce1f4e1a..3e0cb676e6d078aa2c59e1ae44aa77b5150d6083 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
@@ -4,7 +4,7 @@ chirloute-1:
     version: 1.66
     release_date: 12/23/2011
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       rate: 1000000000
@@ -33,7 +33,7 @@ chirloute-1:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST3300657SS
       device: sda
@@ -41,9 +41,9 @@ chirloute-1:
       rev: ES64
       vendor: SEAGATE
   chassis:
-    serial_number: D385Z4J
+    serial: D385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
index 92274899b71ee96a0a0fdda3fca205dc6dce3ae5..2c6b221099e598d22e81210648273bf8d49835d9 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
@@ -8,14 +8,14 @@ chirloute-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST3300657SS
       device: sda
       size: 300000000000
       rev: ES64
       vendor: SEAGATEi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       rate: 1000000000
@@ -43,9 +43,9 @@ chirloute-2:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: D385Z4J
+    serial: D385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   main_memory:
     ram_size: 8580497408
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
index b0d88a2c26fa6ab48c92d751f74509c23af4c18d..193b5154b8391702e04c84a65180010261e9227d 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
@@ -8,14 +8,14 @@ chirloute-3:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST3300657SS
       device: sda
       size: 300000000000
       rev: ES64
       vendor: SEAGATE
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       rate: 1000000000
@@ -41,9 +41,9 @@ chirloute-3:
       mac: 00:26:6c:f9:15:72
       ip: 172.17.35.103
   chassis:
-    serial_number: D385Z4J
+    serial: D385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
index 0f541adc2bc59c6246664601469c9c4b6c37ee53..2e9ce55d20c96587192b6a7d7ab14c76983573d5 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
@@ -8,14 +8,14 @@ chirloute-4:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST3300657SS
       device: sda
       size: 300000000000
       rev: ES64
       vendor: SEAGATE
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       rate: 1000000000
@@ -43,9 +43,9 @@ chirloute-4:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: D385Z4J
+    serial: D385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   main_memory:
     ram_size: 8580497408
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
index 666448c30701b52c35bac54539ab75cc4442be1f..e4ed3da60d489584635af3509d73fb468f72a9d9 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
@@ -8,14 +8,14 @@ chirloute-5:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST3300657SS
       device: sda
       size: 300000000000
       rev: ES64
       vendor: SEAGATE
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       rate: 1000000000
@@ -43,9 +43,9 @@ chirloute-5:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: F385Z4J
+    serial: F385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   main_memory:
     ram_size: 8580497408
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
index 00e8145fd90efe12ab49419f09395bba60d0f0f8..33738c9484df24fcd1b7c322491cea0e80ef12a9 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
@@ -8,14 +8,14 @@ chirloute-6:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST3300657SS
       device: sda
       size: 300000000000
       rev: ES64
       vendor: SEAGATE
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       rate: 1000000000
@@ -43,9 +43,9 @@ chirloute-6:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: F385Z4J
+    serial: F385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   main_memory:
     ram_size: 8580497408
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
index c0478910d94eb25b3a11479bbb275d25154198e1..056c2477ff116c89137e793b3a9921f3710d2748 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
@@ -4,7 +4,7 @@ chirloute-7:
     version: 1.66
     release_date: 12/23/2011
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       rate: 1000000000
@@ -33,7 +33,7 @@ chirloute-7:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST3300657SS
       device: sda
@@ -41,9 +41,9 @@ chirloute-7:
       rev: ES64
       vendor: SEAGATE
   chassis:
-    serial_number: F385Z4J
+    serial: F385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
index 4c609fdfeeee8560f6ded08db7453745a8fc19f7..3ada077e85b6f80a60bd0c58df87be6b2de23028 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
@@ -8,14 +8,14 @@ chirloute-8:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST3300657SS
       device: sda
       size: 300000000000
       rev: ES64
       vendor: SEAGATE
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       rate: 1000000000
@@ -43,9 +43,9 @@ chirloute-8:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: F385Z4J
+    serial: F385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   main_memory:
     ram_size: 8580497408
   processor:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
index aa80b00b90aa803ecb429f62a9744df9f5b0bb87..9fee34791c82767fae8e8f492d56d6ab6677b851 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
@@ -18,12 +18,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SAS
         driver: mptsas
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_manual.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_manual.yaml
index f182d76003d155a6332d72942e51acca7a3ddb2f..5db4151cf63dedcc25931c3de76e34c83c21c9cc 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_manual.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_manual.yaml
@@ -1,7 +1,7 @@
 ---
 nodes:
   granduc-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/1
       eth1:
@@ -11,7 +11,7 @@ nodes:
       bmc:
         switch_port: Gi1/1
   granduc-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/2
       eth1:
@@ -21,7 +21,7 @@ nodes:
       bmc:
         switch_port: Gi1/2
   granduc-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/3
       eth1:
@@ -31,7 +31,7 @@ nodes:
       bmc:
         switch_port: Gi1/3
   granduc-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/4
       eth1:
@@ -41,7 +41,7 @@ nodes:
       bmc:
         switch_port: Gi1/4
   granduc-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/5
       eth1:
@@ -51,7 +51,7 @@ nodes:
       bmc:
         switch_port: Gi1/5
   granduc-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/6
       eth1:
@@ -61,7 +61,7 @@ nodes:
       bmc:
         switch_port: Gi1/6
   granduc-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/7
       eth1:
@@ -71,7 +71,7 @@ nodes:
       bmc:
         switch_port: Gi1/7
   granduc-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/8
       eth1:
@@ -81,7 +81,7 @@ nodes:
       bmc:
         switch_port: Gi1/8
   granduc-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/9
       eth1:
@@ -91,7 +91,7 @@ nodes:
       bmc:
         switch_port: Gi1/9
   granduc-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/10
       eth1:
@@ -101,7 +101,7 @@ nodes:
       bmc:
         switch_port: Gi1/10
   granduc-11:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/11
       eth1:
@@ -111,7 +111,7 @@ nodes:
       bmc:
         switch_port: Gi1/11
   granduc-12:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/12
       eth1:
@@ -121,7 +121,7 @@ nodes:
       bmc:
         switch_port: Gi1/12
   granduc-13:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/13
       eth1:
@@ -131,7 +131,7 @@ nodes:
       bmc:
         switch_port: Gi1/13
   granduc-14:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/14
       eth1:
@@ -141,7 +141,7 @@ nodes:
       bmc:
         switch_port: Gi1/14
   granduc-15:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/15
       eth1:
@@ -151,7 +151,7 @@ nodes:
       bmc:
         switch_port: Gi1/15
   granduc-16:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/16
       eth1:
@@ -159,7 +159,7 @@ nodes:
       bmc:
         switch_port: Gi1/16
   granduc-17:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/17
       eth1:
@@ -169,7 +169,7 @@ nodes:
       bmc:
         switch_port: Gi1/17
   granduc-18:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/18
       eth1:
@@ -179,7 +179,7 @@ nodes:
       bmc:
         switch_port: Gi1/18
   granduc-19:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/19
       eth1:
@@ -189,7 +189,7 @@ nodes:
       bmc:
         switch_port: Gi1/19
   granduc-20:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/20
       eth1:
@@ -199,7 +199,7 @@ nodes:
       bmc:
         switch_port: Gi1/20
   granduc-21:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/21
       eth1:
@@ -209,7 +209,7 @@ nodes:
       bmc:
         switch_port: Gi1/21
   granduc-22:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch_port: Gi2/22
       eth1:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
index 4968d5fea4e52cff2744081e5f881f0bde7ad00e..357bc032ca6159b4d9bd86fac8bc759078a68e18 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
@@ -4,7 +4,7 @@ granduc-1:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ granduc-1:
     bmc:
       ip: 172.17.176.1
       mac: 00:1c:23:c8:69:c2
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -61,9 +61,9 @@ granduc-1:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 2QV963J
+    serial: 2QV963J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
index c31ca9a1436b378042b6186de9a0850433d69395..7f81fc34895cb8f5045b2977e64693c570ea50be 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
@@ -8,7 +8,7 @@ granduc-10:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -51,7 +51,7 @@ granduc-10:
     bmc:
       ip: 172.17.176.10
       mac: 00:1c:23:d3:42:56
-  block_devices:
+  storage_devices:
     sda:
       model: ST9300603SS
       device: sda
@@ -59,9 +59,9 @@ granduc-10:
       rev: FS64
       vendor: SEAGATE
   chassis:
-    serial_number: DELL
+    serial: DELL
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
index ed3562274693e8dc5a717a986e2a52bf36ffb4f5..b79c7b946a4ae919898e363aa91411f80ca9e873 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
@@ -4,7 +4,7 @@ granduc-11:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: MBB2147RC
       device: sda
@@ -15,7 +15,7 @@ granduc-11:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -61,9 +61,9 @@ granduc-11:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 30W883J
+    serial: 30W883J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
index 24014d5cf44b3220b7e06e1169b60df3e98c0c8d..7cf446af3564c2e14caa02462d64af5b50b14265 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
@@ -4,7 +4,7 @@ granduc-12:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ granduc-12:
     bmc:
       ip: 172.17.176.12
       mac: 00:1c:23:d3:57:5f
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -61,9 +61,9 @@ granduc-12:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 50W883J
+    serial: 50W883J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
index c9a830268fec0167b781ff1013c95c61cec08222..b1d4340e2b4c1d3f5ce918b92aa634978f258c46 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
@@ -4,7 +4,7 @@ granduc-13:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -51,7 +51,7 @@ granduc-13:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -59,9 +59,9 @@ granduc-13:
       rev: S207
       vendor: SEAGATE
   chassis:
-    serial_number: 40W883J
+    serial: 40W883J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
index 1c36047a80fb7cb8b6d64235ed544bff1bca1c83..04a90020055dcadfd4603b19f67f51951b5d479f 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
@@ -4,7 +4,7 @@ granduc-14:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -15,7 +15,7 @@ granduc-14:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -61,9 +61,9 @@ granduc-14:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 10W883J
+    serial: 10W883J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
index 7801c9789d743f96ecb747dffd310269170a7030..33083b5e192a6d8ef16a7c7d0664ccddb3aca88a 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
@@ -8,14 +8,14 @@ granduc-15:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
       size: 146815733760
       rev: S207
       vendor: FUJITSU
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -61,9 +61,9 @@ granduc-15:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 60W883J
+    serial: 60W883J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
index 1fb49691fd25c27d965e0965feac7d8666f78d4b..445afbdb84b802010966acaba48c63e9583dcd94 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
@@ -4,7 +4,7 @@ granduc-16:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -51,7 +51,7 @@ granduc-16:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -59,9 +59,9 @@ granduc-16:
       rev: S207
       vendor: SEAGATE
   chassis:
-    serial_number: JZV883J
+    serial: JZV883J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
index 80843f1ee50975a8b44bf588c99a90b5bd92b0ce..31b7ec69d213eb87893a2490191c06820c550aca 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
@@ -8,7 +8,7 @@ granduc-17:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -51,7 +51,7 @@ granduc-17:
     bmc:
       ip: 172.17.176.17
       mac: 00:1c:23:d3:57:89
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -59,9 +59,9 @@ granduc-17:
       rev: S207
       vendor: SEAGATE
   chassis:
-    serial_number: 20W883J
+    serial: 20W883J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
index 551bed975c4df1f2e18e69fa69af6641b0d55592..8e41dc6c117f6ceeb27effe86b9640c0c5392bba 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
@@ -4,7 +4,7 @@ granduc-18:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -51,7 +51,7 @@ granduc-18:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: MBB2147RC
       device: sda
@@ -59,9 +59,9 @@ granduc-18:
       rev: D406
       vendor: FUJITSU
   chassis:
-    serial_number: GQ2593J
+    serial: GQ2593J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
index 4a7099235330db0ed8a29f1bab4745ee168661f7..e2fce6c5feabfaeb3242f2978f412f3ca64d4c30 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
@@ -8,14 +8,14 @@ granduc-19:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
       size: 146815733760
       rev: S207
       vendor: SEAGATE
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -59,9 +59,9 @@ granduc-19:
       ip: 172.17.176.19
       mac: 00:1c:23:d3:42:4e
   chassis:
-    serial_number: 69N983J
+    serial: 69N983J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
index dbdb2266d617b00cbd8209627c83bcfd0dab40c6..cf38bc82fe6da7a3a39e11a5cf5f0b92be27cdd0 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
@@ -8,7 +8,7 @@ granduc-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -51,7 +51,7 @@ granduc-2:
     bmc:
       ip: 172.17.176.2
       mac: 00:1c:23:c8:69:aa
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -61,9 +61,9 @@ granduc-2:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 1QV963J
+    serial: 1QV963J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
index 6c7c97f916b5dabc503d79706599d8410c4c7cfd..e0937b0f126f3851e610dc0b101844163404ac30 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
@@ -8,7 +8,7 @@ granduc-20:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -51,7 +51,7 @@ granduc-20:
     bmc:
       ip: 172.17.176.20
       mac: 00:1c:23:d3:42:6c
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -59,9 +59,9 @@ granduc-20:
       rev: S207
       vendor: SEAGATE
   chassis:
-    serial_number: 39N983J
+    serial: 39N983J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
index b346757ae75174eaa3a9d3898883868257464e60..65215a77271f484a8dcf3cad42872486edc09a94 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
@@ -4,7 +4,7 @@ granduc-21:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: MBD2147RC
       device: sda
@@ -15,7 +15,7 @@ granduc-21:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -61,9 +61,9 @@ granduc-21:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 1R2593J
+    serial: 1R2593J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
index b14d5cee8cacce0ce5bc0964021a259fe5ef1f65..fd2184b10d7b7baaa547989da74d5cb9ed6b9268 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
@@ -4,7 +4,7 @@ granduc-22:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: MBB2147RC
       device: sda
@@ -15,7 +15,7 @@ granduc-22:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -61,9 +61,9 @@ granduc-22:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: HQ2593J
+    serial: HQ2593J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
index b77ee3fd6e537fc1affd8ef9b497cb09ad6549c5..678c02a37296a6888aee37d5405a26fe4adf0b74 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
@@ -8,14 +8,14 @@ granduc-3:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: MBB2147RC
       device: sda
       size: 146815733760
       rev: D406
       vendor: FUJITSU
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -59,9 +59,9 @@ granduc-3:
       ip: 172.17.176.3
       mac: 00:1c:23:d6:c3:0a
   chassis:
-    serial_number: 3R2593J
+    serial: 3R2593J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
index 067a4446251c685fce65dd10d98e8c25a4d716c6..f8d4b8c5e5ce9b2b7fc1c530fec7fbe1edac4f47 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
@@ -4,7 +4,7 @@ granduc-4:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: MBB2147RC
       device: sda
@@ -15,7 +15,7 @@ granduc-4:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -61,9 +61,9 @@ granduc-4:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: FQ2593J
+    serial: FQ2593J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
index 05d3f5cc1002de361b7d07b56edcba396c41cd90..06c031015a522c819af7925b548ba32c63c5501f 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
@@ -4,7 +4,7 @@ granduc-5:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ granduc-5:
     bmc:
       ip: 172.17.176.5
       mac: 00:1c:23:d3:42:46
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -61,9 +61,9 @@ granduc-5:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 99N983J
+    serial: 99N983J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
index 0c7720bb03d8126f1cb9a57154309a883b5faf18..86fdf2bed5226d1ee251d9f679cb42efc459cfa0 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
@@ -4,7 +4,7 @@ granduc-6:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: MBB2147RC
       device: sda
@@ -15,7 +15,7 @@ granduc-6:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -59,9 +59,9 @@ granduc-6:
       ip: 172.17.176.6
       mac: 00:1c:23:d6:c3:08
   chassis:
-    serial_number: BQ2593J
+    serial: BQ2593J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
index 9070315a057b5fe1c7279a466ee8f015b691e01f..188d99ba19f583ee1fa03c85b2c81287b8c8f388 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
@@ -4,7 +4,7 @@ granduc-7:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ granduc-7:
     bmc:
       ip: 172.17.176.7
       mac: 00:1c:23:d3:42:2c
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -59,9 +59,9 @@ granduc-7:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 49N983J
+    serial: 49N983J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
index 5da36a1f5091d359af67d11c9152fd1d32b5fe98..5ea871f6b957b8918250f0456127902a87ab514d 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
@@ -4,7 +4,7 @@ granduc-8:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ granduc-8:
     bmc:
       ip: 172.17.176.8
       mac: 00:1c:23:d3:08:7a
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -61,9 +61,9 @@ granduc-8:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 59N983J
+    serial: 59N983J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
index d80e07eca7b111805e74e8b104d364d136c1f670..625d684b1c4a4c78a3d0219eb84a0d3948f8aae1 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
@@ -4,7 +4,7 @@ granduc-9:
     version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -51,7 +51,7 @@ granduc-9:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST9146802SS
       device: sda
@@ -59,9 +59,9 @@ granduc-9:
       rev: S207
       vendor: SEAGATE
   chassis:
-    serial_number: 89N983J
+    serial: 89N983J
     manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
+    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
index 97c9aaa0823a41641e12203afb4587ae97477df3..c4ec3dd7122e02596e1dbc9925716898c825adc2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -8,7 +8,7 @@ petitprince-1:
     vendor: Dell Inc.
     version: 2.4
     release_date: 07/02/2014
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.1
@@ -49,7 +49,7 @@ petitprince-1:
     ram_size: 34359738368
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 250059350016
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
index f857c16b7aa13715201541e7b1f007b8ee38c129..a4e91d36cfc96f4fe17fb29bdb2298b987d98744 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -10,7 +10,7 @@ petitprince-10:
     platform_type: x86_64
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
@@ -23,7 +23,7 @@ petitprince-10:
     vendor: Dell Inc.
     version: 2.4
     release_date: 07/02/2014
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.10
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
index 1ea3787392b2c2060d9843e6ec3e1d670ccbef7f..d7878660ec057f245746dd61df8e4dd2d28b1b7e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -8,7 +8,7 @@ petitprince-11:
     vendor: Dell Inc.
     version: 2.4
     release_date: 07/02/2014
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
@@ -19,7 +19,7 @@ petitprince-11:
     smp_size: 2
     smt_size: 12
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.11
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
index cdc6250fae6796276bf74b15ef0c227b99e40a94..3165c21de95b10259dc30a536c8e920e831321bc 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
@@ -15,7 +15,7 @@ petitprince-12:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 15728640
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.12
@@ -43,7 +43,7 @@ petitprince-12:
     smp_size: 2
     smt_size: 12
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
index 94a34b4f709eafa85ea08dc79dd48ba927f6bf85..64a6fa613ff33aa0560e1b2de0c4f7b1c508a41a 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -10,7 +10,7 @@ petitprince-13:
     platform_type: x86_64
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.13
@@ -43,7 +43,7 @@ petitprince-13:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 15728640
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
index 37efb5e5c643a084110dff3d51a6ec5dc0804e1c..6d7bac6a2c9ae9f545036d0bfe6cfa8553b0a9f2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -4,14 +4,14 @@ petitprince-14:
     kernel: 3.2.0-4-amd64
     name: debian
     version: 7.1
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
       rev: AA08
       device: sda
       size: 250059350016
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.14
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
index 06e973f3c5f3ff62b84a2a80dcf9bd722cabc3f4..f37a64d55778cc80418dd2d574847bbbc0ecd75e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -16,7 +16,7 @@ petitprince-15:
     smp_size: 2
     smt_size: 12
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
@@ -34,7 +34,7 @@ petitprince-15:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 15728640
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.15
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
index 279e44f8ba7f5f3532f3fa107a0d927311910b39..a9459ac2957b4a96bab681aa471f2be01b401090 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -4,7 +4,7 @@ petitprince-16:
     kernel: 3.2.0-4-amd64
     name: debian
     version: 7.1
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
@@ -19,7 +19,7 @@ petitprince-16:
     vendor: Dell Inc.
     version: 2.4
     release_date: 07/02/2014
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.16
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
index e39208b39d80f3085f96ba771d014e16a914ef79..3c9519f9bafd0045dc3747120926bd4e823ceacc 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -4,7 +4,7 @@ petitprince-2:
     kernel: 3.2.0-4-amd64
     name: debian
     version: 7.1
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.2
@@ -26,7 +26,7 @@ petitprince-2:
     bmc:
       ip: 172.17.177.2
       mac: 90:b1:1c:ac:d2:cd
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
index 4230ef237595dfa896197c0f9d34d172292dbe00..b619037676ff2be7612d91d66b62d19c3806b1ab 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -10,7 +10,7 @@ petitprince-3:
     smp_size: 2
     smt_size: 12
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
@@ -28,7 +28,7 @@ petitprince-3:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 15728640
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.3
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
index 43376a344ac3275b0f10433e0ffc22e5df4343a0..eb0982d602d60e6bebd78c67f6a5f7d2b0c7d943 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -8,7 +8,7 @@ petitprince-4:
     vendor: Dell Inc.
     version: 2.4
     release_date: 07/02/2014
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
@@ -19,7 +19,7 @@ petitprince-4:
     smp_size: 2
     smt_size: 12
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.4
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
index fd97e8c8a40b8b5f9312caa6091ea74e6cedeb8a..b72c0566fb1e65ae594411d2d05311173d85aea2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -6,7 +6,7 @@ petitprince-5:
     version: 7.1
   main_memory:
     ram_size: 34359738368
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.5
@@ -34,7 +34,7 @@ petitprince-5:
     vendor: Dell Inc.
     version: 2.4
     release_date: 07/02/2014
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
index 8f1ddb7bf336b476e025fa411d02b2d06f881510..4bc630981625744b75365c385bea8173efe32c0d 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -15,7 +15,7 @@ petitprince-6:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 15728640
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.6
@@ -37,7 +37,7 @@ petitprince-6:
     bmc:
       ip: 172.17.177.6
       mac: 90:b1:1c:ac:d3:01
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
index dc203af4a22a37ed333bde774554f38928cb973a..b72f8514508c02748ae8881a6479293c4aaf8402 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -6,7 +6,7 @@ petitprince-7:
     version: 7.1
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.7
@@ -49,7 +49,7 @@ petitprince-7:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 15728640
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
index f3a99c84bb284bd44e2e8c37ef333c21400ed544..5b44409f237ba3ed1cd33dc215d58fe601600731 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
@@ -8,7 +8,7 @@ petitprince-8:
     smp_size: 2
     smt_size: 12
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.8
@@ -30,7 +30,7 @@ petitprince-8:
     bmc:
       ip: 172.17.177.8
       mac: 90:b1:1c:ac:d3:1b
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
index f8e22b7d05e9180608e06a2a34c3392044e911c5..4450e99a114ffdf871ece2254c0396658cf3442a 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -12,7 +12,7 @@ petitprince-9:
     vendor: Dell Inc.
     version: 2.4
     release_date: 07/02/2014
-  block_devices:
+  storage_devices:
     sda:
       vendor: SEAGATE
       model: ST9250610NS
@@ -30,7 +30,7 @@ petitprince-9:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 15728640
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.177.9
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
index e4c4310de7252f8888a40c3c99dd49d420e30643..fc1c88d1c9aba7a19e83ce8fcc27179ffcd0cfd5 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
@@ -18,12 +18,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml
index 42fb7027e3ed7b678a7925a6571d947d87e49e21..6654c9254b3f5d71a2bb05cff02d7c8ff71e3267 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml
@@ -2,10 +2,10 @@
 nodes:
   petitprince-1:
     chassis:
-      serial_number: 1NVTG5J
+      serial: 1NVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/1
       eth1:
@@ -14,10 +14,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-2:
     chassis:
-      serial_number: 2MVTG5J
+      serial: 2MVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/2
       eth1:
@@ -26,10 +26,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-3:
     chassis:
-      serial_number: 3MVTG5J
+      serial: 3MVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/3
       eth1:
@@ -38,10 +38,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-4:
     chassis:
-      serial_number: 4MVTG5J
+      serial: 4MVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/4
       eth1:
@@ -50,10 +50,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-5:
     chassis:
-      serial_number: 5MVTG5J
+      serial: 5MVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/5
       eth1:
@@ -62,10 +62,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-6:
     chassis:
-      serial_number: 6MVTG5J
+      serial: 6MVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/6
       eth1:
@@ -74,10 +74,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-7:
     chassis:
-      serial_number: 7MVTG5J
+      serial: 7MVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/7
       eth1:
@@ -86,10 +86,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-8:
     chassis:
-      serial_number: 8MVTG5J
+      serial: 8MVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/8
       eth1:
@@ -98,10 +98,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-9:
     chassis:
-      serial_number: 9MVTG5J
+      serial: 9MVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/9
       eth1:
@@ -110,10 +110,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-10:
     chassis:
-      serial_number: BMVTG5J
+      serial: BMVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/10
       eth1:
@@ -122,10 +122,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-11:
     chassis:
-      serial_number: CMVTG5J
+      serial: CMVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/11
       eth1:
@@ -134,10 +134,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-12:
     chassis:
-      serial_number: DMVTG5J
+      serial: DMVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/12
       eth1:
@@ -146,10 +146,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-13:
     chassis:
-      serial_number: FMVTG5J
+      serial: FMVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/13
       eth1:
@@ -158,10 +158,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-14:
     chassis:
-      serial_number: GMVTG5J
+      serial: GMVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/14
       eth1:
@@ -170,10 +170,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-15:
     chassis:
-      serial_number: HMVTG5J
+      serial: HMVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/15
       eth1:
@@ -182,10 +182,10 @@ nodes:
         switch_port: Gi2/36
   petitprince-16:
     chassis:
-      serial_number: JMVTG5J
+      serial: JMVTG5J
       manufacturer: Dell Inc.
-      product_name: PowerEdge M620
-    network_interfaces:
+      name: PowerEdge M620
+    network_adapters:
       eth0:
         switch_port: Te0/16
       eth1:
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
index dce4e9afdb1116b023ca12bdb8cadf2d23e98c9d..7495a41c5870a881fc18a4cbd3d23c1d394f46f8 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -20,7 +20,7 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
@@ -33,7 +33,7 @@ nodes:
         interface: SATA
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         rate: 10.0+e9
         device: eth0
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
index a6ce94ed928c51c7db58d562d730d10f7b83e2a2..8ec98b90143fa52a1258fd13f6e48f4799aeadb0 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -4,7 +4,7 @@ hercule-1:
     version: 1.0.21
     release_date: 04/26/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:8c:fa:0b:b9:c2
@@ -44,7 +44,7 @@ hercule-1:
     bmc:
       mac: 84:8f:69:fd:4d:38
       ip: 172.17.51.1
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2003FYYS-1
       device: sda
@@ -65,9 +65,9 @@ hercule-1:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: JQ3HD5J
+    serial: JQ3HD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
index 205db1e42ea697251e522858d0aa720368db4069..297c697f9b6008af7c6b6feb2c7faf6266330c12 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -8,7 +8,7 @@ hercule-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:8c:fa:0b:b4:bc
@@ -48,7 +48,7 @@ hercule-2:
     bmc:
       mac: 84:8f:69:fd:4f:3f
       ip: 172.17.51.2
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2003FYYS-1
       device: sda
@@ -67,9 +67,9 @@ hercule-2:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: HQ3HD5J
+    serial: HQ3HD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
index 326cefcd375a889c8f78af287aaafbf20599e5b4..e2bc67cebca7026322d833f9b0b0d7b2608e476b 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -4,7 +4,7 @@ hercule-3:
     version: 1.0.21
     release_date: 04/26/2012
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2003FYYS-1
       device: sda
@@ -20,7 +20,7 @@ hercule-3:
       device: sdc
       size: 2000398934016
       rev: 1.0
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:8c:fa:0b:e1:78
@@ -65,9 +65,9 @@ hercule-3:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: FQ3HD5J
+    serial: FQ3HD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
index 36a00d2bf4ccf306746b46dbedcf21695bfd35ea..40a2f9c505fbaef55ec3d3f6913af7f897d74ea6 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -8,7 +8,7 @@ hercule-4:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2003FYYS-1
       device: sda
@@ -24,7 +24,7 @@ hercule-4:
       device: sdc
       size: 2000398934016
       rev: 1.0
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:8c:fa:0b:d8:52
@@ -65,9 +65,9 @@ hercule-4:
       mac: 84:8f:69:fd:4a:53
       ip: 172.17.51.4
   chassis:
-    serial_number: GQ3HD5J
+    serial: GQ3HD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
index 361d93921e403bad3ce199da8517ff6a84dfccdc..f555be8d9839b517c603716014d54a4aa830239b 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -4,7 +4,7 @@ orion-1:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/18
@@ -64,16 +64,16 @@ orion-1:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
   chassis:
-    serial_number: B3MJD5J
+    serial: B3MJD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
index f27b456db46ea2246b54b9da8a005c14772c0bdc..ee71bfb629a22620d7c08ae9d1db12ce08f0c143 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -4,7 +4,7 @@ orion-2:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/19
@@ -64,7 +64,7 @@ orion-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
@@ -73,9 +73,9 @@ orion-2:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 93MJD5J
+    serial: 93MJD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
index 676ace5ac92cecd0c6cf9ad47ab3123eeb991739..299335663281c7938ff2b8b2dd5cc7c0650289b2 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -4,7 +4,7 @@ orion-3:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
@@ -14,7 +14,7 @@ orion-3:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/20
@@ -71,9 +71,9 @@ orion-3:
       mac: d4:be:d9:f9:a3:24
       ip: 172.17.50.3
   chassis:
-    serial_number: C3MJD5J
+    serial: C3MJD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
index 3c8854329af7c267ac1a39d71524a8c00dfd1921..39119fc7beadd53baf64cd9457f712fef82e721a 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -4,13 +4,13 @@ orion-4:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/21
@@ -73,9 +73,9 @@ orion-4:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 83MJD5J
+    serial: 83MJD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
index 1dab859d7e17db1b6c71f9d6fa63525b4e60dc2d..b298f606bf88df8815c31b443010ddadc670905f 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
@@ -19,13 +19,13 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SCSI
         driver: megaraid_sas
         storage: HDD
         vendor: null
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
index f12804599349039c72cbf8045044e737342a2c15..dc66a75ddd9411a8986debb6baeb466b7ba6d5bd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
@@ -4,7 +4,7 @@ sagittaire-1:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:9e:13
@@ -29,7 +29,7 @@ sagittaire-1:
     bmc:
       mac: 00:09:3d:12:9e:15
       ip: 172.17.49.1
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-1:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052536201
+    serial: XG052536201
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
index a753df3d62a5cdce817b846ef4f7a603f0b1d92d..3983edfdfafe20797529bc208ad82f3b634cf8f1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
@@ -4,7 +4,7 @@ sagittaire-10:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:aa:e1
@@ -33,7 +33,7 @@ sagittaire-10:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-10:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052075175
+    serial: XG052075175
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
index c826f493455924f24bb412336c541f98ad4e3b29..709921612079002a56c6edf045ce056c3f5615ce 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -4,7 +4,7 @@ sagittaire-11:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:9e:06
@@ -33,7 +33,7 @@ sagittaire-11:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373307LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-11:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052536163
+    serial: XG052536163
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
index 1aeab03ec23ae44987f0e3b0b71eb97758084571..9fcb0a817c6edecda6fd0c7f95d2dbc4cfa08a49 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -4,7 +4,7 @@ sagittaire-12:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:3c:2b
@@ -29,7 +29,7 @@ sagittaire-12:
     bmc:
       mac: 00:09:3d:12:3c:2d
       ip: 172.17.49.12
-  block_devices:
+  storage_devices:
     sda:
       model: ST373307LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-12:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052423635
+    serial: XG052423635
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
index 2cc9f42c8997eba2d7cac1f65c3f4b6b9bcc6509..17b37c59612befbea68f052f6e1b03ff20082ef1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -4,7 +4,7 @@ sagittaire-13:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:91:60
@@ -33,7 +33,7 @@ sagittaire-13:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-13:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052428994
+    serial: XG052428994
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
index 9213306be37a4f713ebb5aeaf381823704fa5796..5c538bf2ff8f9a5d6b3930874bc04319fc243f29 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -8,7 +8,7 @@ sagittaire-14:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:7a:bc
@@ -33,7 +33,7 @@ sagittaire-14:
     bmc:
       mac: 00:09:3d:12:7a:be
       ip: 172.17.49.14
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-14:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052080114
+    serial: XG052080114
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
index a27fea0ad8b4f0350f499f331ba5c687c9aa9816..90a1a22f1e1ae5b4ecafd78cd85818eaf4b9893b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -4,7 +4,7 @@ sagittaire-15:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:28:70
@@ -33,7 +33,7 @@ sagittaire-15:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-15:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052422326
+    serial: XG052422326
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
index 99c6d3f73f13767d51dea413209c2112ae63d5f4..30b6036150435ecdad8d4178b81ca6b912d6e7a7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -4,7 +4,7 @@ sagittaire-16:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:7d:06
@@ -29,7 +29,7 @@ sagittaire-16:
     bmc:
       mac: 00:09:3d:12:7d:08
       ip: 172.17.49.16
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -40,9 +40,9 @@ sagittaire-16:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: XG052429007
+    serial: XG052429007
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
index 0ef844acaaebbb99423791c9f59b4c2eb43e1a7a..9099bd374ee1b7464790c4587e740b3154e2ea8d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -8,7 +8,7 @@ sagittaire-17:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:e7:62
@@ -33,7 +33,7 @@ sagittaire-17:
     bmc:
       mac: 00:09:3d:11:e7:64
       ip: 172.17.49.17
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-17:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052081146
+    serial: XG052081146
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
index 756c546a8cbbd229832923388fc38559833f82c4..c43afdf27fb7918bcc4586a66a0dfe8180719c33 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -4,7 +4,7 @@ sagittaire-18:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:7e:f1
@@ -33,7 +33,7 @@ sagittaire-18:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-18:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052429080
+    serial: XG052429080
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
index 72a398966ac33aa0c818d35a1d8c0f8209f441a3..6256ea4ccf8e4f6187a6f2ab55bde8ee37aa4528 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
@@ -8,13 +8,13 @@ sagittaire-19:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:90:56
@@ -40,9 +40,9 @@ sagittaire-19:
       mac: 00:09:3d:12:90:58
       ip: 172.17.49.19
   chassis:
-    serial_number: XG052428991
+    serial: XG052428991
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
index 8a84203306f065b2cbdcad8ddb2b46bdc46221c3..160a353d0cdf1d24e7fcf341ebc6ffb044cd3361 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -8,13 +8,13 @@ sagittaire-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:65:7c
@@ -40,9 +40,9 @@ sagittaire-2:
       mac: 00:09:3d:12:65:7e
       ip: 172.17.49.2
   chassis:
-    serial_number: XG052310079
+    serial: XG052310079
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
index a9bf037dae7b2f9ad45c4758def53c8ee0d8abaf..3c2dd617c556a39bdc1728abe2f9e57618456373 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -4,7 +4,7 @@ sagittaire-20:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -14,7 +14,7 @@ sagittaire-20:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:90:83
@@ -40,9 +40,9 @@ sagittaire-20:
       mac: 00:09:3d:12:90:85
       ip: 172.17.49.20
   chassis:
-    serial_number: XG052428987
+    serial: XG052428987
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
index 685677be80c6e00d5ccbdc4b44cf017ae2abeb9e..90c00c1c7e9ba88dbaff0a9265c7cd25146784f4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
@@ -8,7 +8,7 @@ sagittaire-21:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-21:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:85:70
@@ -47,9 +47,9 @@ sagittaire-21:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
index 72f8f9cac2281ea15021d6d88d47b3e8802c12c7..737db6888f40397a406bb8e09ba38cf99c141367 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
@@ -8,7 +8,7 @@ sagittaire-22:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-22:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:90:9e
@@ -47,9 +47,9 @@ sagittaire-22:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052429001
+    serial: XG052429001
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
index 00d11666bbf80a9b33a36d6340f7e020dde24f30..7c8169d0a52402bf918c924b37d8125da6c9e432 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
@@ -4,7 +4,7 @@ sagittaire-23:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -14,7 +14,7 @@ sagittaire-23:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:7d:46
@@ -40,9 +40,9 @@ sagittaire-23:
       mac: 00:09:3d:12:7d:48
       ip: 172.17.49.23
   chassis:
-    serial_number: XG052422799
+    serial: XG052422799
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
index 4d12fda6c0de90b8d2279c0ef62e442295e94592..0d2ae47c04aa4d5ca1fc36e480fd5011ebcd47ac 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
@@ -4,13 +4,13 @@ sagittaire-24:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:50:85
@@ -40,9 +40,9 @@ sagittaire-24:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: XG052420563
+    serial: XG052420563
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
index 5bc176101dca743e27b7ceb7749f4ccc58851527..0f16d474b70fdc57dea2f9ce155395598ce0a703 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
@@ -8,7 +8,7 @@ sagittaire-25:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-25:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:10:de:8d
@@ -47,9 +47,9 @@ sagittaire-25:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
index ead480feefecd3892286cce5212271d45e699b7f..06b62d552c4b915a4ef98727eacc00100926921a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
@@ -4,7 +4,7 @@ sagittaire-26:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:ce:21
@@ -29,7 +29,7 @@ sagittaire-26:
     bmc:
       mac: 00:09:3d:11:ce:23
       ip: 172.17.49.26
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -40,9 +40,9 @@ sagittaire-26:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: XG052083140
+    serial: XG052083140
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
index 380038d1d405da307721962c038ee7c8a6f9bebe..90da243c3f3cfb5f1c0c9307f094c8c0cab7cdf9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
@@ -8,13 +8,13 @@ sagittaire-27:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:6a:f0
@@ -40,9 +40,9 @@ sagittaire-27:
       mac: 00:09:3d:12:6a:f2
       ip: 172.17.49.27
   chassis:
-    serial_number: XG052310144
+    serial: XG052310144
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
index b81ab961d2e597b6691bde4c0b7a23cf16f9a32f..4599a7d5f9e0d3dc9524a6696c894239096652c6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
@@ -8,7 +8,7 @@ sagittaire-28:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:33:e5
@@ -33,7 +33,7 @@ sagittaire-28:
     bmc:
       mac: 00:09:3d:12:33:e7
       ip: 172.17.49.28
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-28:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052422324
+    serial: XG052422324
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
index 031f2d156790f46568c131305d4e9313e299f5c9..b169d9581fbbb234d652e34713aaa8d7d7ad343f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
@@ -8,13 +8,13 @@ sagittaire-29:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:e9:fe
@@ -40,9 +40,9 @@ sagittaire-29:
       mac: 00:09:3d:11:ea:00
       ip: 172.17.49.29
   chassis:
-    serial_number: XG052423610
+    serial: XG052423610
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
index a1d5153c44ad3c9842837d1949776d62039678a7..b904e930cda047219f0bdb3679005c6cc5f96aec 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -4,7 +4,7 @@ sagittaire-3:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:91:66
@@ -29,7 +29,7 @@ sagittaire-3:
     bmc:
       mac: 00:09:3d:12:91:68
       ip: 172.17.49.3
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -40,9 +40,9 @@ sagittaire-3:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: XG052428996
+    serial: XG052428996
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
index fb56938f997ff9a76fd1720eb1252b3014772d09..5887d7d47f27af74f6afc70492e6e57facac744e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
@@ -4,7 +4,7 @@ sagittaire-30:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -14,7 +14,7 @@ sagittaire-30:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:7c:93
@@ -42,9 +42,9 @@ sagittaire-30:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052429073
+    serial: XG052429073
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
index d0db4aa1445444b434c3b6826d00224de6f9ed65..e20ab01e2080f580ca3ba9be9e0ad9b53b289ed1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
@@ -4,13 +4,13 @@ sagittaire-31:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:c9:0c
@@ -42,9 +42,9 @@ sagittaire-31:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG062972165
+    serial: XG062972165
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
index a285361f7311873088e7ea80fe98c1c2bff77823..2ebb6ca3cc574b0956dec0231db29afeca568323 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
@@ -4,7 +4,7 @@ sagittaire-32:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:a5:74
@@ -29,7 +29,7 @@ sagittaire-32:
     bmc:
       mac: 00:09:3d:12:a5:76
       ip: 172.17.49.32
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -40,9 +40,9 @@ sagittaire-32:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: XG052536375
+    serial: XG052536375
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
index b1c46de7d2ef927c2b2578e3fb0fbb3ab75c5519..128b83a9aa3ac9ec38adc581f06be8917a568f1c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
@@ -4,13 +4,13 @@ sagittaire-33:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:92:70
@@ -40,9 +40,9 @@ sagittaire-33:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: XG052536398
+    serial: XG052536398
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
index 4b82738759d0b34d976df7a07c75e72ae02b443b..fdbc22a6335f5776c3411f67f66dc4d258c08cb2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
@@ -4,7 +4,7 @@ sagittaire-34:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:a4:ee
@@ -33,7 +33,7 @@ sagittaire-34:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-34:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052536349
+    serial: XG052536349
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
index bc730adb56ba4d188f71b14aa5ca34c27625e2c4..c4dbf3bc5082cd8a03147cacfb94f1c3db8bae71 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
@@ -8,7 +8,7 @@ sagittaire-35:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-35:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:28:16
@@ -47,9 +47,9 @@ sagittaire-35:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
index 4812c5eb2ea95d2df89eb2fa89cad61fbcdd9384..1a673a96ec5ef294bc1efed7d31f700920d4f2fb 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
@@ -8,7 +8,7 @@ sagittaire-36:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-36:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:10:c7:ba
@@ -47,9 +47,9 @@ sagittaire-36:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
index 9ca139c9153951eb0bca19e66d35b3fb41533053..fd127a6f798a203f664059dffe91d3c319be22d3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
@@ -4,7 +4,7 @@ sagittaire-37:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -14,7 +14,7 @@ sagittaire-37:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:69:f8
@@ -42,9 +42,9 @@ sagittaire-37:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052423605
+    serial: XG052423605
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
index 877f1d2c2d0ac1c0b7a072d4d6f47421a68f795d..1aad38486e9d5784fbbce859c470abfc7268325b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
@@ -4,13 +4,13 @@ sagittaire-38:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:38:6a
@@ -42,9 +42,9 @@ sagittaire-38:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052423602
+    serial: XG052423602
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
index 8d8222127211ae077ef62f5f74ae1f580634efca..6af53403f648b380fb65706580602b50832740ee 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
@@ -4,7 +4,7 @@ sagittaire-39:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:4f:18
@@ -29,7 +29,7 @@ sagittaire-39:
     bmc:
       mac: 00:09:3d:12:4f:1a
       ip: 172.17.49.39
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-39:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052420611
+    serial: XG052420611
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
index 6875037e6eafb50990932c08f5b1a7dd71bee746..e70e07cc1b993f4aec75becd08d49a864b086a6c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -8,7 +8,7 @@ sagittaire-4:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-4:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:7e:bb
@@ -47,9 +47,9 @@ sagittaire-4:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052428995
+    serial: XG052428995
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
index 75b48b4706f44bcfbf79cf5a782d0a281cb03a79..9b5f43e17688b1c51842c0665016efb2738f68e9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
@@ -8,7 +8,7 @@ sagittaire-40:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-40:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:5a:30
@@ -46,9 +46,9 @@ sagittaire-40:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
index c24cfd16603505804ce9c453137d0ef11e277721..fe6791a8c449ec29fc143c521e0d61ed4681e6fc 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
@@ -8,7 +8,7 @@ sagittaire-41:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-41:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:6a:41
@@ -47,9 +47,9 @@ sagittaire-41:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
index 56fef22140440b6841380a6c1bf79d5d0df7ee8a..89db798ab9f5f8edba22bed1f6244e349f974eb1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
@@ -8,7 +8,7 @@ sagittaire-42:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:74:d4
@@ -33,7 +33,7 @@ sagittaire-42:
     bmc:
       mac: 00:09:3d:12:74:d6
       ip: 172.17.49.42
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-42:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052420624
+    serial: XG052420624
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
index eaa9426406c5bedfbc018ee611dfcc8f902f0f2b..b8f745120585087db80d0d8cad90897fbfbb0f8f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
@@ -8,7 +8,7 @@ sagittaire-43:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-43:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:28:4f
@@ -47,9 +47,9 @@ sagittaire-43:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052422304
+    serial: XG052422304
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
index 837f978dd31e705d48059bfa525c0fdbe9122631..343c72d7ff5f8bffde852b1c7c635f6e084224cc 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
@@ -4,7 +4,7 @@ sagittaire-44:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:a4:b4
@@ -29,7 +29,7 @@ sagittaire-44:
     bmc:
       mac: 00:09:3d:12:a4:b6
       ip: 172.17.49.44
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -40,9 +40,9 @@ sagittaire-44:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: XG052536146
+    serial: XG052536146
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
index eb34640dae6ddca64f873dc27bdbec45a6766318..40e41fb395ca615abfe32cec105bc6a9dbe63fcf 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
@@ -4,7 +4,7 @@ sagittaire-45:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:3c:61
@@ -29,7 +29,7 @@ sagittaire-45:
     bmc:
       mac: 00:09:3d:12:3c:63
       ip: 172.17.49.45
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-45:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052420619
+    serial: XG052420619
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
index 8c85d26aa8c66d6152bfe3ed07aed8c3b727f8f5..c977a5aa971e9e9322f9d51ef2b2f83ec452b088 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
@@ -4,7 +4,7 @@ sagittaire-46:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:9d:e5
@@ -33,16 +33,16 @@ sagittaire-46:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
       size: 73543163904
       rev: 104
   chassis:
-    serial_number: XG052536197
+    serial: XG052536197
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
index 8a84a34aa4a9d3549b6b4018e4640f77563553a4..75e9c9f65622b2ceb4fe50fa032c3a9737e8873c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
@@ -8,7 +8,7 @@ sagittaire-47:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:3c:03
@@ -33,7 +33,7 @@ sagittaire-47:
     bmc:
       mac: 00:09:3d:12:3c:05
       ip: 172.17.49.47
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-47:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052423591
+    serial: XG052423591
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
index 960ef8c3e7b07bdecefe1b128b43cb66dafa4bbc..f2e59c85f0a060a3c755c9a10acf336f76a43e8b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
@@ -4,7 +4,7 @@ sagittaire-48:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:92:f5
@@ -29,7 +29,7 @@ sagittaire-48:
     bmc:
       mac: 00:09:3d:12:92:f7
       ip: 172.17.49.48
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-48:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052536400
+    serial: XG052536400
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
index 47cb85aace3f941ceb832e8bbae288a0ec5f96c9..c0f461d5c238c5cb0e8dd6505a70a129f44ddc85 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
@@ -8,7 +8,7 @@ sagittaire-49:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:3b:dd
@@ -33,16 +33,16 @@ sagittaire-49:
     bmc:
       mac: 00:09:3d:12:3b:df
       ip: 172.17.49.49
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
   chassis:
-    serial_number: XG052420599
+    serial: XG052420599
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
index 05759e1644d3724208c1eacd0b99f694e8d1c30d..566fe125cee61770ef5599da30ceea1111cd0295 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -4,7 +4,7 @@ sagittaire-5:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -14,7 +14,7 @@ sagittaire-5:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:3b:79
@@ -42,9 +42,9 @@ sagittaire-5:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052080174
+    serial: XG052080174
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
index 032abea38ec1f6fbfd933cc8a743f304a6e90e19..ac768f051faefe6c163907450942a64db1a386cf 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
@@ -4,13 +4,13 @@ sagittaire-50:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:69:b7
@@ -40,9 +40,9 @@ sagittaire-50:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: XG052423649
+    serial: XG052423649
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
index 97b925eaa411a0e3a11a28ff3a031973627b86b5..58e6f9471c1ccf88d2bfa22e0cd7a1599b55963a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
@@ -4,7 +4,7 @@ sagittaire-51:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:3c:70
@@ -33,7 +33,7 @@ sagittaire-51:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-51:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052420601
+    serial: XG052420601
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
index e62c5014becc68b2f96c2deee1472e50f86e0b06..874b7f5c4eb51ed92d45f46cba747f2406aec5f8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
@@ -4,13 +4,13 @@ sagittaire-52:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:27:66
@@ -42,9 +42,9 @@ sagittaire-52:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052422284
+    serial: XG052422284
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
index 4bfe48037e62341e7c1f0af936eab11c7af3989d..a1c4dba54fcee51ff337d397ce2d5fba04b84868 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
@@ -8,7 +8,7 @@ sagittaire-53:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:9d:8b
@@ -33,16 +33,16 @@ sagittaire-53:
     bmc:
       mac: 00:09:3d:12:9d:8d
       ip: 172.17.49.53
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
       size: 73543163904
       rev: 104
   chassis:
-    serial_number: XG052536172
+    serial: XG052536172
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
index d1effd9786c6177395f3e7ee277e3c5f3b5b2877..1057d1a86aea0b9e59a7b03db41e314afd36bdad 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
@@ -8,7 +8,7 @@ sagittaire-54:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-54:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:92:61
@@ -47,9 +47,9 @@ sagittaire-54:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052536363
+    serial: XG052536363
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
index 5f0ec6291a9c624a35dd419717bdaf06ed8c0776..de4a4b7d2905a9e173123e9ba31669bae8ebe5bd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
@@ -8,7 +8,7 @@ sagittaire-55:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:68:a9
@@ -33,16 +33,16 @@ sagittaire-55:
     bmc:
       mac: 00:09:3d:12:68:ab
       ip: 172.17.49.55
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
   chassis:
-    serial_number: XG052310093
+    serial: XG052310093
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
index 2e5d65ea87a91033b6fbcf69f0ec83baea35adbd..02b9cb03da4625124c845796fcc3e90dd3485817 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
@@ -8,13 +8,13 @@ sagittaire-56:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:5a:d6
@@ -42,9 +42,9 @@ sagittaire-56:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052291009
+    serial: XG052291009
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
index 350aea523b510eaa81d3eeb0e9baa0522c19d3d3..14dbb8f84cbb8a9263699ddcf9bd06ece3c83a95 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
@@ -8,13 +8,13 @@ sagittaire-57:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:62:ee
@@ -42,9 +42,9 @@ sagittaire-57:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052310153
+    serial: XG052310153
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
index d93bde3105ef08a9ca88f92e85e76eaed3adc2dc..1d74ace119426f7f7a5576f81004b66a656aa99d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
@@ -4,13 +4,13 @@ sagittaire-58:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:68:67
@@ -40,9 +40,9 @@ sagittaire-58:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: XG052310087
+    serial: XG052310087
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
index 7b8d4fd2a78b6f8373d560a88da7ff09e0b4f0a1..3ac689a64e1548c71c65ad11cfd1deca3bf37c29 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
@@ -8,13 +8,13 @@ sagittaire-59:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:29:f8
@@ -42,9 +42,9 @@ sagittaire-59:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052081174
+    serial: XG052081174
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
index 3fecea77b7022ac6b33aa2a4df125a4d707cb0be..4e54c538271b73da400b6f123558f7f89d13eec5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -4,7 +4,7 @@ sagittaire-6:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:3e:ea
@@ -33,7 +33,7 @@ sagittaire-6:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-6:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052310124
+    serial: XG052310124
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
index e3d5537e61e47d17748acc4144bff5e42fa9d1cf..dbb24542c8d5cce66d59a28917da1c4cd11309e8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
@@ -4,7 +4,7 @@ sagittaire-60:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:6b:3b
@@ -33,16 +33,16 @@ sagittaire-60:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
   chassis:
-    serial_number: XG052310130
+    serial: XG052310130
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
index 90dc976ce016d6e664ab1b7f2dab9d7b87406ee6..c111a2f3057abc16450e4c3c5547ddcf6479de2c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
@@ -4,7 +4,7 @@ sagittaire-61:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -14,7 +14,7 @@ sagittaire-61:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:5d:fa
@@ -42,9 +42,9 @@ sagittaire-61:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052291007
+    serial: XG052291007
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
index a341b5a9582a2b0d6678c8a6f14defd0009aeaeb..2c62a148557d0ad23a405fe4566ce12fc92bce83 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
@@ -8,7 +8,7 @@ sagittaire-62:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-62:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:70:5a
@@ -46,9 +46,9 @@ sagittaire-62:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
index 28c1cc0446657b7356e6c53ffdadbec83c46c1cb..3eaf36ce524ecee196e3a564394bf9a05bf3ac18 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
@@ -4,7 +4,7 @@ sagittaire-63:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -14,7 +14,7 @@ sagittaire-63:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:5e:fb
@@ -42,9 +42,9 @@ sagittaire-63:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052291036
+    serial: XG052291036
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 2146435072
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
index c0a351ba06a13008a99f4fabb9901c91c5c1285b..cafb67e684020cdc0c2722d478c7791cf1522d11 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
@@ -8,13 +8,13 @@ sagittaire-64:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:31:7c
@@ -40,9 +40,9 @@ sagittaire-64:
       mac: 00:09:3d:12:31:7e
       ip: 172.17.49.64
   chassis:
-    serial_number: XG052291045
+    serial: XG052291045
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
index fbb9c0569bfc736cf6e21e84624008f7a1617687..64af1750c552fc320b7d2b74c130ea6a05a16155 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
@@ -8,13 +8,13 @@ sagittaire-65:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
       size: 73407868928
       rev: 2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:28:01
@@ -42,9 +42,9 @@ sagittaire-65:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052422296
+    serial: XG052422296
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
index 2e83dc8003367bb200f12aa17375a6c5cb9ad260..00caa50183143a1d9c6cd76a50a36f1d2705644d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
@@ -4,7 +4,7 @@ sagittaire-66:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:30:5e
@@ -29,7 +29,7 @@ sagittaire-66:
     bmc:
       mac: 00:09:3d:12:30:60
       ip: 172.17.49.66
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -42,9 +42,9 @@ sagittaire-66:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052420562
+    serial: XG052420562
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
index 96a05da2697ed7cb126641888da97e16719e8041..b29b9ec5af1759401ed98c042f7b2ddef2cbd271 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
@@ -8,13 +8,13 @@ sagittaire-67:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:28:a9
@@ -40,9 +40,9 @@ sagittaire-67:
       mac: 00:09:3d:12:28:ab
       ip: 172.17.49.67
   chassis:
-    serial_number: XG052422292
+    serial: XG052422292
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
index cfd42414f73ae22371a27379dee50870fa45753e..44e76ee436de0a54c892c2a310cfb3ae1c78cbf0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
@@ -8,7 +8,7 @@ sagittaire-68:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-68:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:27:f8
@@ -47,9 +47,9 @@ sagittaire-68:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
index 41d00f6e872cdeb8b4a633e816665917c2b9079e..016f4b43244c5219096942c82c37824522cafd8a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
@@ -4,13 +4,13 @@ sagittaire-69:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:40:a1
@@ -42,9 +42,9 @@ sagittaire-69:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052423581
+    serial: XG052423581
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
index 6c502304193d48a8617c10b8ef76fe94fb66e04d..f255f03aa454e99faae20fffdc80a0557e857806 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
@@ -4,7 +4,7 @@ sagittaire-7:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -14,7 +14,7 @@ sagittaire-7:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:7f:e9
@@ -40,9 +40,9 @@ sagittaire-7:
       mac: 00:09:3d:12:7f:eb
       ip: 172.17.49.7
   chassis:
-    serial_number: XG052422741
+    serial: XG052422741
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
index 9aec75f042945124a91327c2ceda82667fee648a..c591d9fb7ca2a367469bbd630acc290ba0cacf41 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
@@ -8,7 +8,7 @@ sagittaire-70:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-70:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:ea:28
@@ -46,9 +46,9 @@ sagittaire-70:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
index 886b2d96ef665c9408b5b6b116fe22d52021d468..f577cf15b67d4ceba02b2c093811f200ccccf22b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
@@ -8,7 +8,7 @@ sagittaire-71:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:db:b1
@@ -33,7 +33,7 @@ sagittaire-71:
     bmc:
       mac: 00:09:3d:11:db:b3
       ip: 172.17.49.71
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -47,9 +47,9 @@ sagittaire-71:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083258
+    serial: XG052083258
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
index bb33b1e52b13ab511a89e34451488fae7615b744..0e3257a860706670386de0acf281046f579a585c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
@@ -4,7 +4,7 @@ sagittaire-72:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-72:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:ae:fc
@@ -45,9 +45,9 @@ sagittaire-72:
       mac: 00:09:3d:11:ae:fe
       ip: 172.17.49.72
   chassis:
-    serial_number: XG052083198
+    serial: XG052083198
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
index e572673e32a5c4c2017a72472642430e58b6ca0a..9e3048e23a1a950015b7423a2b0c5661b6fcb61e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
@@ -8,7 +8,7 @@ sagittaire-73:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-73:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac:
@@ -47,9 +47,9 @@ sagittaire-73:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
index 6718903845781bb6788c615a83953ff61017228c..666ec5542413cd5c2137c0037269413cddea5276 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
@@ -4,7 +4,7 @@ sagittaire-74:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-74:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:db:ab
@@ -45,9 +45,9 @@ sagittaire-74:
       mac: 00:09:3d:11:db:ad
       ip: 172.17.49.74
   chassis:
-    serial_number: XG052083265
+    serial: XG052083265
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
index a9ace0a0a62bedb31dc49d09d523af8a5add51fb..ada8322aeab295446dd7b83bc93cc3ccb11719a8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
@@ -8,7 +8,7 @@ sagittaire-75:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-75:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:95:21
@@ -47,9 +47,9 @@ sagittaire-75:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
index 37b98f57751c9d3685817eb8d3156d27e72df6b6..fbc23f4ef9fcaff1ef08b44f02a67ab5ae58b980 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
@@ -8,7 +8,7 @@ sagittaire-76:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-76:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:c5:1f
@@ -47,9 +47,9 @@ sagittaire-76:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
index b5f16430a63f65291d340e2bd2e62d513dd635e2..919486b7fb28510d4176659100c30e2431f45ee9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
@@ -8,7 +8,7 @@ sagittaire-77:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-77:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:c5:2b
@@ -47,9 +47,9 @@ sagittaire-77:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG051642100
+    serial: XG051642100
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
index 300ab0f2e39c5fd2abaaf633a5fe79714ea4d1fc..21dace678984534c685db7124b265894631ab308 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
@@ -4,7 +4,7 @@ sagittaire-78:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-78:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:12:2b
@@ -45,9 +45,9 @@ sagittaire-78:
       mac: 00:09:3d:11:12:2d
       ip: 172.17.49.78
   chassis:
-    serial_number: XG052083164
+    serial: XG052083164
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
index 63732948edfa1a27feaadb663b93fa06bf60961f..65e7406a09839f96fe215199250806c36b7e5afb 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
@@ -4,7 +4,7 @@ sagittaire-79:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:11:cd:8b
@@ -33,7 +33,7 @@ sagittaire-79:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -47,9 +47,9 @@ sagittaire-79:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083120
+    serial: XG052083120
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
index ed2265ec831069fd4b892fce311885ff37cf909d..52629d86570036ab0b5d1897710cf99a03d4d3b6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
@@ -8,7 +8,7 @@ sagittaire-8:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: ST373207LC
       device: sda
@@ -19,7 +19,7 @@ sagittaire-8:
       device: sdb
       size: 73543163904
       rev: 104
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:6b:0e
@@ -47,9 +47,9 @@ sagittaire-8:
   supported_job_types:
     virtual: false
   chassis:
-    serial_number: XG052083161
+    serial: XG052083161
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   main_memory:
     ram_size: 17179869184
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
index 230b4c19fcecfaa267052d76b31b5b8934913ed9..b50a8004d44593bcf83b039fbf47518985c3335a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
@@ -4,7 +4,7 @@ sagittaire-9:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:7f:da
@@ -29,7 +29,7 @@ sagittaire-9:
     bmc:
       mac: 00:09:3d:12:7f:dc
       ip: 172.17.49.9
-  block_devices:
+  storage_devices:
     sda:
       model: MAT3073NC
       device: sda
@@ -40,9 +40,9 @@ sagittaire-9:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: XG052422764
+    serial: XG052422764
     manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
+    name: Sun Fire V20z
   supported_job_types:
     virtual: false
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
index 70d224ec9b8fdbd371956d6a950cdadde47330e7..cd5d5fb3a845731c64549d8e9b3d7a305a65b8d5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
@@ -19,12 +19,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SCSI
         driver: mptspi
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         rate: 1000000000
         bridged: false
@@ -60,7 +60,7 @@ nodes:
             url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php 
 
   sagittaire-[69-79]:
-    block_devices:
+    storage_devices:
       sdb:
         interface: SCSI
         driver: mptspi
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
index 45eee0c4b00721271c48639b90d950b735feb5a9..a36a76f772bfbf5fa70ea3eb6a7d209b7cd1d20e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -4,7 +4,7 @@ taurus-1:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/1
@@ -60,7 +60,7 @@ taurus-1:
     bmc:
       mac: d4:be:d9:fb:ec:f4
       ip: 172.17.48.1
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
@@ -73,9 +73,9 @@ taurus-1:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 8HTHD5J
+    serial: 8HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
index 70cf3e26147e05730268e01e889fdf04e61344b8..22bf062510bcf16f35edb7997a0e0f5efb07c1b1 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -4,7 +4,7 @@ taurus-10:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/10
@@ -60,7 +60,7 @@ taurus-10:
     bmc:
       mac: d4:be:d9:fb:50:b2
       ip: 172.17.48.10
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
@@ -71,9 +71,9 @@ taurus-10:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 4HTHD5J
+    serial: 4HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
index a7ecd66cf9a73691f52f5a072e445ef69cbdbebc..2f7cddd9df346fb7ecad534016adca9656e42381 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -8,7 +8,7 @@ taurus-11:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/11
@@ -64,16 +64,16 @@ taurus-11:
     bmc:
       mac: d4:be:d9:fb:4a:a4
       ip: 172.17.48.11
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
   chassis:
-    serial_number: JHTHD5J
+    serial: JHTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
index 21df8b75abb74c175d2730a51bf5c72aa5cc9f78..f8b0736885e0d81796ef67faf753a84ed3c82f64 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -8,13 +8,13 @@ taurus-12:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/12
@@ -71,9 +71,9 @@ taurus-12:
       mac: d4:be:d9:fb:ed:b8
       ip: 172.17.48.12
   chassis:
-    serial_number: GHTHD5J
+    serial: GHTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
index e1fb5951cf67e8d695709f922be02b3e7f141973..067b0cce71ee422e45c020479ff9771e7bc4467b 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -4,7 +4,7 @@ taurus-13:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/13
@@ -64,7 +64,7 @@ taurus-13:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
@@ -73,9 +73,9 @@ taurus-13:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: CHTHD5J
+    serial: CHTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
index e7a24d908c884095d609cd0a131775b9845b8585..205d8c3932284b4413006a7780216204cdeb357b 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
@@ -8,13 +8,13 @@ taurus-14:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/14
@@ -71,9 +71,9 @@ taurus-14:
       mac: d4:be:d9:f9:a3:4c
       ip: 172.17.48.14
   chassis:
-    serial_number: DHTHD5J
+    serial: DHTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
index f4138ed8595a1982dcfb56975021ddc76e7d6ae2..c1ea648ed8165c716b4c452ad757485463971808 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -4,13 +4,13 @@ taurus-15:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/15
@@ -73,9 +73,9 @@ taurus-15:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 9HTHD5J
+    serial: 9HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
index 097687e5a17e111fecbe464587f1f8a72aa2a8ea..bc57905f31879299ae4ad110e9dfbb732371658e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
@@ -4,13 +4,13 @@ taurus-16:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/16
@@ -71,9 +71,9 @@ taurus-16:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: BHTHD5J
+    serial: BHTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
index 04496901166ab406707f05f60c77c724703f42d7..bbbeb1d46b9eb0441c0e5d773aa03922c83154ef 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
@@ -8,7 +8,7 @@ taurus-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/2
@@ -64,16 +64,16 @@ taurus-2:
     bmc:
       mac: d4:be:d9:f9:a3:ea
       ip: 172.17.48.2
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
   chassis:
-    serial_number: 6HTHD5J
+    serial: 6HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
index 6938c2ea716a919abd985ff8ec83729ae411c5d8..fa22b5c8c802c0de4562d5c9ecda16a22d105aa6 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -4,7 +4,7 @@ taurus-3:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/3
@@ -64,7 +64,7 @@ taurus-3:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
@@ -73,9 +73,9 @@ taurus-3:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 7HTHD5J
+    serial: 7HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
index 12674dd9a9a05aae05dc540c3df079f82c1c0b55..6dbd0c3b946082e57e657b456f7933ba53ee68b8 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -4,7 +4,7 @@ taurus-4:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/4
@@ -60,7 +60,7 @@ taurus-4:
     bmc:
       mac: d4:be:d9:fb:e7:96
       ip: 172.17.48.4
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
@@ -73,9 +73,9 @@ taurus-4:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: FHTHD5J
+    serial: FHTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
index 619afb6907f4bcb37d42ba8e2f8404f0ebaa1935..5446e3432ab2812e347417c9d8dffeef7f336268 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -4,7 +4,7 @@ taurus-5:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/5
@@ -60,7 +60,7 @@ taurus-5:
     bmc:
       mac: d4:be:d9:fb:ed:38
       ip: 172.17.48.5
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
@@ -73,9 +73,9 @@ taurus-5:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 5HTHD5J
+    serial: 5HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
index e57c0d789a6f1c476f2fa9cd7df05aaa4a6a6ca0..9489891629b33c523d868a053c14e785bb284e77 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -8,7 +8,7 @@ taurus-6:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/6
@@ -64,16 +64,16 @@ taurus-6:
     bmc:
       mac: d4:be:d9:fb:ed:fe
       ip: 172.17.48.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
   chassis:
-    serial_number: HHTHD5J
+    serial: HHTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
index d1969fd148edd46ea12531f137fde698e22155c9..142539e3e13b342f77be58f5c4fdf748cb3de932 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -4,7 +4,7 @@ taurus-7:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/7
@@ -64,16 +64,16 @@ taurus-7:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
   chassis:
-    serial_number: 2HTHD5J
+    serial: 2HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
index daac815705d2ca937d2905c26893988690f6c0e7..b8a212e93b47ef1e6995c7c42987e9adaea38649 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -4,7 +4,7 @@ taurus-8:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/8
@@ -64,16 +64,16 @@ taurus-8:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
   chassis:
-    serial_number: 3HTHD5J
+    serial: 3HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
index ff811afd46b070afee87ea2b114cd64cae8ec7c1..137d7b70db7571b70223cb761c0b21f767c759e3 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -4,7 +4,7 @@ taurus-9:
     version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       switch_port: TenGigabitEthernet 0/9
@@ -64,16 +64,16 @@ taurus-9:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC H710
       device: sda
       size: 598879502336
       rev: 3.13
   chassis:
-    serial_number: 1JTHD5J
+    serial: 1JTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
index 6d8475e8f790fc1c244faa34b2064a498c2e7e61..ee267b5bc1994558857afce4aa1cae1721941f55 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -19,12 +19,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SCSI
         driver: megaraid_sas
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
index 5de61f2277b08a83901853966f2598aa096f0c54..8a98766f878652d32fea151e1ec4e1306852a38e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
@@ -21,7 +21,7 @@ nodes:
         - production
     operating_system:
       release: Jessie
-    block_devices:
+    storage_devices:
       sda:
         interface: SCSI
         driver: megaraid_sas
@@ -32,7 +32,7 @@ nodes:
         driver: megaraid_sas
         vendor: LSI Logic / Symbios Logic
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         enabled: true 
         mountable: true
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml.erb b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml.erb
index eaa072058d04f67df65e385d2622a34dc99330db..c949de097e566da037fa7f2bee1a432dce8a5b0d 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml.erb
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml.erb
@@ -1,7 +1,7 @@
 nodes:
 <% (1..16).each { |i| %>
   graoully-<%= i %>:
-    network_interfaces:
+    network_adapters:
       eth0: 
         mounted: true
         ip: 172.16.70.<%= i %>
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
index 89ace4cd7613c63d6d16d213d00bf04b4be7dab0..8205ee264751cad5427d0430308fcea676e86f4b 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -9,10 +9,10 @@ graoully-1:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3DYYH82
+    serial: 3DYYH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-1:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
index 773c0500ab4fc55cb3dc0eaa6aee03f5974fd52a..699573380b2f97472a731afcd82bcb0985027654 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -9,10 +9,10 @@ graoully-10:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3Z93J82
+    serial: 3Z93J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-10:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
index e6ba4500bc15dcea57175e1039dd07e027dd657c..8f1cef9fc1248ce1dd2cc8d6b236d310ab3fdacf 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -9,10 +9,10 @@ graoully-11:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3ZBZH82
+    serial: 3ZBZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-11:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.70.11
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
index fa1be0f2574141ba76c1b54d4c86f6054ddad5b9..b697c03d53216d34ff7267450e1cbe6e20d96e59 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -9,10 +9,10 @@ graoully-12:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3DW1J82
+    serial: 3DW1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-12:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
index 6eec8e73475b075015d381f40f539303b7904886..315f7ab9c3eb65693ee08d3dc0fc25634a2e098e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -9,10 +9,10 @@ graoully-13:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3DV0J82
+    serial: 3DV0J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-13:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.70.13
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
index 8cb060674f7e9a4bef9d05e348551a1023252e48..6e30ead23e11c9d2959b753dc20f7cbc1bf211e8 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
@@ -9,10 +9,10 @@ graoully-14:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3F32J82
+    serial: 3F32J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-14:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.70.14
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
index cb7689c1839ee1adef39ec56f9b63fc01e4dfe51..54b3dfa888b531ae83edb01db2bfa16c604d8225 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -9,10 +9,10 @@ graoully-15:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3DX1J82
+    serial: 3DX1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-15:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
index eb999f0ef5a153f2327bad67c95df17c03c181f3..a158ce989b111b6728518e4883b53b338d16f0dd 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -9,10 +9,10 @@ graoully-16:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3F4ZH82
+    serial: 3F4ZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-16:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
index cbb7c6e0e0fc63a8872d179c0afb648e69eb03f3..8c38a1e624ddbc4253ba031213f4d44ea5a19406 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -9,10 +9,10 @@ graoully-2:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3DY1J82
+    serial: 3DY1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-2:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
index f989beda421b2a756bc94be73bf8307badfa5ef1..b7ec2113dc8d09413e9c35bfaa916f6f142904b4 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -9,10 +9,10 @@ graoully-3:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3F03J82
+    serial: 3F03J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-3:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
index c6870e230b769633302a4c097b7deba2b8f47d53..500171bd13031a4230fa27211f451fe8913e3a57 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -9,10 +9,10 @@ graoully-4:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3DZ3J82
+    serial: 3DZ3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-4:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
index d57a01354b288695a950d211f97ac847a343fd1b..489d8f6379c4888bf6e529076c73d8784cb6b1b0 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -9,10 +9,10 @@ graoully-5:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3ZD3J82
+    serial: 3ZD3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-5:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
index c144888a392e9092bc6a799b46dd65743c80e955..33d692cbfc1044a8ea47aaa5d8939ddfade50c2b 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -9,10 +9,10 @@ graoully-6:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3ZG1J82
+    serial: 3ZG1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-6:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
index 47b940e62356a70b5e8ebc160e84f8c9e981190a..a6260c6a9a89b4c8f875e7030c5fdcde792129e8 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -9,10 +9,10 @@ graoully-7:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3ZF3J82
+    serial: 3ZF3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-7:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
index 4ed534910d0894f16d89ba37fc1304b583ea26d2..fc2619e626589f494cc63faedf744c630753b16e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -9,10 +9,10 @@ graoully-8:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3ZH0J82
+    serial: 3ZH0J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-8:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.70.8
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
index 0da9b56a1c309b6f871e946547c4d91bfcf9c693..6535a9427e6e20f320945d56750cdfed5cb0109c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -9,10 +9,10 @@ graoully-9:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3ZG4J82
+    serial: 3ZG4J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ graoully-9:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.70.9
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml b/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
index ad29f0272a9f65be553f080b9f03e8bbb33106bd..2723a8fed6759062734b3856708969ce88fe8bfc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
@@ -30,12 +30,12 @@ nodes:
      release: Jessie
      version: "8.2"
      kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA II
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene_manual.yaml b/input/grid5000/sites/nancy/clusters/graphene/graphene_manual.yaml
index cbf4a8062b2ad4ebf34e5816baa5a5f32244d756..50d469c4ce8088ebe2954241978427cb374e1930 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/graphene_manual.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/graphene_manual.yaml
@@ -1,7 +1,7 @@
 ---
 nodes:
   graphene-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/2
@@ -14,7 +14,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 2
   graphene-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/1
@@ -27,7 +27,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 3
   graphene-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/4
@@ -40,7 +40,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 4
   graphene-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/3
@@ -53,7 +53,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 5
   graphene-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/6
@@ -66,7 +66,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 1
   graphene-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/5
@@ -79,7 +79,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 2
   graphene-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/8
@@ -92,7 +92,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 3
   graphene-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/12
@@ -105,7 +105,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 4
   graphene-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/11
@@ -118,7 +118,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 5
   graphene-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/7
@@ -131,7 +131,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 6
   graphene-11:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/10
@@ -144,7 +144,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 7
   graphene-12:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/9
@@ -157,7 +157,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 9
   graphene-13:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/14
@@ -170,7 +170,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 10
   graphene-14:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/13
@@ -183,7 +183,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 11
   graphene-15:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/16
@@ -196,7 +196,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 12
   graphene-16:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/15
@@ -209,7 +209,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 13
   graphene-17:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/18
@@ -222,7 +222,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 14
   graphene-18:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/17
@@ -235,7 +235,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 15
   graphene-19:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/20
@@ -248,7 +248,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 9
   graphene-20:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/19
@@ -261,7 +261,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 10
   graphene-21:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/22
@@ -274,7 +274,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 11
   graphene-22:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/21
@@ -287,7 +287,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 12
   graphene-23:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/24
@@ -300,7 +300,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 13
   graphene-24:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/23
@@ -313,7 +313,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 14
   graphene-25:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/26
@@ -326,7 +326,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 15
   graphene-26:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/25
@@ -339,7 +339,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 17
   graphene-27:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/28
@@ -352,7 +352,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 18
   graphene-28:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/27
@@ -365,7 +365,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 19
   graphene-29:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/30
@@ -378,7 +378,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 20
   graphene-30:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/29
@@ -391,7 +391,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 21
   graphene-31:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/32
@@ -404,7 +404,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 22
   graphene-32:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/31
@@ -417,7 +417,7 @@ nodes:
       pdu_name: graphene-pdu1.nancy.grid5000.fr
       pdu_position: 23
   graphene-33:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/34
@@ -430,7 +430,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 17
   graphene-34:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/33
@@ -443,7 +443,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 18
   graphene-35:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/36
@@ -456,7 +456,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 19
   graphene-36:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/35
@@ -469,7 +469,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 20
   graphene-37:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/38
@@ -482,7 +482,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 21
   graphene-38:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/37
@@ -495,7 +495,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 22
   graphene-39:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene1
         switch_port: Gi1/0/40
@@ -508,7 +508,7 @@ nodes:
       pdu_name: graphene-pdu2.nancy.grid5000.fr
       pdu_position: 23
   graphene-40:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/1
@@ -521,7 +521,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 3
   graphene-41:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/2
@@ -534,7 +534,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 4
   graphene-42:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/3
@@ -547,7 +547,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 5
   graphene-43:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/4
@@ -560,7 +560,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 1
   graphene-44:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/5
@@ -573,7 +573,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 2
   graphene-45:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/6
@@ -586,7 +586,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 3
   graphene-46:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/7
@@ -599,7 +599,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 4
   graphene-47:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/8
@@ -612,7 +612,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 9
   graphene-48:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/9
@@ -625,7 +625,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 10
   graphene-49:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/10
@@ -638,7 +638,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 11
   graphene-50:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/11
@@ -651,7 +651,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 12
   graphene-51:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/12
@@ -664,7 +664,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 13
   graphene-52:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/13
@@ -677,7 +677,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 14
   graphene-53:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/14
@@ -690,7 +690,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 15
   graphene-54:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/15
@@ -703,7 +703,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 5
   graphene-55:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/16
@@ -716,7 +716,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 6
   graphene-56:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/17
@@ -729,7 +729,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 11
   graphene-57:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/18
@@ -742,7 +742,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 12
   graphene-58:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/19
@@ -755,7 +755,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 13
   graphene-59:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/20
@@ -768,7 +768,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 14
   graphene-60:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/21
@@ -781,7 +781,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 15
   graphene-61:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/22
@@ -794,7 +794,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 17
   graphene-62:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/23
@@ -807,7 +807,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 18
   graphene-63:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/24
@@ -820,7 +820,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 19
   graphene-64:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/25
@@ -833,7 +833,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 20
   graphene-65:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/26
@@ -846,7 +846,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 21
   graphene-66:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/27
@@ -859,7 +859,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 22
   graphene-67:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/28
@@ -872,7 +872,7 @@ nodes:
       pdu_name: graphene-pdu3.nancy.grid5000.fr
       pdu_position: 23
   graphene-68:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/29
@@ -885,7 +885,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 17
   graphene-69:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/30
@@ -898,7 +898,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 18
   graphene-70:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/31
@@ -911,7 +911,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 19
   graphene-71:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/32
@@ -924,7 +924,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 20
   graphene-72:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/33
@@ -937,7 +937,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 21
   graphene-73:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/34
@@ -950,7 +950,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 22
   graphene-74:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene2
         switch_port: Gi1/0/35
@@ -963,7 +963,7 @@ nodes:
       pdu_name: graphene-pdu4.nancy.grid5000.fr
       pdu_position: 23
   graphene-75:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/2
@@ -976,7 +976,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 6
   graphene-76:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/1
@@ -989,7 +989,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 7
   graphene-77:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/4
@@ -1002,7 +1002,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 9
   graphene-78:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/3
@@ -1015,7 +1015,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 10
   graphene-79:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/6
@@ -1028,7 +1028,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 11
   graphene-80:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/5
@@ -1041,7 +1041,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 12
   graphene-81:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/8
@@ -1054,7 +1054,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 13
   graphene-82:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/7
@@ -1067,7 +1067,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 14
   graphene-83:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/10
@@ -1080,7 +1080,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 15
   graphene-84:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/9
@@ -1093,7 +1093,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 9
   graphene-85:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/12
@@ -1106,7 +1106,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 10
   graphene-86:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/11
@@ -1119,7 +1119,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 11
   graphene-87:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/14
@@ -1132,7 +1132,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 12
   graphene-88:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/13
@@ -1145,7 +1145,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 13
   graphene-89:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/16
@@ -1158,7 +1158,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 14
   graphene-90:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/15
@@ -1171,7 +1171,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 15
   graphene-91:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/18
@@ -1184,7 +1184,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 17
   graphene-92:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/17
@@ -1197,7 +1197,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 18
   graphene-93:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/20
@@ -1210,7 +1210,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 19
   graphene-94:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/19
@@ -1223,7 +1223,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 20
   graphene-95:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/22
@@ -1236,7 +1236,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 21
   graphene-96:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/21
@@ -1249,7 +1249,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 22
   graphene-97:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/24
@@ -1262,7 +1262,7 @@ nodes:
       pdu_name: graphene-pdu5.nancy.grid5000.fr
       pdu_position: 23
   graphene-98:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/23
@@ -1275,7 +1275,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 17
   graphene-99:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/26
@@ -1288,7 +1288,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 18
   graphene-100:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/25
@@ -1301,7 +1301,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 19
   graphene-101:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/28
@@ -1314,7 +1314,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 20
   graphene-102:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/27
@@ -1327,7 +1327,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 21
   graphene-103:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/30
@@ -1340,7 +1340,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 22
   graphene-104:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene3
         switch_port: Gi1/0/29
@@ -1353,7 +1353,7 @@ nodes:
       pdu_name: graphene-pdu6.nancy.grid5000.fr
       pdu_position: 23
   graphene-105:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/1
@@ -1366,7 +1366,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 1
   graphene-106:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/2
@@ -1379,7 +1379,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 2
   graphene-107:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/3
@@ -1392,7 +1392,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 3
   graphene-108:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/4
@@ -1405,7 +1405,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 4
   graphene-109:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/5
@@ -1418,7 +1418,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 5
   graphene-110:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/6
@@ -1431,7 +1431,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 6
   graphene-111:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/7
@@ -1444,7 +1444,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 7
   graphene-112:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/8
@@ -1457,7 +1457,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 8
   graphene-113:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/9
@@ -1470,7 +1470,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 11
   graphene-114:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/10
@@ -1483,7 +1483,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 12
   graphene-115:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/11
@@ -1496,7 +1496,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 13
   graphene-116:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/12
@@ -1509,7 +1509,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 14
   graphene-117:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/13
@@ -1522,7 +1522,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 17
   graphene-118:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/14
@@ -1535,7 +1535,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 18
   graphene-119:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/15
@@ -1548,7 +1548,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 19
   graphene-120:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/16
@@ -1561,7 +1561,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 20
   graphene-121:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/17
@@ -1574,7 +1574,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 21
   graphene-122:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/18
@@ -1587,7 +1587,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 22
   graphene-123:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/19
@@ -1600,7 +1600,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 23
   graphene-124:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/20
@@ -1613,7 +1613,7 @@ nodes:
       pdu_name: graphene-pdu7.nancy.grid5000.fr
       pdu_position: 24
   graphene-125:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/21
@@ -1626,7 +1626,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 1
   graphene-126:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/22
@@ -1639,7 +1639,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 2
   graphene-127:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/23
@@ -1652,7 +1652,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 3
   graphene-128:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/24
@@ -1665,7 +1665,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 4
   graphene-129:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/25
@@ -1678,7 +1678,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 5
   graphene-130:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/26
@@ -1691,7 +1691,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 6
   graphene-131:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/27
@@ -1704,7 +1704,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 7
   graphene-132:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/28
@@ -1717,7 +1717,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 8
   graphene-133:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/29
@@ -1730,7 +1730,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 11
   graphene-134:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/30
@@ -1743,7 +1743,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 12
   graphene-135:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/31
@@ -1756,7 +1756,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 13 
   graphene-136:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/32
@@ -1769,7 +1769,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 14 
   graphene-137:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/33
@@ -1782,7 +1782,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 15 
   graphene-138:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/34
@@ -1795,7 +1795,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 18
   graphene-139:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/35
@@ -1808,7 +1808,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 19
   graphene-140:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/36
@@ -1821,7 +1821,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 20
   graphene-141:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/37
@@ -1834,7 +1834,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 21
   graphene-142:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/38
@@ -1847,7 +1847,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 22
   graphene-143:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/39
@@ -1860,7 +1860,7 @@ nodes:
       pdu_name: graphene-pdu8.nancy.grid5000.fr
       pdu_position: 23
   graphene-144:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: sgraphene4
         switch_port: Gi1/0/40
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
index e87a657197c63a439371e0607c792785c101d6f6..74b3824daac6e77d91cf725dc8e6c0cc18ec975f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
@@ -4,14 +4,14 @@ graphene-1:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:81
@@ -89,6 +89,6 @@ graphene-1:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390003
+    serial: 1009390003
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
index b03c3f83237e62290386e66f85aecd262a151cd8..8201801d3fa0c568055ccaaa74da3ac6fee7d01a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
@@ -4,7 +4,7 @@ graphene-10:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-10:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6d
@@ -89,6 +89,6 @@ graphene-10:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390012
+    serial: 1009390012
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
index 5c6657da81d87b930d29494c244a1c1b19042cc7..19bd0f9da2cd7662fa09005aa5a609fb1e4560dc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
@@ -8,14 +8,14 @@ graphene-100:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0d
@@ -89,6 +89,6 @@ graphene-100:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390102
+    serial: 1009390102
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
index a34bb39894b47f20079159b952d764c9c6870e52..ff8e07644b7acce25f7be5a19cf707c7837006d3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
@@ -8,7 +8,7 @@ graphene-101:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d9
@@ -62,7 +62,7 @@ graphene-101:
     bmc:
       mac: 00:e0:81:d5:06:a3
       ip: 172.17.64.101
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-101:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390103
+    serial: 1009390103
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
index e3a413cf1a5d3f32878175fb5c6a4938ba8eb5ec..c7c4acc0dd5dd3f15d926c54f260e0466f13a9e4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
@@ -4,7 +4,7 @@ graphene-102:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:71
@@ -62,7 +62,7 @@ graphene-102:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-102:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390104
+    serial: 1009390104
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
index 459d83448c00cd7eaee8176dee902839bddde76f..03da9c2449b6b8d54bd08851f646bfbfd13fe45c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
@@ -8,14 +8,14 @@ graphene-103:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:49
@@ -89,6 +89,6 @@ graphene-103:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390105
+    serial: 1009390105
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
index 651323cee652c60077d008f8e9323c7217ebb03c..43235d0dc4769010b02531d435e48e0a57b7c216 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
@@ -8,7 +8,7 @@ graphene-104:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:15
@@ -62,7 +62,7 @@ graphene-104:
     bmc:
       mac: 00:e0:81:d5:07:67
       ip: 172.17.64.104
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-104:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390106
+    serial: 1009390106
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
index 2a2f897ff12c6c7c4d855827e7356b39e9821a48..d1351b3e26caf75da17d132239843c162785828e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
@@ -4,7 +4,7 @@ graphene-105:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-105:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:19
@@ -89,6 +89,6 @@ graphene-105:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390107
+    serial: 1009390107
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
index 9fff3b2d722bfcaea41e716b4afd897be0b1e459..29c5a981c71dcff031718677badb2c6b13b070c8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
@@ -4,14 +4,14 @@ graphene-106:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ad
@@ -89,6 +89,6 @@ graphene-106:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390108
+    serial: 1009390108
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
index 74175de3058a152a596d044576ee4ed9dd04f548..d95633dd7a2dffa5ea308ce0200952a27b6d3762 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
@@ -8,14 +8,14 @@ graphene-107:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3d
@@ -89,6 +89,6 @@ graphene-107:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390109
+    serial: 1009390109
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
index 37911f105984ae0530d70bc9efec440fef901175..bc1ef0bad3dfaa13680ccd09833e2b7538af1c53 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
@@ -4,7 +4,7 @@ graphene-108:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:21
@@ -58,7 +58,7 @@ graphene-108:
     bmc:
       mac: 00:e0:81:d5:07:17
       ip: 172.17.64.108
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-108:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390110
+    serial: 1009390110
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
index eae4630f66c4683ff839273f0e19a348c53bff73..580065337faf578c5d1be89a46527feaaf14bd93 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
@@ -4,7 +4,7 @@ graphene-109:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-109:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:25
@@ -89,6 +89,6 @@ graphene-109:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390111
+    serial: 1009390111
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
index 37d0b02508df5a7f7a53cb5d4571b25513186dd7..dc7804c100b818bd41501b8d147f767d68ec9394 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
@@ -4,7 +4,7 @@ graphene-11:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-11:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:71
@@ -89,6 +89,6 @@ graphene-11:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390013
+    serial: 1009390013
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
index 1ecc38dddb0f0b14fa6e0ea92ec1275def8d20e9..b26b4d1514196e4efe681b0863022e05a8453830 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
@@ -4,7 +4,7 @@ graphene-110:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:a9
@@ -58,7 +58,7 @@ graphene-110:
     bmc:
       mac: 00:e0:81:d5:07:6f
       ip: 172.17.64.110
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-110:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390112
+    serial: 1009390112
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
index 9fa2027a5b3f07cd102a8ddf4a8fd8efbffab19c..a9531adf4004ed6bf97d3694e12a63c7ec03b69a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
@@ -8,14 +8,14 @@ graphene-111:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:91
@@ -89,6 +89,6 @@ graphene-111:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390113b
+    serial: 1009390113b
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
index 96d6f7056927e16c92f18548405e9748ba09625d..65871e4e0c924825b0eccf8225d241981dfec759 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
@@ -4,7 +4,7 @@ graphene-112:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-112:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9d
@@ -89,6 +89,6 @@ graphene-112:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390114
+    serial: 1009390114
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
index 0634f4d1ce9ba2ef8467a0b8b51811c6d4ee36be..a25a44d71d24b731e13b1937afb616cfc80088d0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
@@ -4,7 +4,7 @@ graphene-113:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b5
@@ -58,7 +58,7 @@ graphene-113:
     bmc:
       mac: 00:e0:81:d5:07:bf
       ip: 172.17.64.113
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-113:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390115
+    serial: 1009390115
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
index 8bfb65c2c079d1d53b50310fda8d0554a545e4bc..a849fac0257e98a481512aaba3cd73617f67a447 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
@@ -8,7 +8,7 @@ graphene-114:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c5
@@ -62,7 +62,7 @@ graphene-114:
     bmc:
       mac: 00:e0:81:d5:06:b3
       ip: 172.17.64.114
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-114:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390116
+    serial: 1009390116
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
index d7bc3f49e850f086c1948d71cab308e38b3984f6..39f85929490c22a255b0537d75027dde61d16872 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
@@ -4,7 +4,7 @@ graphene-115:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:05
@@ -62,7 +62,7 @@ graphene-115:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-115:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390117
+    serial: 1009390117
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
index 854adc9a4c93c3566c731556f252a300bad69cf4..cd9b34eb06d798c423ebd709de8d66e4d983805b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
@@ -4,7 +4,7 @@ graphene-116:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-116:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1d
@@ -89,6 +89,6 @@ graphene-116:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390118
+    serial: 1009390118
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
index 7be3cb9dcfe81655b06e5c75b66c5305a339eaff..994cf1b9bb7095bd85118c1aeef12cb8dd79f738 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
@@ -4,7 +4,7 @@ graphene-117:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-117:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:25
@@ -89,6 +89,6 @@ graphene-117:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390119
+    serial: 1009390119
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
index 264466815fd818b78906e3ccb37f687447f95ecd..9866f32ceff740673ebd680f3142d00fad4ca882 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
@@ -8,14 +8,14 @@ graphene-118:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d9
@@ -89,6 +89,6 @@ graphene-118:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390120
+    serial: 1009390120
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
index c826820e0c3accd18a69c442bdfcf759a20e3390..cf6eef89609a0a8ddf871b1fdc3e51a8dd4fe039 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
@@ -8,7 +8,7 @@ graphene-119:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:19
@@ -62,7 +62,7 @@ graphene-119:
     bmc:
       mac: 00:e0:81:d5:06:f3
       ip: 172.17.64.119
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-119:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390121
+    serial: 1009390121
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
index a52d87ba75b4a98d4457e09b4484403eb3c8fcf4..1e228f5be0990c841133ca1b9e515c4ff8635c85 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
@@ -8,14 +8,14 @@ graphene-12:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:81
@@ -89,6 +89,6 @@ graphene-12:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390014
+    serial: 1009390014
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
index 199e1fa7df0abbfdf4c78f72d28984c0d8114299..5668018e38020620ec01792a83d8d7d5fb02f61a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
@@ -4,7 +4,7 @@ graphene-120:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:29
@@ -58,7 +58,7 @@ graphene-120:
     bmc:
       mac: 00:e0:81:d5:08:af
       ip: 172.17.64.120
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-120:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390122
+    serial: 1009390122
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
index 799290ac3ebcba4b83a65dd3a65236ae9e27daad..30eb3a278ef92a4cdbc6c04db5d5fc0b4d9fa8ef 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
@@ -4,7 +4,7 @@ graphene-121:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2d
@@ -58,7 +58,7 @@ graphene-121:
     bmc:
       mac: 00:e0:81:d5:07:3b
       ip: 172.17.64.121
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-121:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390123
+    serial: 1009390123
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
index 25e5a0fcb479ac09f0d57dd29f5c5586ae17b3f8..b45dee2dc9674b46f1fe89f088e6c85da978e4d8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
@@ -4,7 +4,7 @@ graphene-122:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-122:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:85
@@ -89,6 +89,6 @@ graphene-122:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390124
+    serial: 1009390124
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
index 29676e58cef67cb8f0235a5400e43cfb9759e299..c13348ad0ceacdfbf0a784c2101e19dee9f25f6a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
@@ -4,7 +4,7 @@ graphene-123:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-123:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:19
@@ -89,6 +89,6 @@ graphene-123:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390125
+    serial: 1009390125
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
index 31fc43bea4d0dd2c111c42c1bf2f546789039e71..d9d640294a90d5ad969e38f84c72819cdaa490e5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
@@ -4,7 +4,7 @@ graphene-124:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61 
@@ -62,7 +62,7 @@ graphene-124:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-124:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390126
+    serial: 1009390126
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
index 86792fb1487f6e48a8244012e8f233afd7b8ee17..e799059102d315667f21fd68f8b4ccb0ce5e7db4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
@@ -8,14 +8,14 @@ graphene-125:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:91
@@ -89,6 +89,6 @@ graphene-125:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390127
+    serial: 1009390127
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
index 326dded7de5b66bb264b0054d60f53f82832be3a..0c79caabe1c85803d145a3516a392d686c3a301a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
@@ -4,14 +4,14 @@ graphene-126:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:51
@@ -89,6 +89,6 @@ graphene-126:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390128
+    serial: 1009390128
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
index 0f224f24061d0b39e2de6f99ca642c794b6fd0c6..b9993f4705681a63f0b153b8dadc6a2495b2d2c4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
@@ -4,7 +4,7 @@ graphene-127:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:85
@@ -58,7 +58,7 @@ graphene-127:
     bmc:
       mac: 00:e0:81:d5:08:43
       ip: 172.17.64.127
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-127:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390129
+    serial: 1009390129
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
index a6764a48de7ac17cc824257df3a27c83d461d80e..7498ed639e47e48f7a3a7430f6f475ee3943f004 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
@@ -8,7 +8,7 @@ graphene-128:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:15
@@ -62,7 +62,7 @@ graphene-128:
     bmc:
       mac: 00:e0:81:d5:08:e7
       ip: 172.17.64.128
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-128:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390130
+    serial: 1009390130
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
index 3cbe2a455e1d7758d364358d715a2f971b0c2141..0ce31678d261a81a276e29ff5cbfcc2a05ad667e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
@@ -4,7 +4,7 @@ graphene-129:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-129:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:05
@@ -89,6 +89,6 @@ graphene-129:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390131
+    serial: 1009390131
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
index cabecc48d6aae43dbecb4ae3051cbaf982c5b35e..4922629cce790dd14acd08ce2a214dcdda48143d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
@@ -4,7 +4,7 @@ graphene-13:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:85
@@ -58,7 +58,7 @@ graphene-13:
     bmc:
       mac: 00:e0:81:d5:06:ff
       ip: 172.17.64.13
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-13:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390015
+    serial: 1009390015
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
index 20322967dc05804633328d4cf83576e7da532423..04db2ff79fdbf7b994b5426cccbdc7fe51582006 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
@@ -4,14 +4,14 @@ graphene-130:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:09
@@ -89,6 +89,6 @@ graphene-130:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390132b
+    serial: 1009390132b
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
index fca75e063b80ca5641c803912ab993476aafc9be..9cc4be2f03a88bc98ce51371f1dcd803599be479 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
@@ -4,14 +4,14 @@ graphene-131:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d 
@@ -89,6 +89,6 @@ graphene-131:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390133b
+    serial: 1009390133b
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
index cabe945b66e4c51a7ad59b4e955ed08a00884a48..6dd57bfc475a52b67306ac710aa9435187e7a603 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
@@ -8,14 +8,14 @@ graphene-132:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0d
@@ -89,6 +89,6 @@ graphene-132:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390134
+    serial: 1009390134
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
index f8f48c6e3f335d0b2d4987ac8b03bb6c76d4ff16..0d7c0a02ad2dda91c77719c9a25e80723ce30712 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
@@ -4,14 +4,14 @@ graphene-133:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b3
@@ -89,6 +89,6 @@ graphene-133:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390135
+    serial: 1009390135
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
index 87b99d808d813649c5dde24d09be72605d3b14cb..219820683ff2b4566439f28e3e1850fbd1b9ad8b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
@@ -4,7 +4,7 @@ graphene-134:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:4f
@@ -62,7 +62,7 @@ graphene-134:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-134:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390136
+    serial: 1009390136
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
index a0a5e9eac2f334fb9082471d906e3d006a965758..fedea5cec0821a416958163fdcd77e371d2a85e4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
@@ -4,14 +4,14 @@ graphene-135:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c7
@@ -89,6 +89,6 @@ graphene-135:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390137
+    serial: 1009390137
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
index 4a89dce7816d5a14bd03e548a99c82370590a129..a3a934e9657e269515a1aa1cef6f99be1652cef2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
@@ -4,7 +4,7 @@ graphene-136:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-136:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:47
@@ -89,6 +89,6 @@ graphene-136:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390138
+    serial: 1009390138
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
index debd89c5071b0c4e9455116eec30ceb4ab719694..2403dd1b11fee93cc4385ff1ac8859efc4d6197a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
@@ -4,14 +4,14 @@ graphene-137:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:47
@@ -89,6 +89,6 @@ graphene-137:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390139
+    serial: 1009390139
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
index 33c037f59cfe688e0407fa11d3a611d650910e7d..9c8d40664631981bee87e05311182443be8e3449 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
@@ -4,7 +4,7 @@ graphene-138:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c3
@@ -58,7 +58,7 @@ graphene-138:
     bmc:
       mac: 00:e0:81:d5:08:c7
       ip: 172.17.64.138
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-138:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390140b
+    serial: 1009390140b
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
index 4f328ddc0a014411534ccc16eed77300d25785d1..0240f5394dccbba1364fc96fcd8c14858bed1937 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
@@ -8,7 +8,7 @@ graphene-139:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:ff
@@ -62,7 +62,7 @@ graphene-139:
     bmc:
       mac: 00:e0:81:d5:07:83
       ip: 172.17.64.139
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-139:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390141
+    serial: 1009390141
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
index 695f0742e5840fda187ecb6b69a0bfbb9a99f509..32d0caf98a8a102f39d5c20c7da3c78161d63cf7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
@@ -8,7 +8,7 @@ graphene-14:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e1
@@ -62,7 +62,7 @@ graphene-14:
     bmc:
       mac: 00:e0:81:d5:06:d7
       ip: 172.17.64.14
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-14:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390016
+    serial: 1009390016
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
index bee1351c32d3ce503a8f2528009c7af5db425c6b..74b9ef26a4d555fe9d62d2d1bed2c4a40c4127f2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
@@ -4,7 +4,7 @@ graphene-140:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:9f
@@ -62,7 +62,7 @@ graphene-140:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-140:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390142
+    serial: 1009390142
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
index 1b303e04c20df4f4180f18fe169533f7337ae13b..5c2d05ab7d07ec0c1f47cbf312a1a0a594907025 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
@@ -4,7 +4,7 @@ graphene-141:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-141:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:93
@@ -89,6 +89,6 @@ graphene-141:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390143
+    serial: 1009390143
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
index 21aacc5d682e3e36ba7fb803415fa1324c21ca51..1b7483a577c77a26890d7905bb3bc9455bec52c6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
@@ -4,7 +4,7 @@ graphene-142:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a7
@@ -62,7 +62,7 @@ graphene-142:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-142:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390144
+    serial: 1009390144
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
index 2fac02b0932d228867bd74f39711ed88250030e2..14a4f9ca58ca86ce670a2c933554e7b9073f4d6f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
@@ -8,7 +8,7 @@ graphene-143:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:97
@@ -62,7 +62,7 @@ graphene-143:
     bmc:
       mac: 00:e0:81:d5:07:97
       ip: 172.17.64.143
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-143:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390145
+    serial: 1009390145
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
index b528fc23eb852423ade86c4f98babeef4acd0e00..4aafcd3bb49277d7a0109546f4adba24f8837dea 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
@@ -4,7 +4,7 @@ graphene-144:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-144:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5b
@@ -89,6 +89,6 @@ graphene-144:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390146
+    serial: 1009390146
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
index cb4b7298f9c6a6e513048fc0471a1b206dbaf041..1aea05b5946f2cfe6908dbf540b89136d0f1f976 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
@@ -8,7 +8,7 @@ graphene-15:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c9
@@ -62,7 +62,7 @@ graphene-15:
     bmc:
       mac: 00:e0:81:d5:07:eb
       ip: 172.17.64.15
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-15:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390017
+    serial: 1009390017
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
index 17a9686b728d3dc7889bc5e2ee421e233e35964c..680949817b7a7b29f65dc76de86317d92c5835aa 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
@@ -8,14 +8,14 @@ graphene-16:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:75
@@ -89,6 +89,6 @@ graphene-16:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390018
+    serial: 1009390018
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
index 0ae52de507869466f43d7d215bf418e316fc15ac..1cdc0b6eb4e167dee6390c3c18d0635e7826c6fe 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
@@ -8,7 +8,7 @@ graphene-17:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:71
@@ -62,7 +62,7 @@ graphene-17:
     bmc:
       mac: 00:e0:81:d5:08:ab
       ip: 172.17.64.17
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-17:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390019
+    serial: 1009390019
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
index 8958b053bc9e078d880c43bf475d87ec8ce1e75e..a1cc75fee5bf6fa4133b07cfae3c67098deaf6f2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
@@ -4,7 +4,7 @@ graphene-18:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7d
@@ -58,7 +58,7 @@ graphene-18:
     bmc:
       mac: 00:e0:81:d5:08:3f
       ip: 172.17.64.18
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-18:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390020
+    serial: 1009390020
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
index 167df9002211a48feaf1458b6d513bba70b40d09..a50b2b77a9eb281ad5c9ca11a4e533e0c8856ea0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
@@ -8,7 +8,7 @@ graphene-19:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:55
@@ -62,7 +62,7 @@ graphene-19:
     bmc:
       mac: 00:e0:81:d5:08:b7
       ip: 172.17.64.19
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-19:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390021
+    serial: 1009390021
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
index 0935e7fae1468d763548ecd16be8472f7d2b9c2f..a035d2dd72e1b8a5d9178c2674bb18728044d3d9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
@@ -4,14 +4,14 @@ graphene-2:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5d
@@ -89,6 +89,6 @@ graphene-2:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390004
+    serial: 1009390004
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
index eaf4fa13bbbbb6f7c486ea6d9ed9d631d54f30cd..3df147fbb10abffa9920a930902945b043ef291c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
@@ -4,7 +4,7 @@ graphene-20:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:45
@@ -58,7 +58,7 @@ graphene-20:
     bmc:
       mac: 00:e0:81:d5:07:6b
       ip: 172.17.64.20
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-20:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390022
+    serial: 1009390022
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
index b9f0dea5acc0c52074eeae9e4ba6aca07bf4712a..00140c2eca325297f0dc0465f6d6cfebea6c82af 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
@@ -4,7 +4,7 @@ graphene-21:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6d 
@@ -62,7 +62,7 @@ graphene-21:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-21:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390023b
+    serial: 1009390023b
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
index c0ad9d4f851edce314c7f7a22a48948d11377123..3812b5cc2f66b61ed96204215322b9c098e94672 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
@@ -8,14 +8,14 @@ graphene-22:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:79
@@ -89,6 +89,6 @@ graphene-22:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390024
+    serial: 1009390024
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
index 0cf186bba7a02a17dd64d17c1d6061ccf8f186d4..760db0edb4a7104e71f2dadfec6e98a89e9c7955 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
@@ -4,7 +4,7 @@ graphene-23:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-23:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:65
@@ -89,6 +89,6 @@ graphene-23:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390025
+    serial: 1009390025
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
index d9ea55526dc1726978caf4e14f36de82c2a46d02..dd1e8650a3184954493eabd1cab50cdaf3cf0ee8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
@@ -4,7 +4,7 @@ graphene-24:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:cd
@@ -62,7 +62,7 @@ graphene-24:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-24:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390026
+    serial: 1009390026
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
index 5794f0d20c1f0456ae9e51a49e3de3385f760f73..5a6fae38d2796ca1676bedaf3374b4d6ecb68b40 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
@@ -4,7 +4,7 @@ graphene-25:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a5
@@ -62,7 +62,7 @@ graphene-25:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-25:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390027
+    serial: 1009390027
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
index bf3c7338226af3bcad400ad0198088202e175bed..8f60736b29f56b0aa695d062794ad528dfba9c8f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
@@ -4,14 +4,14 @@ graphene-26:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9d
@@ -89,6 +89,6 @@ graphene-26:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390028
+    serial: 1009390028
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
index f66182cf455fa01b8419a7e42a4e4265760f0d2c..ef140b89a8573be5c8145b394eeb02d4124572f7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
@@ -4,7 +4,7 @@ graphene-27:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:89
@@ -58,7 +58,7 @@ graphene-27:
     bmc:
       mac: 00:e0:81:d5:07:5f
       ip: 172.17.64.27
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-27:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390029
+    serial: 1009390029
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
index 112f87735c2c6421769ba5fb82e8da20b045855c..f0943e53a97e11a95e849f470ef28b6f7da9a1e1 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
@@ -4,7 +4,7 @@ graphene-28:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8d
@@ -58,7 +58,7 @@ graphene-28:
     bmc:
       mac: 00:e0:81:d5:07:f3
       ip: 172.17.64.28
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-28:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390030
+    serial: 1009390030
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
index c42e6f8ff79c983fc7b822e0a6f8d0fabd928273..1ff94dae01d611ea81e57a24a27ef1546b0c61b0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
@@ -8,14 +8,14 @@ graphene-29:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:dd
@@ -89,6 +89,6 @@ graphene-29:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390031
+    serial: 1009390031
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
index 01df1800ef32310358acad26a01d95f3294730af..eb0d0a1477f094c53dc8818b7634fcb2f5c80bdd 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
@@ -8,14 +8,14 @@ graphene-3:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:59
@@ -89,6 +89,6 @@ graphene-3:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 605634005
+    serial: 605634005
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
index a868b39c7aab0ad532b82cbe60e7fd815c69f697..ce85097c7aab199a0d73e07eb948e2a6cf2b0b6e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
@@ -8,14 +8,14 @@ graphene-30:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:79
@@ -89,6 +89,6 @@ graphene-30:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390032
+    serial: 1009390032
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
index 2133697543a98611fc9b653728b93c39bdba224e..79688db27388ddcfae0bb24337e6e47623400125 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
@@ -4,7 +4,7 @@ graphene-31:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1d
@@ -58,7 +58,7 @@ graphene-31:
     bmc:
       mac: 00:e0:81:d5:06:63
       ip: 172.17.64.31
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-31:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390033
+    serial: 1009390033
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
index 99bc4e8d53366e10ac4b7098c5e13038a9984b94..9ebb8a3c38f28817cbd869b1fc852e529e45ba4d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
@@ -4,7 +4,7 @@ graphene-32:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7d
@@ -58,7 +58,7 @@ graphene-32:
     bmc:
       mac: 00:e0:81:d5:06:cb
       ip: 172.17.64.32
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-32:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390034
+    serial: 1009390034
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
index 5b4a807fa41df78bb2b3bd5ea6c84a6025c20d2f..96b32c390f0674afbaba8d2b14a2f79d612383f8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
@@ -4,14 +4,14 @@ graphene-33:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:d9
@@ -89,6 +89,6 @@ graphene-33:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390035
+    serial: 1009390035
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
index 6ae23b9bebd9c6d382aa2c0149fd8b8e955c87a4..7fbbde4e5df3a06f6cc5af874de1f165475ae4c1 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
@@ -4,7 +4,7 @@ graphene-34:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-34:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:65
@@ -89,6 +89,6 @@ graphene-34:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390036
+    serial: 1009390036
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
index a28a23a8220d84299daea41b49e959295f938b59..dd1cb7f4b29f1c843c7f8af0306692fc46a893e2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
@@ -8,14 +8,14 @@ graphene-35:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:ef 
@@ -89,6 +89,6 @@ graphene-35:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390037
+    serial: 1009390037
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
index 29a1ac6598b2b940a46b70a73d115dfff056dd94..0e33c44575e46f013188ed42d4ffe85a7363d988 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
@@ -8,14 +8,14 @@ graphene-36:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b9
@@ -89,6 +89,6 @@ graphene-36:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390038
+    serial: 1009390038
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
index d022420f665c9766fdd707d38556a7b3081dd545..7e809348f1e8168469f55da3610e0b173b0bf520 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
@@ -8,14 +8,14 @@ graphene-37:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c5
@@ -89,6 +89,6 @@ graphene-37:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390039
+    serial: 1009390039
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
index 7d6a6da8652929163c4dc3df7c3676de3f957f81..259f78b28ad39d49d76c395db4bf97cf3f7cf2ac 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
@@ -8,7 +8,7 @@ graphene-38:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b1
@@ -62,7 +62,7 @@ graphene-38:
     bmc:
       mac: 00:e0:81:d5:07:33
       ip: 172.17.64.38
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-38:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390040
+    serial: 1009390040
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
index ebedbe109fad7cbabbf970971840d0a8092764f1..688567f4eae34a44a282c0a8cdcedc38b3c48540 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
@@ -8,7 +8,7 @@ graphene-39:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c1
@@ -62,7 +62,7 @@ graphene-39:
     bmc:
       mac: 00:e0:81:d5:07:df
       ip: 172.17.64.39
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-39:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390041
+    serial: 1009390041
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
index cdd22a9c8773b645beabbc7d6cd96fc8d0df0fde..d15cf02cbfd8ae42189eaee63c76248bc190337c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
@@ -8,7 +8,7 @@ graphene-4:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd 
@@ -62,7 +62,7 @@ graphene-4:
     bmc:
       mac: 00:e0:81:d5:08:57
       ip: 172.17.64.4
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-4:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390096b
+    serial: 1009390096b
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
index acf487cfbe2136a1ce6a66052fe59b63993d8bbb..5587d6cc50396fa9d561828e01efe6d2ce0d4167 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
@@ -8,7 +8,7 @@ graphene-40:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd 
@@ -62,7 +62,7 @@ graphene-40:
     bmc:
       mac: 00:e0:81:d5:06:f7
       ip: 172.17.64.40
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-40:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390042
+    serial: 1009390042
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
index e5197f792787b396c5607267bd82f73876772d2a..94717cf1f8450cf5320f66bb5e40b1930b53e3a8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
@@ -4,7 +4,7 @@ graphene-41:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:99
@@ -58,7 +58,7 @@ graphene-41:
     bmc:
       mac: 00:e0:81:d5:07:af
       ip: 172.17.64.41
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-41:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390043
+    serial: 1009390043
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
index 7e034e8441e47e7da5d94e7d8e2d17c497794f5b..bfaf65ee0e5a3559b9af7ff18806f92dd289d955 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
@@ -4,7 +4,7 @@ graphene-42:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a9
@@ -58,7 +58,7 @@ graphene-42:
     bmc:
       mac: 00:e0:81:d5:07:8b
       ip: 172.17.64.42
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-42:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390044
+    serial: 1009390044
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
index 5e083d20d83449003cda233b5b0dcde8b7e98f58..aae599a40ff61267b7b0a720a193f90e807d24a0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
@@ -4,14 +4,14 @@ graphene-43:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ad
@@ -89,6 +89,6 @@ graphene-43:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390045
+    serial: 1009390045
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
index 447756a0781ab8db9a29086392819af9f5e663f7..f10d7b01861d72122a2dd4d6e403b1a29ef58767 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
@@ -4,7 +4,7 @@ graphene-44:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b5
@@ -62,7 +62,7 @@ graphene-44:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-44:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390046
+    serial: 1009390046
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
index 558f0193c5b76241fb9f8d54af43f1a84deb3e63..035a3dd23fc4f0ff20b4179932cb25cc115cc4dc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
@@ -8,7 +8,7 @@ graphene-45:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:21
@@ -62,7 +62,7 @@ graphene-45:
     bmc:
       mac: 00:e0:81:d5:06:5f
       ip: 172.17.64.45
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDP72503 
       device: sda
@@ -89,6 +89,6 @@ graphene-45:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390047
+    serial: 1009390047
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
index 804d965b1eeb5e14a2fc969375cc891c84a1b924..bf4042519679275ce24bd0b0b43658a4d9ea2bf3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
@@ -4,7 +4,7 @@ graphene-46:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d5
@@ -58,7 +58,7 @@ graphene-46:
     bmc:
       mac: 00:e0:81:d5:06:97
       ip: 172.17.64.46
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-46:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390048
+    serial: 1009390048
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
index 0b70f91266fd7a0246c2def1602961e3811b8c6b..44ee67d3547ebb9c17e3068d71af97951298da73 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
@@ -4,14 +4,14 @@ graphene-47:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e5
@@ -89,6 +89,6 @@ graphene-47:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390049
+    serial: 1009390049
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
index cfd3e13bac264c0c931842fd6869fd90b2ee9a9e..4e0f6e29042765eae40e5fcaf03a9aebcbdbc484 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
@@ -4,7 +4,7 @@ graphene-48:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:dd
@@ -58,7 +58,7 @@ graphene-48:
     bmc:
       mac: 00:e0:81:d5:06:eb
       ip: 172.17.64.48
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-48:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390050
+    serial: 1009390050
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
index 4ca17bd27dc65bb84ed7e67aa83bd5036442a3ea..706cb4ca690c73f7b28a0186720f60e6a70087c3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
@@ -4,14 +4,14 @@ graphene-49:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d1
@@ -89,6 +89,6 @@ graphene-49:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390051
+    serial: 1009390051
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
index 1067bd66713e764db67957dda3059ba4c8c077b5..d9e5eca81e136907b3aa1c7953cf2f5f162325cd 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
@@ -4,7 +4,7 @@ graphene-5:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:79
@@ -58,7 +58,7 @@ graphene-5:
     bmc:
       mac: 00:e0:81:d5:08:bb
       ip: 172.17.64.5
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-5:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390007
+    serial: 1009390007
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
index 99f90429122b1190b0fc04c7c4a5f8801e8db500..6bac76e99d71fd770cd440fcaf3580dad160fd83 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
@@ -4,7 +4,7 @@ graphene-50:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-50:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f1
@@ -89,6 +89,6 @@ graphene-50:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390052
+    serial: 1009390052
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
index f43d911a04aeb3a453780c860dc7197f1182d26b..0f837deb30f1ce7c0c28676b622bfa0e2b40cb5c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
@@ -4,7 +4,7 @@ graphene-51:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-51:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e9
@@ -89,6 +89,6 @@ graphene-51:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390053
+    serial: 1009390053
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
index 5283be4d7c45d3eb779ce9fbde0dd081d300536a..798080adb4d1900378c3bd81e3dc4fa93578da1e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
@@ -4,7 +4,7 @@ graphene-52:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-52:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f9
@@ -89,6 +89,6 @@ graphene-52:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390054
+    serial: 1009390054
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
index accec03d296561d7b6c845a91d1ed344008581df..88212f342c6b4399accc7f027f57e31f1abc87f9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
@@ -4,14 +4,14 @@ graphene-53:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:09
@@ -89,6 +89,6 @@ graphene-53:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390055
+    serial: 1009390055
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
index 4305556ad595e9503e0913a301c73133531416fb..b3d5b936464a7be7eb34a05ae3fe125e258e4e56 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
@@ -4,7 +4,7 @@ graphene-54:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:15
@@ -62,7 +62,7 @@ graphene-54:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-54:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390056
+    serial: 1009390056
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
index 51f5bf7d8d20383def50c55ed5f8a603c1f07502..3055431253488c9b3f6c8227bcbfd174f4998563 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
@@ -8,7 +8,7 @@ graphene-55:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0d
@@ -62,7 +62,7 @@ graphene-55:
     bmc:
       mac: 00:e0:81:d5:08:93
       ip: 172.17.64.55
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-55:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390057
+    serial: 1009390057
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
index 852eb4fc902f3ef7c01a41e26c1cc2cecf97b545..cf9682a5cbe31410ba11e6bd2ac46bb6eaf96b66 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
@@ -4,7 +4,7 @@ graphene-56:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:89
@@ -62,7 +62,7 @@ graphene-56:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-56:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390058
+    serial: 1009390058
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
index c391c5a81c8ab12c4c0f52bbacd4bc269f9485f7..f4b04877f8ec6d6a53b82c86342c584d84081e4f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
@@ -8,7 +8,7 @@ graphene-57:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8d
@@ -62,7 +62,7 @@ graphene-57:
     bmc:
       mac: 00:e0:81:d5:08:a3
       ip: 172.17.64.57
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-57:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390059
+    serial: 1009390059
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
index 4c7222c4fa1c68150f16acedce3877945ce2b60b..7a7ca3097c43afd3ae67b42370dfbcf016493a47 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
@@ -4,7 +4,7 @@ graphene-58:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9d
@@ -58,7 +58,7 @@ graphene-58:
     bmc:
       mac: 00:e0:81:d5:07:37
       ip: 172.17.64.58
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDP72503
       device: sda
@@ -89,6 +89,6 @@ graphene-58:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390060
+    serial: 1009390060
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
index 775b13239ea4f53feeb5ae214ff14d27505f86b1..7c792caff4147e93117ef9f639d40450aedb4b6c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
@@ -4,7 +4,7 @@ graphene-59:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-59:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:95
@@ -89,6 +89,6 @@ graphene-59:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390061
+    serial: 1009390061
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
index c99dafcb76664510d2cc33dfd69022da4bbfd162..efb00c2de3c724a53b1c1170324d790654d2ffd2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
@@ -4,14 +4,14 @@ graphene-6:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7d
@@ -89,6 +89,6 @@ graphene-6:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390008
+    serial: 1009390008
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
index 3be52ef14032c7dc2b668ad132a81c24b9e8f49b..bab285c7b97800e9474cc09f943d6ed6d9847110 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
@@ -4,7 +4,7 @@ graphene-60:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:85
@@ -62,7 +62,7 @@ graphene-60:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-60:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390062
+    serial: 1009390062
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
index 7157ee4d7827cd395e169b96ccba5c4b0bf1f780..a79278bb59765fe0ed57c9be172ef659cb78bff3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
@@ -4,7 +4,7 @@ graphene-61:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-61:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:91
@@ -89,6 +89,6 @@ graphene-61:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390063
+    serial: 1009390063
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
index 2f7ab7ea926307f29988e30c122ce12880634bd1..27e84a49426275377ef3e9f1517b1087da433dd2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
@@ -8,7 +8,7 @@ graphene-62:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:99
@@ -62,7 +62,7 @@ graphene-62:
     bmc:
       mac: 00:e0:81:d5:07:c7
       ip: 172.17.64.62
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-62:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390064
+    serial: 1009390064
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
index 05a767658059fa83a4475ada94c80acdb0c89c85..dd8870dcd31c3bc809836eafb274450e48622830 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
@@ -4,7 +4,7 @@ graphene-63:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-63:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:81
@@ -89,6 +89,6 @@ graphene-63:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390065
+    serial: 1009390065
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
index 789c9d3a60b4c0cf071a6211c5c9cc69bc2a1fd6..75343a6729cc5a3b31ad317ce937f8f2822a9ad4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
@@ -4,14 +4,14 @@ graphene-64:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a1
@@ -89,6 +89,6 @@ graphene-64:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390066
+    serial: 1009390066
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
index 8a5e05979201e565e5bd5b28738c2757784fa364..79477dc209b56eb0e2fde78182743ab4578dd741 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
@@ -8,7 +8,7 @@ graphene-65:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d9
@@ -62,7 +62,7 @@ graphene-65:
     bmc:
       mac: 00:e0:81:d5:07:47
       ip: 172.17.64.65
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-65:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390067
+    serial: 1009390067
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
index 720de02a4f6057a816c1930ff9cd9ce7888c14ea..98ebe9c630beb4c4b096a75a09d98ccffe9c30af 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
@@ -4,7 +4,7 @@ graphene-66:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:49
@@ -62,7 +62,7 @@ graphene-66:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-66:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390068
+    serial: 1009390068
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
index da9d215824bbbd92ad7279936ad480fe6fca860f..b90750630439e70668f92a356bfbe702ca1e4f74 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
@@ -4,7 +4,7 @@ graphene-67:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b9
@@ -58,7 +58,7 @@ graphene-67:
     bmc:
       mac: 00:e0:81:d5:07:b3
       ip: 172.17.64.67
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-67:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390069
+    serial: 1009390069
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
index d2ae5b53bc31de1beab562c615b4e7a6acd32212..d17ae3141beafa8b4b972927a391598f2fc7ba9f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
@@ -4,7 +4,7 @@ graphene-68:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-68:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:91
@@ -89,6 +89,6 @@ graphene-68:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390070
+    serial: 1009390070
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
index 3e5614954b76145741efc3163d232503aeea320c..c7f7b7de4b7331f4b21a54a50686dc4001ebfad7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
@@ -8,14 +8,14 @@ graphene-69:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c1
@@ -89,6 +89,6 @@ graphene-69:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390071
+    serial: 1009390071
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
index b95aba34eae86cb4205d3f071f07e133fbeb178e..eb0534407aa06d2aee4b9b6d94aed95ef318be57 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
@@ -8,14 +8,14 @@ graphene-7:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:61
@@ -89,6 +89,6 @@ graphene-7:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390009
+    serial: 1009390009
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
index e7fd8f4987d808256c6f3c55fa7469234200a45c..164e21cdc431ce02e08741ff46ae041ab78ab0cd 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
@@ -4,7 +4,7 @@ graphene-70:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:11
@@ -62,7 +62,7 @@ graphene-70:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-70:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390072
+    serial: 1009390072
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
index 95ab1b881eec18f834ee9cac325f244ea77ce578..fa8f81c0b5674cafa0b2a944d4d7e8578a8d1250 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
@@ -4,7 +4,7 @@ graphene-71:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ed
@@ -62,7 +62,7 @@ graphene-71:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-71:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390073
+    serial: 1009390073
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
index cc9bcb0b44f55a30cf1ff215a89206285e2c2ed9..e1d22094d0d0f860a6ac147e5eb083a150f50344 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
@@ -4,14 +4,14 @@ graphene-72:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:95
@@ -89,6 +89,6 @@ graphene-72:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390074
+    serial: 1009390074
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
index a3a6b294a44d660dda12d97382c5922dc9546af8..1c10ad2f16e4a604548ff1e5aab52c617e4f4cb7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
@@ -4,7 +4,7 @@ graphene-73:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fd
@@ -58,7 +58,7 @@ graphene-73:
     bmc:
       mac: 00:e0:81:d5:07:43
       ip: 172.17.64.73
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-73:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390075
+    serial: 1009390075
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
index a5bbd72090bd825076d3a1f4038330ce9b2546e2..220e9b16f1620dffd9ba24d7672a04b9c85a0d6c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
@@ -4,14 +4,14 @@ graphene-74:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:dd
@@ -89,6 +89,6 @@ graphene-74:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390076
+    serial: 1009390076
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
index 4c668d21b878058a90a21fd81bf7557c0afbc8a5..bbaa8344b440eddb589cfea0002298bed4972898 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
@@ -4,7 +4,7 @@ graphene-75:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-75:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e5
@@ -89,6 +89,6 @@ graphene-75:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390077
+    serial: 1009390077
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
index 8c46ed9edeb4ff22e790023e075e9bac304c1612..0f6f5f73f0de5e04d7788533e99b7e7c4fe6815b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
@@ -8,14 +8,14 @@ graphene-76:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d5
@@ -89,6 +89,6 @@ graphene-76:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390078
+    serial: 1009390078
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
index 6d07af8f5ec77a39dacd12755e223bf927e75e07..8d1bb1f28f2be68545f329e66fed21ddf265e2f1 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
@@ -4,7 +4,7 @@ graphene-77:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e1
@@ -58,7 +58,7 @@ graphene-77:
     bmc:
       mac: 00:e0:81:d5:07:a3
       ip: 172.17.64.77
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-77:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390079
+    serial: 1009390079
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
index d670247f29cb33815771110e53f92cbd50cef749..45e7477a32b0f3b84ce6a59e7ce1cd242fb831a9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
@@ -4,7 +4,7 @@ graphene-78:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:01
@@ -62,7 +62,7 @@ graphene-78:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-78:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390080
+    serial: 1009390080
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
index de729adc0faab389ce2486d549c1e2451d619438..2b67cb399ca18c4ac68d180b43d28a6ec8cb4dfd 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
@@ -4,7 +4,7 @@ graphene-79:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f5
@@ -62,7 +62,7 @@ graphene-79:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-79:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390081
+    serial: 1009390081
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
index b45a017eb8171f7d551c6e56ae2e337cb16bc043..16e868f2df3354efa21cfc0a4513d747af458e2f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
@@ -4,7 +4,7 @@ graphene-8:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:75
@@ -62,7 +62,7 @@ graphene-8:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-8:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390010
+    serial: 1009390010
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
index a33a8f1149e79a2c179ffc62f0f3ada413e884db..cd6e717eb72373eb72549576ca329d6b30fe6417 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
@@ -4,7 +4,7 @@ graphene-80:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d1
@@ -62,7 +62,7 @@ graphene-80:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-80:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390082
+    serial: 1009390082
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
index 0a16a201e7ec635f5b1d49860bc073b1709fa023..9ee0eb7139b2ad9a8f5f887706bd74345686140c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
@@ -8,7 +8,7 @@ graphene-81:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a9
@@ -62,7 +62,7 @@ graphene-81:
     bmc:
       mac: 00:e0:81:d5:07:27
       ip: 172.17.64.81
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-81:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390083
+    serial: 1009390083
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
index 86c822ee2dc83bc585d72650bd829a323c39ca6d..be9d22816b9cbd499715940ddfb6c8594f79dcf6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
@@ -4,7 +4,7 @@ graphene-82:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:95
@@ -58,7 +58,7 @@ graphene-82:
     bmc:
       mac: 00:e0:81:d5:07:b7
       ip: 172.17.64.82
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-82:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390084
+    serial: 1009390084
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
index c143c6ef2030bc01a30c7e2bdc0f88b7a442893a..2da2316a6f113392ec69f1533a4351dcea0a3f7b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
@@ -8,14 +8,14 @@ graphene-83:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a5
@@ -89,6 +89,6 @@ graphene-83:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390085
+    serial: 1009390085
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
index be19e7c028260298731a03e86ec7adacb7b3e98e..dc1cd27c2fe77dcff1ecb527627c8d93430e1c85 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
@@ -8,7 +8,7 @@ graphene-84:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9d
@@ -62,7 +62,7 @@ graphene-84:
     bmc:
       mac: 00:e0:81:d5:07:1b
       ip: 172.17.64.84
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-84:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390086
+    serial: 1009390086
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
index e1c35854ae01ee6a0a3629b038c670f9bfea5e31..9df2fe1ad4a5fe96e0787c107345fe9e1b649197 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
@@ -4,7 +4,7 @@ graphene-85:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:99
@@ -62,7 +62,7 @@ graphene-85:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-85:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390087
+    serial: 1009390087
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
index 66b189198391d94ccd43bbbaad2f045b91076327..6a13b12f6b15a83895b366f539ac76c3f48534e7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
@@ -4,7 +4,7 @@ graphene-86:
     version: V7.04
     release_date: 02/10/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a1
@@ -62,7 +62,7 @@ graphene-86:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-86:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390088
+    serial: 1009390088
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
index 54d81b7e4cdcbf97412e45da59545613cdb762e2..a5052b78bfb2a300ef13220b4a545d3f815ff167 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
@@ -4,7 +4,7 @@ graphene-87:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ad
@@ -58,7 +58,7 @@ graphene-87:
     bmc:
       mac: 00:e0:81:d5:07:5b
       ip: 172.17.64.87
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-87:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390089
+    serial: 1009390089
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
index 39e0b32f6948b2ad97ccc6e843b599416c5602b5..8bd0b85b879714a391049c81f1e1599bf8677c84 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
@@ -4,14 +4,14 @@ graphene-88:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b1
@@ -89,6 +89,6 @@ graphene-88:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390090
+    serial: 1009390090
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
index 852fcabf8c3d27e94202cac398432e7a03bb5221..235e947c28992518886e23db0260274bf6cf1ac4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
@@ -4,7 +4,7 @@ graphene-89:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ed
@@ -62,7 +62,7 @@ graphene-89:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-89:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390091
+    serial: 1009390091
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
index d84f79c1489e958d47bc99dfecd781738992e8c7..a8fa3d6cf37154bdb0908925b855108210b5bdbd 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
@@ -8,14 +8,14 @@ graphene-9:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:69
@@ -89,6 +89,6 @@ graphene-9:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390011
+    serial: 1009390011
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
index a7187ec443db848308b0f74db2862a8f83eb39a3..b8b8458479ef62882394b02895b7066f6be5afd7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
@@ -4,14 +4,14 @@ graphene-90:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:09
@@ -89,6 +89,6 @@ graphene-90:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390092
+    serial: 1009390092
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
index 9ae97d81c5548523f736ee671e006bdb9b870c84..6284d1611ceecd6a5b38e011059a2182925f1bbe 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
@@ -4,7 +4,7 @@ graphene-91:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d1
@@ -58,7 +58,7 @@ graphene-91:
     bmc:
       mac: 00:e0:81:d5:06:df
       ip: 172.17.64.91
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-91:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390093
+    serial: 1009390093
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
index e27a8719adf6862769020abac0d5299e6870f5ca..094edc8a0ebeaa71e68e4000c6322f9356a41b31 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
@@ -8,14 +8,14 @@ graphene-92:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e5
@@ -89,6 +89,6 @@ graphene-92:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390094
+    serial: 1009390094
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
index 16f13e944eb54bdf03fddc54357671c4c8fa33cb..52d7c00c59d93112b336bfb840d041ad56e01da0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
@@ -4,7 +4,7 @@ graphene-93:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ad
@@ -62,7 +62,7 @@ graphene-93:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-93:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390095
+    serial: 1009390095
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
index f789bd1efedcd29b6db89b1a27951a0885a7b259..0e5c789c370ee2f9ae461246406dcfb5212d2d10 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
@@ -8,7 +8,7 @@ graphene-94:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:95
@@ -62,7 +62,7 @@ graphene-94:
     bmc:
       mac: 00:e0:81:d5:07:93
       ip: 172.17.64.94
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-94:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390096
+    serial: 1009390096
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
index 01397690c0b7a3b679e14ea0d375cb3c62625e6e..641582cb487747bfb3d3dd2bc845201120a2c7f4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
@@ -4,7 +4,7 @@ graphene-95:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:95
@@ -58,7 +58,7 @@ graphene-95:
     bmc:
       mac: 00:e0:81:d5:06:c3
       ip: 172.17.64.95
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-95:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390097
+    serial: 1009390097
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
index c84be20bced346375be7a1cc7db89480253aa5df..e8fae35f1cc4fbd480221284d2e0b6fefb042c18 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
@@ -4,14 +4,14 @@ graphene-96:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9d
@@ -89,6 +89,6 @@ graphene-96:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390098
+    serial: 1009390098
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
index 40772c071150a3d55fdab07446b354d422efa225..5c6fda37d4b8a6ff55668265b68444407ec239a5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
@@ -4,7 +4,7 @@ graphene-97:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -15,7 +15,7 @@ graphene-97:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d5
@@ -89,6 +89,6 @@ graphene-97:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390099
+    serial: 1009390099
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
index af6641855b0ed2e466049fa7f7472a962422f422..77d39452e981c89b58d97bec5ccd787ddf7d2be7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
@@ -8,14 +8,14 @@ graphene-98:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
       size: 320072933376
       rev: A3EA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:99
@@ -89,6 +89,6 @@ graphene-98:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390100
+    serial: 1009390100
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
index a6a7430c39db2f95b222ac617db87c20ebd2f433..471e767029dfd843f4dd98d5cccc0e5c9ee90a97 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
@@ -4,7 +4,7 @@ graphene-99:
     version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b1
@@ -62,7 +62,7 @@ graphene-99:
     kernel: 3.16.0-4-amd64
     name: debian
     version: "8.2"
-  block_devices:
+  storage_devices:
     sda:
       model: Hitachi HDS72103
       device: sda
@@ -89,6 +89,6 @@ graphene-99:
     platform_type: x86_64
     smt_size: 4
   chassis:
-    serial_number: 1009390101
+    serial: 1009390101
     manufacturer: TYAN
-    product_name: S5501
+    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
index ba9e28b7e665090fa3126d64a346ca1308dbca41..6999c7fe75527e262d1021a0c2c799c3f079f845 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
@@ -25,13 +25,13 @@ nodes:
       release: Jessie
       version: "8.2"
       kernel: 3.16.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SCSI
         driver: megaraid_sas
         storage: HDD
         vendor: null
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: false
         vendor: Broadcom
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
index 843fce12eed4ca323624c167572cd226c73ca4c8..2a87cf5c0a2696d64194aacdb8c8564e0247c807 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -6,7 +6,7 @@ graphique-1:
     vendor: Dell Inc.
     version: 1.0
     release_date: 08/28/2014
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 299439751168
@@ -26,14 +26,14 @@ graphique-1:
     cache_l2: 262144
     cache_l3: 15728640
   chassis:
-    serial_number: BYGMJ32
+    serial: BYGMJ32
     manufacturer: Dell Inc.
-    product_name: PowerEdge R730
+    name: PowerEdge R730
   architecture:
     smp_size: 2
     smt_size: 12
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       driver: bnx2x
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
index 0cf88b3fe57cde070d9672698f0af38595bc2f5d..9f5bbcc91d8654b582f29df9e44f4fb1ca0c84c6 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -1,10 +1,10 @@
 ---
 graphique-2:
   chassis:
-    serial_number: 7YTRV42
+    serial: 7YTRV42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R730
-  network_interfaces:
+    name: PowerEdge R730
+  network_adapters:
     eth0:
       interface: Ethernet
       driver: bnx2x
@@ -59,7 +59,7 @@ graphique-2:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 15728640
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 299439751168
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
index e05ff14899abe298a45daf256057a6a03484d5cc..42b5e8c7adf4453250aa118de442c778a753431c 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
@@ -3,9 +3,9 @@ graphique-3:
   main_memory:
     ram_size: 68719476736
   chassis:
-    serial_number: 9ZTRV42
+    serial: 9ZTRV42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R730
+    name: PowerEdge R730
   processor:
     clock_speed: 3200000000
     instruction_set: x86-64
@@ -25,7 +25,7 @@ graphique-3:
     vendor: Dell Inc.
     version: 1.0
     release_date: 08/28/2014
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 299439751168
@@ -33,7 +33,7 @@ graphique-3:
       rev: 4.24
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       driver: bnx2x
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
index 6c7ae0154f917ee2ee15ccbad1a62713b8eb5b34..40eaec2a2c7e8e459dbb76c81e8024b4c553b02d 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
@@ -19,13 +19,13 @@ graphique-4:
     smp_size: 2
     smt_size: 12
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 299439751168
       model: PERC H330
       rev: 4.24
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       driver: bnx2x
@@ -67,9 +67,9 @@ graphique-4:
       ip: 172.17.67.4
       mac: 18:fb:7b:9b:91:6d
   chassis:
-    serial_number: HYTRV42
+    serial: HYTRV42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R730
+    name: PowerEdge R730
   bios:
     vendor: Dell Inc.
     version: 1.0
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
index aa74e028d8bf9b8051c70016f1b35bbf836e27a2..4c1682e39c9f9a18dbaa5d29156b2a25453dbc4a 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -2,7 +2,7 @@
 graphique-5:
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       driver: bnx2x
@@ -58,16 +58,16 @@ graphique-5:
     smp_size: 2
     smt_size: 12
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 299439751168
       model: PERC H330
       rev: 4.24
   chassis:
-    serial_number: BXTRV42
+    serial: BXTRV42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R730
+    name: PowerEdge R730
   main_memory:
     ram_size: 68719476736
   bios:
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
index ccbe4ec2397612fd21fcb0327a24ce38779948b8..2c00198c5b06f912091583fd123fd29c56d21e50 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
@@ -1,6 +1,6 @@
 ---
 graphique-6:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 299439751168
@@ -24,16 +24,16 @@ graphique-6:
     version: 1.0
     release_date: 08/28/2014
   chassis:
-    serial_number: HZSY752
+    serial: HZSY752
     manufacturer: Dell Inc.
-    product_name: PowerEdge R730
+    name: PowerEdge R730
   supported_job_types:
     virtual: ivt
   architecture:
     smp_size: 2
     smt_size: 24
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       driver: bnx2x
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
index ac83b3ef67b42f6d5b7307afd779f846f95afb02..c6e39e0a28333ef16dc7dd939ad4b4131d5b8289 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
@@ -26,7 +26,7 @@ nodes:
       release: Jessie
       version: "8.2"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA II
         driver: megaraid_sas
@@ -37,7 +37,7 @@ nodes:
         driver: megaraid_sas
         storage: SSD
         vendor: null
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite_manual.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite_manual.yaml
index 68ff5bd4166bb3e728ef9a9faad637d484bf1b69..96c698f02686d3baf5769824e4d6c07e92ce89f0 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite_manual.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_manual.yaml
@@ -1,7 +1,7 @@
 ---
 nodes:
   graphite-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nancy
         switch_port: 121
@@ -24,7 +24,7 @@ nodes:
       mic_count: 1
       mic_model: 7120P
   graphite-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nancy
         switch_port: 122
@@ -47,7 +47,7 @@ nodes:
       mic_count: 1
       mic_model: 7120P
   graphite-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nancy
         switch_port: 123
@@ -70,7 +70,7 @@ nodes:
       mic_count: 1
       mic_model: 7120P
   graphite-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nancy
         switch_port: 124
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
index 85ee4889390e531bd2cdea8324aa68ff7e434ab5..d442153f266108c85aace60dcc337931197e6d06 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -9,10 +9,10 @@ graphite-1:
     version: 2.5
     release_date: 01/28/2015
   chassis:
-    serial_number: 27Q7NZ1
+    serial: 27Q7NZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  block_devices:
+    name: PowerEdge R720
+  storage_devices:
     sda:
       device: sda
       size: 300069052416
@@ -29,7 +29,7 @@ graphite-1:
     virtual: ivt
   main_memory:
     ram_size: 270582939648
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
index 90c17e61f7b3e9bb84390f274ea720f7e2228c7f..7a86322fb48b07d90acce9a2f43aeb98b0c74f3a 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -9,10 +9,10 @@ graphite-2:
     version: 2.5
     release_date: 01/28/2015
   chassis:
-    serial_number: B6Q7NZ1
+    serial: B6Q7NZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  block_devices:
+    name: PowerEdge R720
+  storage_devices:
     sda:
       device: sda
       size: 300069052416
@@ -29,7 +29,7 @@ graphite-2:
     virtual: ivt
   main_memory:
     ram_size: 270582939648
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
index e83ba6d4151fb3fed2fd4bb51bade2db58471255..62db9b98df118a821ef97d5be91e349d17751c2f 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -9,10 +9,10 @@ graphite-3:
     version: 2.5
     release_date: 01/28/2015
   chassis:
-    serial_number: G5Q7NZ1
+    serial: G5Q7NZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  block_devices:
+    name: PowerEdge R720
+  storage_devices:
     sda:
       device: sda
       size: 300069052416
@@ -29,7 +29,7 @@ graphite-3:
     virtual: ivt
   main_memory:
     ram_size: 270582939648
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
index c96a4a833162249bf73befebe2a1aa61e0e867d2..26ca38dba37fe2ee4fd045ee0b7e4d5a9c6d6c56 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -9,10 +9,10 @@ graphite-4:
     version: 2.5
     release_date: 01/28/2015
   chassis:
-    serial_number: 66Q7NZ1
+    serial: 66Q7NZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  block_devices:
+    name: PowerEdge R720
+  storage_devices:
     sda:
       device: sda
       size: 300069052416
@@ -29,7 +29,7 @@ graphite-4:
     virtual: ivt
   main_memory:
     ram_size: 270582939648
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.68.4
diff --git a/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml b/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
index cb36c0749076789e84643d8e26e4aea655118824..cb796109e619b4179af5ca6da49016abfaca3c0a 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
@@ -23,7 +23,7 @@ nodes:
       virtual_size: null
     operating_system:
       release: "Squeeze"
-    block_devices:
+    storage_devices:
       sda:
         interface: 'SATA II'
         driver : "ahci"
@@ -33,7 +33,7 @@ nodes:
     sensors:
       power:
         available: true
-    network_interfaces:
+    network_adapters:
       eth0:
         device: eth0
         bridged: true
@@ -66,7 +66,7 @@ nodes:
         version: M3296
 
   griffon-[11-14]:
-    network_interfaces:
+    network_adapters:
       eth2:
         device: eth2
         bridged: false
diff --git a/input/grid5000/sites/nancy/clusters/griffon/griffon_manual.yaml b/input/grid5000/sites/nancy/clusters/griffon/griffon_manual.yaml
index 2c451aba8c3a2c091358d312ec22a355cacdb13f..6bd09ed3b09696c38542d68e4ce0982e5f2c8ed6 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/griffon_manual.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/griffon_manual.yaml
@@ -1,7 +1,7 @@
 ---
 nodes:
   griffon-1:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000318F0'
         line_card: '0x000b8cffff003106'
@@ -13,7 +13,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 4
   griffon-2:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300028064'
         line_card: '0x000b8cffff003106'
@@ -25,7 +25,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 3
   griffon-3:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300027F60'
         line_card: '0x000b8cffff003106'
@@ -37,7 +37,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 2
   griffon-4:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300028068'
         line_card: '0x000b8cffff003106'
@@ -49,7 +49,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 1
   griffon-5:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000280C0'
         line_card: '0x000b8cffff003106'
@@ -61,7 +61,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 3
   griffon-6:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000280AC'
         line_card: '0x000b8cffff003106'
@@ -73,7 +73,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 4
   griffon-7:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300028054'
         line_card: '0x000b8cffff003106'
@@ -85,7 +85,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 5
   griffon-8:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000280C8'
         line_card: '0x000b8cffff003106'
@@ -97,7 +97,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 6
   griffon-9:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030002805C'
         line_card: '0x000b8cffff003106'
@@ -109,7 +109,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 10
   griffon-10:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300027F58'
         line_card: '0x000b8cffff003106'
@@ -121,7 +121,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 11
   griffon-11:
-    network_interfaces:
+    network_adapters:
       eth2:
         interface: Ethernet
         driver: myri10ge 
@@ -141,7 +141,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 12
   griffon-12:
-    network_interfaces:
+    network_adapters:
       eth2:
         interface: Ethernet
         driver: myri10ge 
@@ -161,7 +161,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 13
   griffon-13:
-    network_interfaces:
+    network_adapters:
       eth2:
         interface: Ethernet
         driver: myri10ge 
@@ -181,7 +181,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 14
   griffon-14:
-    network_interfaces:
+    network_adapters:
       eth2:
         interface: Ethernet
         driver: myri10ge 
@@ -201,7 +201,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 15
   griffon-15:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000280B4'
         line_card: '0x000b8cffff003054'
@@ -213,7 +213,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 17
   griffon-16:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003303E'
         line_card: '0x000b8cffff003054'
@@ -225,7 +225,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 18
   griffon-17:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300033016'
         line_card: '0x000b8cffff003054'
@@ -237,7 +237,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 19
   griffon-18:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003302A'
         line_card: '0x000b8cffff003054'
@@ -249,7 +249,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 20
   griffon-19:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300033036'
         line_card: '0x000b8cffff003054'
@@ -261,7 +261,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 21
   griffon-20:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300032FCA'
         line_card: '0x000b8cffff003101'
@@ -273,7 +273,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 22
   griffon-21:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003304E'
         line_card: '0x000b8cffff003101'
@@ -285,7 +285,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 23
   griffon-22:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300033032'
         line_card: '0x000b8cffff003101'
@@ -297,7 +297,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 21
   griffon-23:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003302F'
         line_card: '0x000b8cffff003101'
@@ -309,7 +309,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 20
   griffon-24:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300032FD6'
         line_card: '0x000b8cffff003101'
@@ -321,7 +321,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 19
   griffon-25:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300033022'
         line_card: '0x000b8cffff003101'
@@ -333,7 +333,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 18
   griffon-26:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300032FD2'
         line_card: '0x000b8cffff003101'
@@ -345,7 +345,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 17
   griffon-27:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003301E'
         line_card: '0x000b8cffff003101'
@@ -357,7 +357,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 15
   griffon-28:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300032FDA'
         line_card: '0x000b8cffff003101'
@@ -369,7 +369,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 14
   griffon-29:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300033042'
         line_card: '0x000b8cffff003101'
@@ -381,7 +381,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 13
   griffon-30:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003303A'
         line_card: '0x000b8cffff003055'
@@ -393,7 +393,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 1
   griffon-31:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003305E'
         line_card: '0x000b8cffff003055'
@@ -405,7 +405,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 2
   griffon-32:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003305A'
         line_card: '0x000b8cffff003055'
@@ -417,7 +417,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 3
   griffon-33:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300033056'
         line_card: '0x000b8cffff003055'
@@ -429,7 +429,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 4
   griffon-34:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300033052'
         line_card: '0x000b8cffff003055'
@@ -441,7 +441,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 5
   griffon-35:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003304A'
         line_card: '0x000b8cffff003055'
@@ -453,7 +453,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 6
   griffon-36:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003301A'
         line_card: '0x000b8cffff003055'
@@ -465,7 +465,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 7
   griffon-37:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300028058'
         line_card: '0x000b8cffff003055'
@@ -477,7 +477,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 8
   griffon-38:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000318DC'
         line_card: '0x000b8cffff003055'
@@ -489,7 +489,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 2
   griffon-39:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000318E8'
         line_card: '0x000b8cffff003055'
@@ -501,7 +501,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 3
   griffon-40:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031780'
         line_card: '0x000b8cffff003055'
@@ -513,7 +513,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 4
   griffon-41:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000317D4'
         line_card: '0x000b8cffff003055'
@@ -525,7 +525,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 5
   griffon-42:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000280D0'
         line_card: '0x000b8cffff0030ff'
@@ -537,7 +537,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 6
   griffon-43:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000280B8'
         line_card: '0x000b8cffff0030ff'
@@ -549,7 +549,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 7
   griffon-44:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000280D4'
         line_card: '0x000b8cffff0030ff'
@@ -561,7 +561,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 17
   griffon-45:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000280B0'
         line_card: '0x000b8cffff0030ff'
@@ -573,7 +573,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 18
   griffon-46:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000280A8'
         line_card: '0x000b8cffff0030ff'
@@ -585,7 +585,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 19
   griffon-47:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000318E0'
       bmc:
@@ -595,7 +595,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 20
   griffon-48:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000317A4'
         line_card: '0x000b8cffff0030ff'
@@ -607,7 +607,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 21
   griffon-49:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300033026'
         line_card: '0x000b8cffff0030ff'
@@ -619,7 +619,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 22
   griffon-50:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000318D0'
         line_card: '0x000b8cffff0030ff'
@@ -631,7 +631,7 @@ nodes:
       pdu_name: griffon-pdu3.nancy.grid5000.fr
       pdu_position: 23
   griffon-51:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000318EC'
         line_card: '0x000b8cffff0030ff'
@@ -643,7 +643,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 21
   griffon-52:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300027F84'
       bmc:
@@ -653,7 +653,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 20
   griffon-53:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000280C4'
       bmc:
@@ -663,7 +663,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 19
   griffon-54:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000318C4'
       bmc:
@@ -673,7 +673,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 18
   griffon-55:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031784'
       bmc:
@@ -683,7 +683,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 17
   griffon-56:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003176C'
       bmc:
@@ -693,7 +693,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 15
   griffon-57:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003173C'
       bmc:
@@ -703,7 +703,7 @@ nodes:
       pdu_name: griffon-pdu4.nancy.grid5000.fr
       pdu_position: 14
   griffon-58:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003179C'
       bmc:
@@ -713,7 +713,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 1
   griffon-59:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031730'
         line_card: '0x000b8cffff00304d'
@@ -725,7 +725,7 @@ nodes:
       pdu_name: griffon-pdu1.nancy.grid5000.fr
       pdu_position: 2
   griffon-60:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031740'
         line_card: '0x000b8cffff00304d'
@@ -737,7 +737,7 @@ nodes:
       pdu_name: griffon-pdu2.nancy.grid5000.fr
       pdu_position: 5
   griffon-61:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031804'
         line_card: '0x000b8cffff00304d'
@@ -749,7 +749,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 3
   griffon-62:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003185C'
         line_card: '0x000b8cffff00304d'
@@ -761,7 +761,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 2
   griffon-63:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000317B4'
         line_card: '0x000b8cffff00304d'
@@ -773,7 +773,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 1
   griffon-64:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300033012'
         line_card: '0x000b8cffff00304d'
@@ -785,7 +785,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 8
   griffon-65:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031750'
         line_card: '0x000b8cffff00304d'
@@ -797,7 +797,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 2
   griffon-66:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031968'
         line_card: '0x000b8cffff00304d'
@@ -809,7 +809,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 3
   griffon-67:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000317DC'
         line_card: '0x000b8cffff003107'
@@ -821,7 +821,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 4
   griffon-68:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031858'
         line_card: '0x000b8cffff003107'
@@ -833,7 +833,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 5
   griffon-69:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000317B0'
         line_card: '0x000b8cffff003107'
@@ -845,7 +845,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 6
   griffon-70:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031810'
         line_card: '0x000b8cffff003107'
@@ -857,7 +857,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 7
   griffon-71:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031824'
         line_card: '0x000b8cffff003107'
@@ -869,7 +869,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 8
   griffon-72:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300032FCE'
         line_card: '0x000b8cffff003107'
@@ -881,7 +881,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 9
   griffon-73:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000319FC'
         line_card: '0x000b8cffff003107'
@@ -893,7 +893,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 10
   griffon-74:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031890'
         line_card: '0x000b8cffff003107'
@@ -905,7 +905,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 11
   griffon-75:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031874'
         line_card: '0x000b8cffff003107'
@@ -917,7 +917,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 13
   griffon-76:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031974'
         line_card: '0x000b8cffff003107'
@@ -929,7 +929,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 14
   griffon-77:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000318B8'
         line_card: '0x000b8cffff003107'
@@ -941,7 +941,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 15
   griffon-78:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000317AC'
         line_card: '0x000b8cffff003107'
@@ -953,7 +953,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 17
   griffon-79:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031808'
       bmc:
@@ -963,7 +963,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 18
   griffon-80:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031800'
       bmc:
@@ -973,7 +973,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 19
   griffon-81:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031860'
       bmc:
@@ -983,7 +983,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 20
   griffon-82:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000319F8'
       bmc:
@@ -993,7 +993,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 21
   griffon-83:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000319F4'
         line_card: '0x000b8cffff003101'
@@ -1005,7 +1005,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 22
   griffon-84:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC9030003180C'
       bmc:
@@ -1015,7 +1015,7 @@ nodes:
       pdu_name: griffon-pdu5.nancy.grid5000.fr
       pdu_position: 23
   griffon-85:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC903000319F0'
       bmc:
@@ -1025,7 +1025,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 21
   griffon-86:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031A00'
       bmc:
@@ -1035,7 +1035,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 20
   griffon-87:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031A04'
       bmc:
@@ -1045,7 +1045,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 19
   griffon-88:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031A18'
       bmc:
@@ -1055,7 +1055,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 18
   griffon-89:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031A64'
       bmc:
@@ -1065,7 +1065,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 17
   griffon-90:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031A20'
       bmc:
@@ -1075,7 +1075,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 15
   griffon-91:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031A0C'
       bmc:
@@ -1085,7 +1085,7 @@ nodes:
       pdu_name: griffon-pdu6.nancy.grid5000.fr
       pdu_position: 14
   griffon-92:
-    network_interfaces:
+    network_adapters:
       ib0:
         hwid: '0xC90300031A08'
       bmc:
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
index 738a4a810118c5942819f202e6c60db65c49a889..06d4f137d537c1f7000e1f807391723f3a693c24 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-1:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.1
       mac: 00:e0:81:4f:e3:13
@@ -61,7 +61,7 @@ griffon-1:
     ram_size: 17179869184
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-1:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530006
+    serial: 812530006
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
index 95aae86f8dc4d430edcff70f41c238989363a6be..2d21443adc8fd557f86856de6d9c4e9e21a5a9d3 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
@@ -21,7 +21,7 @@ griffon-10:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.10
@@ -66,7 +66,7 @@ griffon-10:
     bmc:
       ip: 172.17.65.10
       mac: 00:e0:81:4f:ca:9e
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-10:
     version: V1.05
     release_date: 08/21/2009
   chassis:
-    serial_number: 812530015
+    serial: 812530015
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
index b496ccc39650caeb6bdfb6fe8f723a21d95d4518..96ba1fe865252dc783f565ee4f4d88b7ff2f70c9 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
@@ -10,7 +10,7 @@ griffon-11:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -23,7 +23,7 @@ griffon-11:
     version: 8.2
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.11
       mac: 00:e0:81:4f:e3:70
@@ -80,6 +80,6 @@ griffon-11:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530016
+    serial: 812530016
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
index f04ce2cf38c9cec43ba462096ea22b980b91d9dc..d7d35f23e5c64e7858f5566850f7a16225472b47 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-12:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -34,7 +34,7 @@ griffon-12:
     platform_type: x86_64
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.12
       mac: 00:e0:81:4f:ca:8b
@@ -80,6 +80,6 @@ griffon-12:
       mounted: false
       management: false
   chassis:
-    serial_number: 812530017
+    serial: 812530017
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
index 371aae315b98f25f93883beac47aa93811f0e6c0..e0a32237ea21abb9ba4c1e5f833e04f55779870a 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
@@ -10,7 +10,7 @@ griffon-13:
     platform_type: x86_64
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.13
       mac: 00:e0:81:4f:e2:d4
@@ -66,7 +66,7 @@ griffon-13:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-13:
     version: V1.05
     release_date: 08/21/2009
   chassis:
-    serial_number: 812530018
+    serial: 812530018
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
index 98ead7cc638e9c553bf9953ec44b0e6d62580f39..13bd61ca8a38edae62200e297b3fcbf735729b4a 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
@@ -19,7 +19,7 @@ griffon-14:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.14
       mac: 00:e0:81:4f:e2:c5
@@ -70,7 +70,7 @@ griffon-14:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-14:
   main_memory:
     ram_size: 17179869184
   chassis:
-    serial_number: 812530019
+    serial: 812530019
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
index 5611c6a500fa7624fe13bd1f06ba70380e64f2f1..d7061368d7cb6225ec90dcfb96c0c0a1a319f1e1 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
@@ -10,7 +10,7 @@ griffon-15:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -21,7 +21,7 @@ griffon-15:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.15
@@ -80,6 +80,6 @@ griffon-15:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530020
+    serial: 812530020
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
index 7b5a7e816febce74304f1491c4a6a398235c2157..85fac94efb4098396e9cc0eed65ac41f6b14628b 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
@@ -6,14 +6,14 @@ griffon-16:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.16
       mac: 00:e0:81:4f:e2:d8
@@ -80,6 +80,6 @@ griffon-16:
     kernel: 3.16.0-4-amd64
     version: 8.2
   chassis:
-    serial_number: 812530021
+    serial: 812530021
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
index 38a38652d2e5074062b8c823cd679c075f62f62a..2b41d67bb5179cbfa1ee1cd39fde6cd824543f3c 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-17:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.17
       mac: 00:e0:81:4f:e3:6a
@@ -72,7 +72,7 @@ griffon-17:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-17:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530022
+    serial: 812530022
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
index d4e67c9a6c49787bee315284d5fd70cb8db423d9..827d730e1fe721f645e4925934a4ac7ebb5dc85e 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
@@ -6,7 +6,7 @@ griffon-18:
     version: 8.2
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.18
@@ -72,7 +72,7 @@ griffon-18:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-18:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530023
+    serial: 812530023
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
index f042b55542d021de44a7e08ef8c41ddaa7da7085..f45562697f04180b0a4678658167a0b34f8cac5a 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
@@ -4,7 +4,7 @@ griffon-19:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.19
       mac: 00:e0:81:4f:e3:00
@@ -66,7 +66,7 @@ griffon-19:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-19:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530024
+    serial: 812530024
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
index 83e11874bce6f7255b077264061b3cc0c701ab00..ce7362afd7f68cf5c67e1fd21eea2e6fedbfa233 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
@@ -12,7 +12,7 @@ griffon-2:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -34,7 +34,7 @@ griffon-2:
     cache_l3: 0
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.2
@@ -80,6 +80,6 @@ griffon-2:
       ip: 172.17.65.2
       mac: 00:e0:81:4f:e2:fc
   chassis:
-    serial_number: 812530007
+    serial: 812530007
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
index 988dc4786e179c45e6333677a8e9a0c75b7e6fc7..d980e400f9ec4fb5873fa910ddcf9e6d8fc3c968 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
@@ -8,7 +8,7 @@ griffon-20:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -21,7 +21,7 @@ griffon-20:
     platform_type: x86_64
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.20
       mac: 00:e0:81:4f:ca:8e
@@ -80,6 +80,6 @@ griffon-20:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530025
+    serial: 812530025
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
index 01f0d739560c5cfa5f2e3a3eb117d4810bdf33ad..5cbac53554062986d01df10c00b635fea15b3ec2 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
@@ -4,7 +4,7 @@ griffon-21:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -19,7 +19,7 @@ griffon-21:
     ram_size: 17179869184
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.21
       mac: 00:e0:81:4f:e2:fb
@@ -80,6 +80,6 @@ griffon-21:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530026
+    serial: 812530026
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
index d7b645c11b1290209e640b0d7f84de446b552f1a..1fa27698b555ed0c1666992edbafaeb1473dd3bb 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
@@ -6,7 +6,7 @@ griffon-22:
     platform_type: x86_64
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.22
       mac: 00:e0:81:4f:cb:02
@@ -64,7 +64,7 @@ griffon-22:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-22:
     version: V1.05
     release_date: 08/21/2009
   chassis:
-    serial_number: 812530027
+    serial: 812530027
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
index 35c482ffc4b502411e28055d9b83dbee41860b0e..199ab4e2c4a4348c3f5681aa15f840025a267124 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
@@ -1,13 +1,13 @@
 ---
 griffon-23:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.23
       mac: 00:e0:81:4f:ca:7e
@@ -80,6 +80,6 @@ griffon-23:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530028
+    serial: 812530028
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
index 21b7d0671fc008eeed0ea80945c119f13435d7ad..f7b3464a24147bf5a48d98748da21c04025ec1c6 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
@@ -13,7 +13,7 @@ griffon-24:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-24:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.24
       mac: 00:e0:81:4f:ca:7f
@@ -80,6 +80,6 @@ griffon-24:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530029
+    serial: 812530029
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
index 22ca9629fa4ba8ec976feabed29e7df2336fecf6..40dac0218d7c82596d1bc6fa8ea97ba12a907b61 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-25:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.25
       mac: 00:e0:81:4f:e3:ba
@@ -72,7 +72,7 @@ griffon-25:
     version: 8.2
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-25:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530030
+    serial: 812530030
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
index bcb9653475cb26526e43f391171ea34890e40c6c..7de49c93be65af902904dd1dd7eeb27545b54444 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-26:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.26
       mac: 00:e0:81:4f:b5:da
@@ -47,7 +47,7 @@ griffon-26:
       management: false
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-26:
     version: V1.05
     release_date: 08/21/2009
   chassis:
-    serial_number: 812530031
+    serial: 812530031
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
index ad7603222008443b2a6ae353bf6b4a7c11456863..e1f892ded41a45444a99b4427307c4eef06c2f67 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-27:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -15,7 +15,7 @@ griffon-27:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.27
       mac: 00:e0:81:4f:e2:cb
@@ -80,6 +80,6 @@ griffon-27:
   main_memory:
     ram_size: 17179869184
   chassis:
-    serial_number: 812530032
+    serial: 812530032
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
index 34801de4387cd8439cb2f288bb6d60c8c7688d44..7464c78e6e3c7b4436cf3b0766e58957ffabca51 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
@@ -13,7 +13,7 @@ griffon-28:
     cache_l3: 0
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.28
       mac: 00:e0:81:4f:ca:8d
@@ -62,7 +62,7 @@ griffon-28:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-28:
     version: V1.05
     release_date: 08/21/2009
   chassis:
-    serial_number: 812530033
+    serial: 812530033
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
index bb361c44533a5d5ee08882e01cbe1dfb529ce430..bb86b5665d624714671c2af7c57f6c28c098e4cc 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
@@ -13,7 +13,7 @@ griffon-29:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-29:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.29
       mac: 00:e0:81:4f:e3:71
@@ -80,6 +80,6 @@ griffon-29:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530034
+    serial: 812530034
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
index b07ca500e90e5c4177728e7a64f097927db52fa7..b275b07204419285db8318a2a2f8425d31e72afb 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
@@ -15,7 +15,7 @@ griffon-3:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -26,7 +26,7 @@ griffon-3:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.3
       mac: 00:e0:81:4f:cb:0a
@@ -80,6 +80,6 @@ griffon-3:
     kernel: 3.16.0-4-amd64
     version: 8.2
   chassis:
-    serial_number: 812530008
+    serial: 812530008
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.yaml
index c08e16369655592026c3d52863b13b77dec45758..129b8cda9395e56cd48a93cd09078437e0731a74 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-30:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -17,7 +17,7 @@ griffon-30:
     platform_type: x86_64
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.30
       mac: 00:e0:81:4f:e3:10
@@ -80,6 +80,6 @@ griffon-30:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530035
+    serial: 812530035
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.yaml
index 97f932d341950433fa309061487ccf54918f5bb5..0d240d24637deb0c90c4d05939e8d10b06f5731c 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.yaml
@@ -15,7 +15,7 @@ griffon-31:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.31
@@ -60,7 +60,7 @@ griffon-31:
     bmc:
       ip: 172.17.65.31
       mac: 00:e0:81:4f:cb:03
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-31:
   main_memory:
     ram_size: 17179869184
   chassis:
-    serial_number: 812530036
+    serial: 812530036
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.yaml
index 4f1e6b8e7dedfe3a1d8b5c650d640071421d0f69..c73daabaf4893f08d424818c98dd4a158b69d14a 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.yaml
@@ -21,7 +21,7 @@ griffon-32:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.32
       mac: 00:e0:81:4f:e3:8b
@@ -72,7 +72,7 @@ griffon-32:
     version: 8.2
   main_memory:
     ram_size: 17179869184
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-32:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530037
+    serial: 812530037
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.yaml
index 02e6af600c9a227cec2f07f4afe7d30ff57c48ef..6df832bfc9cf50a75a90575c8b6fea50dd7158c1 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-33:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -13,7 +13,7 @@ griffon-33:
     release_date: 08/21/2009
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.33
@@ -80,6 +80,6 @@ griffon-33:
     kernel: 3.16.0-4-amd64
     version: 8.2
   chassis:
-    serial_number: 812530038
+    serial: 812530038
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.yaml
index 02c6a03a4517a944bb572c6d19f5c8585aeeed0a..cfbf0dce94e35e6819416cb0b0055b1ee04c67c8 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.yaml
@@ -19,7 +19,7 @@ griffon-34:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.34
       mac: 00:e0:81:4f:cb:20
@@ -66,7 +66,7 @@ griffon-34:
       management: false
   main_memory:
     ram_size: 17179869184
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-34:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530039
+    serial: 812530039
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.yaml
index 025acc3518e44f648365b7b164e1d5cc626e95b6..7c988a02519ca8a533c80881fd56d4fe997222df 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.yaml
@@ -4,7 +4,7 @@ griffon-35:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -26,7 +26,7 @@ griffon-35:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.35
@@ -80,6 +80,6 @@ griffon-35:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530040
+    serial: 812530040
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.yaml
index 0cff77b1f13dac13112c64cd8ec4e696d0bf1548..4e166e8c88f37b24741a7ff56fbe8bbd9b53cc4e 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.yaml
@@ -13,7 +13,7 @@ griffon-36:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-36:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.36
       mac: 00:e0:81:4f:b5:e8
@@ -80,6 +80,6 @@ griffon-36:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530041
+    serial: 812530041
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.yaml
index 9aa88a204b55d1c06b39e4ed0aa94e730e1b4d6c..2d5d6fc0edce50ff6f42631bd3ad434ab7957cce 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.yaml
@@ -15,7 +15,7 @@ griffon-37:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.37
       mac: 00:e0:81:4f:e2:d7
@@ -60,7 +60,7 @@ griffon-37:
       mountable: false
       mounted: false
       management: false
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-37:
     kernel: 3.16.0-4-amd64
     version: 8.2
   chassis:
-    serial_number: 812530042
+    serial: 812530042
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.yaml
index 63a8896a114987890d7c13d0e1192c70576d7406..6c35cd01d7412900a568ab6612d3c12970430966 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.yaml
@@ -2,7 +2,7 @@
 griffon-38:
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.38
       mac: 00:e0:81:4f:e3:68
@@ -72,7 +72,7 @@ griffon-38:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-38:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530043
+    serial: 812530043
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.yaml
index 168dfcdd1bb4e069cc7ff7a286a23465006dbcfa..41fbfb3c88706e6b9923be43edfa2ea72ff5b533 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.yaml
@@ -1,13 +1,13 @@
 ---
 griffon-39:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.39
@@ -80,6 +80,6 @@ griffon-39:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530044
+    serial: 812530044
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
index e16e182a8d79c04e78e384c912e8d9f919a231a2..a576a7efa9335fa252bb00f6696b9a8ab7aea978 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-4:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.4
       mac: 00:e0:81:4f:e3:7a
@@ -55,7 +55,7 @@ griffon-4:
     version: 8.2
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-4:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530009
+    serial: 812530009
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.yaml
index 6e85cdc202e1fd4e138f4cba73b45428f3aa22d1..a0ef237b12ae66b1facff5c118390fa16eaebc60 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-40:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.40
       mac: 00:e0:81:4f:e2:c6
@@ -66,7 +66,7 @@ griffon-40:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-40:
   main_memory:
     ram_size: 17179869184
   chassis:
-    serial_number: 812530045
+    serial: 812530045
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.yaml
index 5c52045136bf4740af78651d07ed937e6ec0a233..c5703f2f4a877f7583b484f7b708f19839c0d2ad 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.yaml
@@ -4,7 +4,7 @@ griffon-41:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -19,7 +19,7 @@ griffon-41:
     release_date: 08/21/2009
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.41
       mac: 00:e0:81:4f:b5:e1
@@ -80,6 +80,6 @@ griffon-41:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530046
+    serial: 812530046
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.yaml
index 4047f2d746ef8aaed3185d845006cc9c78e07475..7da33fa6b7c59b1d3fe65635bcdb48385e352cd0 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.yaml
@@ -25,7 +25,7 @@ griffon-42:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.42
       mac: 00:e0:81:4f:e3:65
@@ -72,7 +72,7 @@ griffon-42:
       management: false
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-42:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530047
+    serial: 812530047
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.yaml
index 9e8bec2feffb081c8db30c2a9848418bc2e7cdc3..e0b134b67f51589f44aaa361b058f526a71e4a19 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-43:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.43
       mac: 00:e0:81:4f:b5:e4
@@ -72,7 +72,7 @@ griffon-43:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-43:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530048
+    serial: 812530048
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.yaml
index e9e6c4df484a05f53dec991e536f62d4d77bf346..888eaa4d7bcc298b9ad52b61f89433ceedadd789 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.yaml
@@ -13,7 +13,7 @@ griffon-44:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-44:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.44
       mac: 00:e0:81:4f:e2:b7
@@ -80,6 +80,6 @@ griffon-44:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530049
+    serial: 812530049
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.yaml
index 42416995b567f0f8e72aa6cca3d0d9b63b2e513f..d8f8e06c2b11a363c29d877816c26964a33f27d1 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-45:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.45
       mac: 00:e0:81:4f:e2:c4
@@ -66,7 +66,7 @@ griffon-45:
     cache_l3: 0
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-45:
   main_memory:
     ram_size: 17179869184
   chassis:
-    serial_number: 812530050
+    serial: 812530050
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.yaml
index c0805662c5dad998680a501dd57dc12aec9c2e18..ed69cc86582f9c809bcc84481cabb2a77fe9adef 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.yaml
@@ -6,7 +6,7 @@ griffon-46:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.46
       mac: 00:e0:81:4f:ca:79
@@ -55,7 +55,7 @@ griffon-46:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-46:
     kernel: 3.16.0-4-amd64
     version: 8.2
   chassis:
-    serial_number: 812530051
+    serial: 812530051
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.yaml
index aa91baf2bf5b7616e71594c7146c8918842b3bfa..e9e5f7d470fd3b97592807609dcd680cdce80d29 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.yaml
@@ -2,7 +2,7 @@
 griffon-47:
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.47
@@ -66,7 +66,7 @@ griffon-47:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-47:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530052
+    serial: 812530052
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.yaml
index 1c92c99afa2777b7c6afc50cf26981985604baad..49a8bc8593526795eb6a44ca97cc1df46ac42846 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.yaml
@@ -13,7 +13,7 @@ griffon-48:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-48:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.48
       mac: 00:e0:81:4f:ca:80
@@ -80,6 +80,6 @@ griffon-48:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530053
+    serial: 812530053
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.yaml
index c80475281df80982a080121c017c606021c0ca5a..8d83c4e110deb0f3b143878f0401282dbde8dea1 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-49:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.49
       mac: 00:e0:81:4f:e2:c9
@@ -72,7 +72,7 @@ griffon-49:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-49:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530054
+    serial: 812530054
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
index e0166fdfceb91398cf67d9afe9caecfb35713202..c9843507d911781f507526cdf73c842e2989a66b 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-5:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.5
       mac: 00:e0:81:4f:e3:8d
@@ -72,7 +72,7 @@ griffon-5:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-5:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530010
+    serial: 812530010
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.yaml
index 3f0a3b17b14a75261d66e0c284027342c6841f65..c9db7a06eb2b878a46990104933fb6f58bbcddb0 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.yaml
@@ -13,7 +13,7 @@ griffon-50:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-50:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.50
       mac: 00:e0:81:4f:e2:fa
@@ -80,6 +80,6 @@ griffon-50:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530055
+    serial: 812530055
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.yaml
index 4a618c23851cc4bb03d7ed148a8c76539e067734..0ab1f5fd13bd639ddfbb1a3586027f4147ad257f 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.yaml
@@ -4,7 +4,7 @@ griffon-51:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -24,7 +24,7 @@ griffon-51:
     cache_l3: 0
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.51
       mac: 00:e0:81:4f:e3:92
@@ -80,6 +80,6 @@ griffon-51:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530056
+    serial: 812530056
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.yaml
index a24085d06f909646d2acf678a68aedf2e23aa7bb..67fbead9149c48bdb6f47bd7c3c0f06a8f1a11f7 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.yaml
@@ -2,7 +2,7 @@
 griffon-52:
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.52
       mac: 00:e0:81:4f:e3:7e
@@ -47,7 +47,7 @@ griffon-52:
       mountable: false
       mounted: false
       management: false
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-52:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530057
+    serial: 812530057
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.yaml
index bbb75a2a76a19a88650896ddbadace5627af24ed..eb501bf9cd2c5863f48624aca504aa588b008d43 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.yaml
@@ -4,7 +4,7 @@ griffon-53:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.53
@@ -57,7 +57,7 @@ griffon-53:
     ram_size: 17179869184
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-53:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530058
+    serial: 812530058
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.yaml
index 75a806a9d560b9d5797c7f06e7288438a013fadc..d8c580ce7e054c40f598de9668f625d5e5ccd1ac 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.yaml
@@ -2,7 +2,7 @@
 griffon-54:
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.54
       mac: 00:e0:81:4f:e2:cf
@@ -72,7 +72,7 @@ griffon-54:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-54:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530059c
+    serial: 812530059c
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.yaml
index 17a6ff0a694a3a0a5827e44cb915376dca645d7f..c91121e99f7c5b1b41dfc355f61f434760ba93cf 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-55:
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.55
@@ -64,7 +64,7 @@ griffon-55:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-55:
   main_memory:
     ram_size: 17179869184
   chassis:
-    serial_number: 812530060
+    serial: 812530060
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.yaml
index c3691f4382f80c9a29e327a861acfcd7d37a973c..ea11cd9ec8685cf18ae5e5428e0dedcb672b7097 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-56:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -11,7 +11,7 @@ griffon-56:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.56
       mac: 00:e0:81:4f:ca:89
@@ -80,6 +80,6 @@ griffon-56:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530061
+    serial: 812530061
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.yaml
index e371d49c2ea018478883806718457d0097f056a4..f35786c672771eccbc2cec091049ac355750d5f7 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.yaml
@@ -2,7 +2,7 @@
 griffon-57:
   main_memory:
     ram_size: 17179869184
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -28,7 +28,7 @@ griffon-57:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.57
@@ -80,6 +80,6 @@ griffon-57:
     kernel: 3.16.0-4-amd64
     version: 8.2
   chassis:
-    serial_number: 812530062
+    serial: 812530062
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
index 86cb3ca7a9b1cb911fb084ba99f7d3cc132ae2d0..dabe988989bc5ceaafc12280e3b805b69a086062 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
@@ -13,7 +13,7 @@ griffon-58:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-58:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.58
       mac: 00:e0:81:4f:e2:f3
@@ -80,6 +80,6 @@ griffon-58:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530063
+    serial: 812530063
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
index 0d080aad7045f74a3f48a634d56cdfb86426a999..409a7294ce3b46cf2b77a12f628bcddadf488f84 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
@@ -17,7 +17,7 @@ griffon-59:
     platform_type: x86_64
   main_memory:
     ram_size: 17179869184
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -30,7 +30,7 @@ griffon-59:
     version: 8.2
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.59
       mac: 00:e0:81:4f:e3:05
@@ -80,6 +80,6 @@ griffon-59:
     version: V1.05
     release_date: 08/21/2009
   chassis:
-    serial_number: 812530064
+    serial: 812530064
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
index c8461950206b0cf295c1be004fa02a47eb8fee20..cb085eb961678bf9cce934c1b6e0c57819000c73 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
@@ -13,7 +13,7 @@ griffon-6:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-6:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.6
       mac: 00:e0:81:4f:e3:74
@@ -80,6 +80,6 @@ griffon-6:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530011
+    serial: 812530011
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
index a4ce5f5d2b9ea2b5dbec3f6e025643eccfe09a2e..f91639e49ed8f99c5caaaeb624e7c05fbe00115a 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
@@ -4,7 +4,7 @@ griffon-60:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -32,7 +32,7 @@ griffon-60:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.60
@@ -80,6 +80,6 @@ griffon-60:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530065
+    serial: 812530065
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.yaml
index 92a5d1098ad8b6a7c8b79481785c2115c8a0902b..43aa7d21b1966e826e77ccd857a2c78d61c90ee0 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.yaml
@@ -8,14 +8,14 @@ griffon-61:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.61
@@ -80,6 +80,6 @@ griffon-61:
     kernel: 3.16.0-4-amd64
     version: 8.2
   chassis:
-    serial_number: 812530066
+    serial: 812530066
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.yaml
index addec547356b5ab82766d2b38c6be06714050c89..42a67a0444e4b88c0e5ea92adace57056b138ec0 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.yaml
@@ -1,13 +1,13 @@
 ---
 griffon-62:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.62
       mac: 00:e0:81:4f:e2:b8
@@ -80,6 +80,6 @@ griffon-62:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530067
+    serial: 812530067
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.yaml
index e59e0407290e290fde454334986b32c811d95fde..939198a82e7945a4cfb656043ad3f635348b228d 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.yaml
@@ -10,7 +10,7 @@ griffon-63:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -21,7 +21,7 @@ griffon-63:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.63
@@ -80,6 +80,6 @@ griffon-63:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530068
+    serial: 812530068
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.yaml
index dd8543ef03feb6b77a3e34f77772b76298bfe4b4..ef17d230a8ba3983a051f298ec5ec1d5205d6f50 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.yaml
@@ -13,7 +13,7 @@ griffon-64:
     cache_l3: 0
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.64
       mac: 00:e0:81:4f:e2:cd
@@ -66,7 +66,7 @@ griffon-64:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-64:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530069
+    serial: 812530069
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.yaml
index 1bdb2e612dc28ca1898211954b8546635878dc2e..ae2a0820a9a7189607bc51e5a1e6bca33a4601e5 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.yaml
@@ -6,7 +6,7 @@ griffon-65:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -30,7 +30,7 @@ griffon-65:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.65
@@ -80,6 +80,6 @@ griffon-65:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530070
+    serial: 812530070
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.yaml
index e321fe5699d7b78555833a6564c6d4d3f4082b3f..603252b8ff8443399eba386ba2ecc140960b4487 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.yaml
@@ -11,7 +11,7 @@ griffon-66:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -24,7 +24,7 @@ griffon-66:
     release_date: 08/21/2009
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.66
@@ -80,6 +80,6 @@ griffon-66:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530071
+    serial: 812530071
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.yaml
index 43c710e2b8d1ad58be11a82ac77efafdd67ad7ff..50e8d3db1fd2fb4cce91fa28ea6d97132c081e23 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.yaml
@@ -2,7 +2,7 @@
 griffon-67:
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.67
       mac: 00:e0:81:4f:b5:f0
@@ -53,7 +53,7 @@ griffon-67:
     platform_type: x86_64
   main_memory:
     ram_size: 17179869184
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-67:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530072
+    serial: 812530072
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.yaml
index d05697be6e7d7c27969a3fc2728cb70dda1747e1..5fc7f84873743e346ec970e68d8baec00d1b49c1 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.yaml
@@ -2,7 +2,7 @@
 griffon-68:
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.68
@@ -47,7 +47,7 @@ griffon-68:
     bmc:
       ip: 172.17.65.68
       mac: 00:e0:81:4f:ca:8f
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-68:
     kernel: 3.16.0-4-amd64
     version: 8.2
   chassis:
-    serial_number: 812530073
+    serial: 812530073
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.yaml
index 98df31b2f153d3837436748501de37446ff1f026..bf422bcdad73da6bc00744312e7e9010135dcd13 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.yaml
@@ -13,7 +13,7 @@ griffon-69:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-69:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.69
       mac: 00:e0:81:4f:b5:dc
@@ -80,6 +80,6 @@ griffon-69:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530074
+    serial: 812530074
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
index 37a41b267b482b16e57abcff2b132bbe85476f4c..8d99a1fdabcbd184876025ef533ea17a09a0c165 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
@@ -13,7 +13,7 @@ griffon-7:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-7:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.7
       mac: 00:e0:81:4f:ca:90
@@ -80,6 +80,6 @@ griffon-7:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530012
+    serial: 812530012
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.yaml
index 12820ddea61398d43405da283dcc88c952d08757..6a0cf021816a360818ee23318413bcb90c2627a1 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.yaml
@@ -2,7 +2,7 @@
 griffon-70:
   main_memory:
     ram_size: 17179869184
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -11,7 +11,7 @@ griffon-70:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.70
@@ -80,6 +80,6 @@ griffon-70:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530075
+    serial: 812530075
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.yaml
index 6ae06bbe3f58be933953b1c8c4dabf0e2f2d74f8..d7c84d134f04a9cb982e070ad614eebd483c9360 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.yaml
@@ -4,7 +4,7 @@ griffon-71:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.71
@@ -72,7 +72,7 @@ griffon-71:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-71:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530076
+    serial: 812530076
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.yaml
index b665beec875472dd34cc4d6b70cc4c461e89a48a..aaf8d35ff5a6b19e60bced2cd6843e630b1077f0 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-72:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.72
       mac: 00:e0:81:4f:b5:f1
@@ -72,7 +72,7 @@ griffon-72:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-72:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530077
+    serial: 812530077
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.yaml
index cd55e70615c43e60c04a169472b955975ccb1fd3..76616ffb60230c7f49324d43873c909957d02e4d 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.yaml
@@ -6,7 +6,7 @@ griffon-73:
     version: 8.2
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.73
       mac: 00:e0:81:4f:cb:0d
@@ -53,7 +53,7 @@ griffon-73:
       management: false
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-73:
     version: V1.05
     release_date: 08/21/2009
   chassis:
-    serial_number: 812530078
+    serial: 812530078
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.yaml
index bdd2e5daf0e9cf2e1d2c306e75839d2f73a1f7bf..e2905d2a83a9e815f3c5111f50cbfd8352a57297 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-74:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.74
       mac: 00:e0:81:4f:cb:00
@@ -62,7 +62,7 @@ griffon-74:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-74:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530079
+    serial: 812530079
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.yaml
index 3a1cbe8687dbc903e1cb4c8e4cc8df7e651c84f4..4fc07a013376f2569807c0022141e577d7dfabd4 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.yaml
@@ -13,7 +13,7 @@ griffon-75:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-75:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.75
       mac: 00:e0:81:4f:e3:75
@@ -80,6 +80,6 @@ griffon-75:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530080
+    serial: 812530080
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.yaml
index 9b8d2b398571b08e47ca6285f562c4d3645011c5..5038d21c49172e89c2350c2ac6e942c3081180fb 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.yaml
@@ -8,14 +8,14 @@ griffon-76:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.76
       mac: 00:e0:81:4f:b5:e3
@@ -80,6 +80,6 @@ griffon-76:
   main_memory:
     ram_size: 17179869184
   chassis:
-    serial_number: 812530081
+    serial: 812530081
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.yaml
index 2e83c2b893c22c4f92b01d6e052d4e4ce498b8cf..456a05ceb3af993468f13ca2661a78e709b874d7 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.yaml
@@ -2,7 +2,7 @@
 griffon-77:
   main_memory:
     ram_size: 17179869184
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -13,7 +13,7 @@ griffon-77:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.77
@@ -80,6 +80,6 @@ griffon-77:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530082
+    serial: 812530082
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.yaml
index a4cf7f9cb8551e19ad2c0e0fe3d39e6ee69f123d..d1cc1e68a3fc18a5da77b823651ab47ace5f7d55 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.yaml
@@ -23,7 +23,7 @@ griffon-78:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.78
       mac: 00:e0:81:4f:e2:e8
@@ -68,7 +68,7 @@ griffon-78:
       mountable: false
       mounted: false
       management: false
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-78:
     version: V1.05
     release_date: 08/21/2009
   chassis:
-    serial_number: 812530083
+    serial: 812530083
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.yaml
index 60de72940ee019d0ccd6fdae3aaa8e342b545b08..9923e6e4fa8c9374f40e1dccea15ca953007ab54 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-79:
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.79
@@ -47,7 +47,7 @@ griffon-79:
       mac: 00:e0:81:4f:e2:b2
   main_memory:
     ram_size: 17179869184
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-79:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530084
+    serial: 812530084
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
index 87289517b91d191b94313a25e14c21579370183a..4062d52083be3ffaf5dad94229ab5786d385c2a6 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
@@ -2,7 +2,7 @@
 griffon-8:
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.8
       mac: 00:e0:81:4f:e3:c2
@@ -55,7 +55,7 @@ griffon-8:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-8:
     kernel: 3.16.0-4-amd64
     version: 8.2
   chassis:
-    serial_number: 812530013
+    serial: 812530013
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.yaml
index a53863eabd23d42b78fd8d5e6f5645fbb2508ecb..3123f9ea3252f7c98481ef66b9fc87caa0c7420a 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.yaml
@@ -2,7 +2,7 @@
 griffon-80:
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.80
@@ -72,7 +72,7 @@ griffon-80:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-80:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530085
+    serial: 812530085
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.yaml
index 38a94057acc62a6586ba77350ff67bf76846294b..deb3d1f045564f7201cb52c3c311245b3a5c8357 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.yaml
@@ -4,7 +4,7 @@ griffon-81:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.81
       mac: 00:e0:81:4f:ca:7d
@@ -51,7 +51,7 @@ griffon-81:
       management: false
   main_memory:
     ram_size: 17179869184
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-81:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530086
+    serial: 812530086
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.yaml
index 67f1d7a816c859b315c300a8753bbc850b851e1e..3297beec85368580348f1d4f59ccd40baf68d68c 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.yaml
@@ -13,7 +13,7 @@ griffon-82:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-82:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.82
       mac: 00:e0:81:4f:cb:08
@@ -80,6 +80,6 @@ griffon-82:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530087
+    serial: 812530087
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.yaml
index 1c9136f04fbdb1a2dc196ba82404977e7eb4779f..5d9a618945d1a7755940efa4c1cb991bb3686168 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.yaml
@@ -2,7 +2,7 @@
 griffon-83:
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -30,7 +30,7 @@ griffon-83:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.83
       mac: 00:e0:81:4f:ca:9f
@@ -80,6 +80,6 @@ griffon-83:
     version: V1.05
     release_date: 08/21/2009
   chassis:
-    serial_number: 812530088
+    serial: 812530088
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.yaml
index 9069341ebda6c042703123092d1eec5062e9af0a..8ce13e843317c1e7dc798231b6a5a020bb894f8a 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.yaml
@@ -13,7 +13,7 @@ griffon-84:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-84:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.84
       mac: 00:e0:81:4f:e2:d9
@@ -80,6 +80,6 @@ griffon-84:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530089
+    serial: 812530089
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.yaml
index 6961a4a55c0425ea1440892b009880a097092097..ccebf587ec8eab114c6e18c45972aecdef9eb226 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.yaml
@@ -17,7 +17,7 @@ griffon-85:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.85
@@ -72,7 +72,7 @@ griffon-85:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-85:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530090
+    serial: 812530090
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.yaml
index 877994e0c1cced8fc080a35b550f25b0a3ff2c2d..08eef8e4ec741ce8a13d6fedac9b14178eb49038 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.yaml
@@ -13,7 +13,7 @@ griffon-86:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -22,7 +22,7 @@ griffon-86:
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.86
       mac: 00:e0:81:4f:cb:0f
@@ -80,6 +80,6 @@ griffon-86:
     smt_size: 8
     platform_type: x86_64
   chassis:
-    serial_number: 812530091
+    serial: 812530091
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.yaml
index 8f1546bff90eb8aaaa62ee7ef009b371c9aa3a46..c32573bb264a3b15ee025d3ccd406ed167324bcd 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.yaml
@@ -4,7 +4,7 @@ griffon-87:
     smp_size: 2
     smt_size: 8
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -17,7 +17,7 @@ griffon-87:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.87
@@ -80,6 +80,6 @@ griffon-87:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530092
+    serial: 812530092
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.yaml
index c8516a78c936a7cc5933605bf08b37a7196cfaab..cf7e7700f45a7c8d6d6ccbaebc171f67e86756f2 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.yaml
@@ -11,14 +11,14 @@ griffon-88:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.88
@@ -80,6 +80,6 @@ griffon-88:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530093
+    serial: 812530093
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.yaml
index 8c4f7332730b3da430a6a59e406fe663d276d0d6..a634cc17df24bb93097a169fb29a7459a5ec08b5 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-89:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -28,7 +28,7 @@ griffon-89:
     release_date: 08/21/2009
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.89
       mac: 00:e0:81:4f:e3:81
@@ -80,6 +80,6 @@ griffon-89:
   main_memory:
     ram_size: 17179869184
   chassis:
-    serial_number: 812530094
+    serial: 812530094
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
index 8937ff5c988927235bdaaa4d8d650f643d08445a..60e5033eed0f177ae15010e4d0b0559e674bdcfa 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
@@ -2,7 +2,7 @@
 griffon-9:
   main_memory:
     ram_size: 17179869184
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -19,7 +19,7 @@ griffon-9:
     release_date: 08/21/2009
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.9
       mac: 00:e0:81:4f:e2:fe
@@ -80,6 +80,6 @@ griffon-9:
     cache_l2: 6291456
     cache_l3: 0
   chassis:
-    serial_number: 812530014
+    serial: 812530014
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.yaml
index c4bf0b0047c4cb057ccf95d79d695407172aefb1..919d3ecb6a7759e904b47e9f023ce88cdb378ff3 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.yaml
@@ -2,7 +2,7 @@
 griffon-90:
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.90
@@ -62,7 +62,7 @@ griffon-90:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-90:
   main_memory:
     ram_size: 17179869184
   chassis:
-    serial_number: 812530095
+    serial: 812530095
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.yaml
index 33f9a1e14f69ac617cc8892e9aaa24ccfbc17597..ae974598ef4e17d13865ed2ab3d7566b55dbdbaa 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.yaml
@@ -1,6 +1,6 @@
 ---
 griffon-91:
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.65.91
@@ -60,7 +60,7 @@ griffon-91:
     cache_l1d: 32768
     cache_l2: 6291456
     cache_l3: 0
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-91:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 812530096
+    serial: 812530096
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.yaml
index 152782f8f3a8b7a778c75e82a164e987b5d01a92..83c3791829d32556ef68d8e9705ceb8c27445a2f 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.yaml
@@ -8,7 +8,7 @@ griffon-92:
     platform_type: x86_64
   main_memory:
     ram_size: 17179869184
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.65.92
       mac: 00:e0:81:4f:e3:5d
@@ -72,7 +72,7 @@ griffon-92:
     name: debian
     kernel: 3.16.0-4-amd64
     version: 8.2
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 320072933376
@@ -80,6 +80,6 @@ griffon-92:
       rev: A5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530097
+    serial: 812530097
     manufacturer: TYAN Computer Corporation
-    product_name: S5393
+    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/grigri/grigri.yaml.erb b/input/grid5000/sites/nancy/clusters/grigri/grigri.yaml.erb
index 039d979f15bf73bb17e22434f9c6f69b9c7003db..2cec932adf6cfff002bf13d4eb0bc55daffd53ef 100644
--- a/input/grid5000/sites/nancy/clusters/grigri/grigri.yaml.erb
+++ b/input/grid5000/sites/nancy/clusters/grigri/grigri.yaml.erb
@@ -1,6 +1,6 @@
 # nodes:
 #   grigri
-#     network_interfaces:
+#     network_adapters:
 #       eth0: 
 #         mounted: true
 #         ip: 
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
index f6b6b991521d6e348b98fdafcddcdb21adcd1c42..f8d4819830ed09c2912d3c9ff1c04fa8f89f7e68 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
@@ -22,7 +22,7 @@ nodes:
       virtual_size: nil
     operating_system:
       release: Jessie
-    block_devices:
+    storage_devices:
       sda:
         interface: SCSI
         driver: megaraid_sas
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml.erb b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml.erb
index 1d8f2796f1ddf7e9bac2125807c0a13eda27686b..0d83580ea01a1e3d188156c84666f784f05fa69b 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml.erb
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml.erb
@@ -1,7 +1,7 @@
 nodes:
 <% (1..8).each { |i| %>
   grimoire-<%= i %>:
-    network_interfaces:
+    network_adapters:
       eth0: 
         mounted: true
         ip: 172.16.71.<%= i %>
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
index 8f1bee018695ac0a375ee52bc74563e739ce997f..5340e0762a20b0a67ae638a85bb8c3dc48e82cdf 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -9,10 +9,10 @@ grimoire-1:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3Z13J82
+    serial: 3Z13J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -49,7 +49,7 @@ grimoire-1:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.71.1
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
index 77c8a624bb78f98539d4e5f52a789f2aba83be70..e0d54885d8eba322c585f9b6a429f5bd56346e5d 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -9,10 +9,10 @@ grimoire-2:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3Z0ZH82
+    serial: 3Z0ZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -49,7 +49,7 @@ grimoire-2:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
index 7418b2bfcf6bc6cd954b73f4e01a24a922df6bec..a716d90c86b1bef946ec3e31d0543d5d27b55a71 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -9,10 +9,10 @@ grimoire-3:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3YZYH82
+    serial: 3YZYH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -49,7 +49,7 @@ grimoire-3:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
index 09ef361f0ed617c876c074a235c393ff9e3bc82a..81364f3d6cad810f5ccccdd7a44e9e931297b48e 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -9,10 +9,10 @@ grimoire-4:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 36ZYH82
+    serial: 36ZYH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -49,7 +49,7 @@ grimoire-4:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
index ee6d0f82ea6390422f7f38e1d892b723e0ffd831..aec19a558eb7b5b93562e1685cbaa1aacf67b36e 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -9,10 +9,10 @@ grimoire-5:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 36X1J82
+    serial: 36X1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -49,7 +49,7 @@ grimoire-5:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
index 50f31077493af972217a84ecec6ea3d64a331afa..6b7644cd373e9ff0f6fb0e0375a21eb4bc0c67e0 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -9,10 +9,10 @@ grimoire-6:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3722J82
+    serial: 3722J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -49,7 +49,7 @@ grimoire-6:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.71.6
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
index e50ec965c909dd570a5ca0ab0d20d0433b0873b9..3c6d16b91a8aa14835faa9fe9789db797b5397a4 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -9,10 +9,10 @@ grimoire-7:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 36Y3J82
+    serial: 36Y3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -49,7 +49,7 @@ grimoire-7:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
index 25a969bffd5c4169fee74a04a761d3ee0993c80c..6c809ee23edea49a18337bb108fa683a8877bcab 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -9,10 +9,10 @@ grimoire-8:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3703J82
+    serial: 3703J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -49,7 +49,7 @@ grimoire-8:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
index 2c888153b9bf4ea8769a759a291b09a6a17fa891..57d277a2667e96c8aabc44e0fb214a9d069f58b2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
@@ -25,7 +25,7 @@ nodes:
     operating_system:
       name: debian
       release: Jessie
-    block_devices:
+    storage_devices:
       sda:
         interface: SCSI
         driver: megaraid_sas
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml.erb b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml.erb
index ed210a25d985ef496c4cdb8c777ef1af75d4a124..baec3cf1f78484c504228baa26798f2f53292a08 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml.erb
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml.erb
@@ -1,7 +1,7 @@
 nodes:
 <% (1..51).each { |i| %>
   grisou-<%= i %>:
-    network_interfaces:
+    network_adapters:
       eth0: 
         mounted: true
         ip: 172.16.72.<%= i %>
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
index bc0b62203ddf74a1521fd81b81ade0a814c119fb..771912c301f47cc5405c9e427821520a17df7437 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -9,10 +9,10 @@ grisou-1:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2ZY2J82
+    serial: 2ZY2J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-1:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.1
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
index be3744e2c74981e681b3ffc0de0972a0369bb0f3..32f041639a3f422ef2f7a1a1dd0984b67a321ac4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -9,10 +9,10 @@ grisou-10:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 39G0J82
+    serial: 39G0J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-10:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.10
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
index bc741dcb42d8c581d9356bf0dd9fc954d4ed09df..57d7625e3bad248304ed42830692511667d1e417 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -9,10 +9,10 @@ grisou-11:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3970J82
+    serial: 3970J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-11:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
index 90ffd9fa9daca89cbd99711e0c1275f6b994f922..1722e5383a416a18100900f3efefe31f6a14e521 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -9,10 +9,10 @@ grisou-12:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 39LZH82
+    serial: 39LZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-12:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.12
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
index b9839e13dfab50a919086a8adbb770341c533272..6b083634dd40060da2ba1c92f80badb2cd0135af 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -9,10 +9,10 @@ grisou-13:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 39D4J82
+    serial: 39D4J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-13:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
index b51502b113cbf1c8137b99c646ae067ed096b04e..e6c75413ba9ff76aa5252e03d31786cb798321f1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -9,10 +9,10 @@ grisou-14:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3T72J82
+    serial: 3T72J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-14:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.14
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
index 2f4b741704396d3a429520d966616ea247ced600..6b394698a85c2d7266f125ab562f16511b841d1e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -9,10 +9,10 @@ grisou-15:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3SZ1J82
+    serial: 3SZ1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-15:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
index 980f3e05f7629e5689d34116c765e860376dbff6..7933f8350480f4f4c83a0b3fdd8d43bda1fdbe84 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -9,10 +9,10 @@ grisou-16:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2ZSZH82
+    serial: 2ZSZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-16:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
index 45aefa28c4a47091b7d74f385ff654c6a8637bfb..57bc154415e0d7e0fed3d160c778a1c9876edf00 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -9,10 +9,10 @@ grisou-17:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2ZR2J82
+    serial: 2ZR2J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-17:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
index 559773e7ff65fce59f4238945afb733dc6249bee..c87a95bff357c79cb89ce9ba7f19b0665c255519 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -9,10 +9,10 @@ grisou-18:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2ZW3J82
+    serial: 2ZW3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-18:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
index 80c059eb8b7e2fa2ef0f5c1d11c097c4c9f9544e..a44f67551b76879e2e52dea7c9c95d8e767c9ba1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -9,10 +9,10 @@ grisou-19:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 39JZH82
+    serial: 39JZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-19:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.19
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
index 8fdc74a427ef46fd0319730503586b6da6d60787..5f7cdc81082a2735be03e0678aedfc170e28d78e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -9,10 +9,10 @@ grisou-2:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3020J82
+    serial: 3020J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-2:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
index 2eeca070b3c5c5425f7af368cd313697d2c267fb..42be76ee16ba392feab767958b78cf6182b5713f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -9,10 +9,10 @@ grisou-20:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3933J82
+    serial: 3933J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-20:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
index 47a143978a86be3bb930a60e0795284014318a12..0f032b14c1855cb5297337552e8319161d8a1624 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -9,10 +9,10 @@ grisou-21:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 39KZH82
+    serial: 39KZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-21:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
index c0dcdeeb78dd9f48a46baa0decc3fda2b817b5cc..ad3ebdef6ef208d251f815d653898f863b1d71a8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -9,10 +9,10 @@ grisou-22:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3984J82
+    serial: 3984J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-22:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.22
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
index 51cfb836da5aa9760c125cd6bc95f94746d7f431..4b99ad047804a177c00e749a2d2e071fd418c31e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -9,10 +9,10 @@ grisou-23:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3T83J82
+    serial: 3T83J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-23:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
index 2ce632b58b5b0e4b43d9f4d2f066d580eeae9eb3..5ad53f1cd459f0475e0e0b2d4bd300848c282160 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -9,10 +9,10 @@ grisou-24:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3T13J82
+    serial: 3T13J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-24:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.24
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
index 5416302ed23a2b055530a088812a798d6bb899b8..29edec4a8bd8eae280bd5c9ff0e1ad8d001ae025 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -9,10 +9,10 @@ grisou-25:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3SX0J82
+    serial: 3SX0J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-25:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
index 3975159ea40b8dbc273c9bbee87ec39b3280994a..74ef170a7a8b9674ff90c6b7bbcfc216368d3549 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -9,10 +9,10 @@ grisou-26:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3T24J82
+    serial: 3T24J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-26:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
index 4ec4bd42216b904226c505599ee6270201bcbfae..59c641800f2df6e77bbc72dc082402f0b97d1e6a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -9,10 +9,10 @@ grisou-27:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3SY3J82
+    serial: 3SY3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-27:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
index 3314ea4db151e4773b570dfa464f5d229fed46c3..967d9bdd4b5c5a3ddbf2e5538ab601871ac15562 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -9,10 +9,10 @@ grisou-28:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3T44J82
+    serial: 3T44J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-28:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
index 0b1ae87319b148bfa579342178cb28525e0439b4..2a48121d101f06a39942ad9fb8fe1b646bcfdef0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -9,10 +9,10 @@ grisou-29:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3T33J82
+    serial: 3T33J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-29:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
index e349e54717949dbba81b28cfb8b491ee7d5811a3..2162f489311b3c1b1f262272b9fe997eb6429acf 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -9,10 +9,10 @@ grisou-3:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2ZZ1J82
+    serial: 2ZZ1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-3:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
index ea8b6673d5ccd27768b5f9e76ee97ec37465e43c..49bc914c1ba7af33522cadd9fcb8e0467ba30d45 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -9,10 +9,10 @@ grisou-30:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3T04J82
+    serial: 3T04J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-30:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.30
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
index 326c9584b2e8e38d6153d35bed8fe7e7d890c697..864a0d594c408ad6ecb1b2fd02c19e44d55e156f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -9,10 +9,10 @@ grisou-31:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2RL4J82
+    serial: 2RL4J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-31:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
index 8fa96b053603874ff0a7236bc4d51eaf329c6a92..9ed7f71cc70d927bb2d65dedd50fe92ea824eaea 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -9,10 +9,10 @@ grisou-32:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2RP3J82
+    serial: 2RP3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-32:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.32
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
index 169cd971f0911826a721deee5a4e7a5fd06e1b8b..08a087607b29d57002ea1f756fed783048862251 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -9,10 +9,10 @@ grisou-33:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2RR1J82
+    serial: 2RR1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-33:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
index f1d0781f7e92bc99376c40e09a8f78d3c1150b23..c1ef4f9fecc25d82dd2a67f705b617b0eb0a3fa4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -9,10 +9,10 @@ grisou-34:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2RM3J82
+    serial: 2RM3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-34:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.34
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
index 59ea51cf60baa2ede63116fbeb377d6cb9a5db42..9ddfb71a5307fe0cb810e2a1cbec0c69990e9d44 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -9,10 +9,10 @@ grisou-35:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2RN1J82
+    serial: 2RN1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-35:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
index f66c8ac418a72cda11b70dc0ee64f516aba39397..1720d0e2b48d52e481713d750b8f1aeb7b6a3b29 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -9,10 +9,10 @@ grisou-36:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2M22J82
+    serial: 2M22J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-36:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
index 6387e21c11d950436de5743509710ce08af96167..36e6f45663a6769cd0b143eb4cb5e87e2c86bbe6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -9,10 +9,10 @@ grisou-37:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2M53J82
+    serial: 2M53J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-37:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.37
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
index 18251014347d0a2206b3584259f87e26c5c2f3e2..d2ea1366eed7ba55cf652e607370d5dbfb7f5193 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -9,10 +9,10 @@ grisou-38:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2MD3J82
+    serial: 2MD3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-38:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.38
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
index 96487ab333801b675a30e6e861532205fff82dfa..b181cf199c517fe108ae5ca3b2e7e2561693b6b3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -9,10 +9,10 @@ grisou-39:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2LZYH82
+    serial: 2LZYH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-39:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.39
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
index 8412d71e60ccd3c1189f77ea6087196bb4adbf00..d80ee76aa833e3e68cdc5815430d3e8d7d23be0b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -9,10 +9,10 @@ grisou-4:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2ZX2J82
+    serial: 2ZX2J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-4:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.4
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
index 00421f5e0666bd300e721fc88a858354b4ba802e..2367f902fc2b20c58c32baf0ce9157b5bcc2cf5b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -9,10 +9,10 @@ grisou-40:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2M8ZH82
+    serial: 2M8ZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-40:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.40
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
index 53028e61a8ddfc47d163b3b2ac2122942df55286..b55f2f846961a317dd07ffff328ca50bde893c63 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -9,10 +9,10 @@ grisou-41:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2LSZH82
+    serial: 2LSZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-41:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
index bc9604c118f17864838bbca916ceffa465d5ab15..a12dca9a2807c9aea83338da84401f902eb0a2bd 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -9,10 +9,10 @@ grisou-42:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2LY1J82
+    serial: 2LY1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-42:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.42
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
index 8b85909035170c0c87bcbb1abc728fa279ea5423..2d7f7666e09aafa7445a540d75bf440415be87b9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -9,10 +9,10 @@ grisou-43:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2M3ZH82
+    serial: 2M3ZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-43:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
index c0a733c370ccdd0bf33aded49c633e8ff1dbc22f..d4f3600890cfa6f9d83bbf58bfd3b79d7558a8bd 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -9,10 +9,10 @@ grisou-44:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2M72J82
+    serial: 2M72J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-44:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.44
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
index 0b4b5aa34c7c4584d5e48c78bc335962fb3f1cd1..05795cd8b1ccc572e54260a540603f42c468fe8a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -9,10 +9,10 @@ grisou-45:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2MC0J82
+    serial: 2MC0J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-45:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
index ab4a31a2942c2ffe6e46f1dce9b32aef4224fa52..40dcd7e91267456c9bc43243d1558cb7f7ed809e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -9,10 +9,10 @@ grisou-46:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2RQ2J82
+    serial: 2RQ2J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-46:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.46
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
index 5ff515c506b49462f38b93933d7665ed0c5f2b96..9cff38da5c8ae52046b188838aef5f157e45cee3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -9,10 +9,10 @@ grisou-47:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2RHZH82
+    serial: 2RHZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-47:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
index e72d656caf983a1b637d08e8518cb60663db4a69..b292ac24b0182c98b6a8cd5ff80b8b9baa801500 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -9,10 +9,10 @@ grisou-48:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2RK3J82
+    serial: 2RK3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-48:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
index e3a54798a75e71badadc1d67ba9cc0d69d7e2e83..338beb23ba7ab94ab8064499bf96a2c554242ee2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -9,10 +9,10 @@ grisou-49:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2RG2J82
+    serial: 2RG2J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-49:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
index 59ec6a398d4c7359421ae2a0e53d4b88ea872f5e..73576947425a2d32238e5625a783ef30544f6c99 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -9,10 +9,10 @@ grisou-5:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2ZQ1J82
+    serial: 2ZQ1J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-5:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
index 219cb55a721c650b0617e6485835fd8d0f9ca38a..e3730a9354eefe88bec3af6d889bacda87c1d536 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -9,10 +9,10 @@ grisou-50:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3F1ZH82
+    serial: 3F1ZH82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-50:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.50
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
index 0e23820a91a4fdcacd0d3b0421bd38c38dcd3f6a..ba23fa7a561b4a72ea061fbdd7ba1857821772c9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -9,10 +9,10 @@ grisou-51:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2S11J82
+    serial: 2S11J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-51:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.72.51
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
index ffa4d72409f4c128d78c8f174cb6625645275610..eb44fd9100a96d20c5b58f4d764a104165a865ee 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -9,10 +9,10 @@ grisou-6:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 2ZV3J82
+    serial: 2ZV3J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-6:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
index 462dc42962149bfaaee7ed830500e49bf87a1a53..b5df257f25ddc9fdc177afb0986de1947374336d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -9,10 +9,10 @@ grisou-7:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 3004J82
+    serial: 3004J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-7:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
index ad875901ff26ac3d4842193c5107def594326d37..e0de2c30c516f3d7826cdc2242ef6be57f14cf8c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -9,10 +9,10 @@ grisou-8:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 39N0J82
+    serial: 39N0J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-8:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
index f25827e0c3175358f374e67101b49aa36a605e24..4adcde9b2fbf2ec4ba270b5ebe0c68deb1c967ad 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -9,10 +9,10 @@ grisou-9:
     version: 1.3
     release_date: 06/03/2015
   chassis:
-    serial_number: 39H4J82
+    serial: 39H4J82
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -29,7 +29,7 @@ grisou-9:
     virtual: ivt
   main_memory:
     ram_size: 135291469824
-  network_interfaces:
+  network_adapters:
     eth4:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
index a4df528b407312a82499a9fa8e3089c9aa48ae77..b1c5952b87c27bce2fb2df6aa4db23cf4a48932b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
@@ -4,7 +4,7 @@ talc-1:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-1:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml
index 7b58b63cfdf000bcfe8a97458373c1e5e59073cc..ae68208c84ecbc58b6959ad3921fbe622fac56a5 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml
@@ -4,7 +4,7 @@ talc-10:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-10:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml
index 71a483e0e87f4d8fa66a64993a71416be6357f98..b04431d270cb3b80c83aec13203dd07d70eb41dc 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml
@@ -4,7 +4,7 @@ talc-100:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-100:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml
index fb42f3305fe67bcc4024c53d1b78a4b96353ad95..7ea0d6cc2087ca72adceb849bbb5b6a893a24982 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml
@@ -4,7 +4,7 @@ talc-101:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-101:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml
index 7970a8834100c1a89bd0d96c2a3fd9ae37871787..2d4ad1eb65fa710d226f1d875dd2e653e7662956 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml
@@ -4,7 +4,7 @@ talc-102:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-102:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml
index 3a9aa6488c7fad353084e109cdc493dfe19b5e57..57fa28aa0aa0abce1c607948b9b6a740b3285404 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml
@@ -4,7 +4,7 @@ talc-103:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-103:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
index e185c4e994a56a30ba318381d36763242d8f05e1..b8e745fe7292ee285422ef768b60074ab9f3bab9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
@@ -4,7 +4,7 @@ talc-104:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-104:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml
index 26645158c0b8b06d238f7e4d7cb938b786b1cda5..ca31bf21304817761b0cf8e771c0ef02faa394d4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml
@@ -4,7 +4,7 @@ talc-105:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-105:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml
index e898a33a4181c0c8dc1f2f10dc96aa237a2c82ec..96dfed9104722f5f49441abe918ef70172f14e08 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml
@@ -4,7 +4,7 @@ talc-106:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 04/24/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-106:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml
index 75f2cebbf052eef2a6ba47a8ebebbf976e94b819..d984472c93d643692e7f64c51d85c70d83a7fcc5 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml
@@ -4,7 +4,7 @@ talc-107:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-107:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml
index d1d84be603104a70193328a941e6d02b8eee9d76..4a902fb3b643ceba7ba5b3a9877efac6f0ce48d1 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml
@@ -4,7 +4,7 @@ talc-108:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-108:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml
index a7dd993d01070f475e2b1decaca3191b5890a12e..abcb28e54360113fd3973beb958889c669ac44dc 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml
@@ -4,7 +4,7 @@ talc-109:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-109:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
index f4c2ceccd716d82597baac4b23502e0d2c2dd946..7eef61e1b710f100dfe8a490ecfcbc034399c383 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
@@ -4,7 +4,7 @@ talc-11:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-11:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
index d60509cdc95eb2bbbebbd8ce63ea3746268918fd..6521e543ebee1df1987fa1667b5a9e15c89e7e72 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
@@ -4,7 +4,7 @@ talc-110:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-110:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml
index b8938f331f1ac84e69b22dacef3dca505490d1cf..2043fb304ee0e5904b293f6017b62c8794a3e3d1 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml
@@ -4,7 +4,7 @@ talc-111:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-111:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml
index 0eba69bbeccd35e4df8ba7f8c69522c1cb2b5b77..40671024ebe332b4251aa4c070c1d07ddfd47891 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml
@@ -4,7 +4,7 @@ talc-112:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-112:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml
index 6c8f586e6704ff6dce602f07ca5d4b7e97db1237..50ff5bc7e0d6fe0935e37134976e4ebf62de8bab 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml
@@ -4,7 +4,7 @@ talc-113:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-113:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
index 7e114f8f0f2128aabf103aecc11569342ecbaa63..1680376335980bef11e3ebf415196199128a8957 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
@@ -4,7 +4,7 @@ talc-114:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-114:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml
index ada9626b1671b3e287d1230e947285fc7babf8c0..9594fdf0412c197bff0a1eb7952c386c9d1c8738 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml
@@ -4,7 +4,7 @@ talc-115:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-115:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml
index 579bbfb64fda07f0e6981a4256c72a1084ae95f8..f340e730bacfa1ea0fdbe48b7c5bb472fbc0c2e0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml
@@ -4,7 +4,7 @@ talc-116:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-116:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml
index e95cbf5db5bf467c31f729408e57fcb98fba692a..3282911004bda997854953fa3328c48c9afa0676 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml
@@ -4,7 +4,7 @@ talc-117:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-117:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
index d8b90108a31cd3b9ae37c5363700c296df0dfc43..8000b36f5efcf9ace616ecba5491fa6747fcd23a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
@@ -4,7 +4,7 @@ talc-118:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-118:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
index a01a5a9b7de3933f09267ad594d11fbb7d03f29d..0c6ebb99098e0ca120f7a0416e09a3a71e16fbbe 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
@@ -4,7 +4,7 @@ talc-119:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-119:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
index 85cece74331127f86e846d15f982b5450269ecee..a4d366821395c075e8cca06be97638b3f2fc39cc 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
@@ -4,7 +4,7 @@ talc-12:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-12:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
index 5a037287a48830124dcf3c75e6a4bcaa3abcb984..de09b2465ad68369a67363009dfc70a8b6d30813 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
@@ -4,7 +4,7 @@ talc-120:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-120:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml
index 688482a49cff45ac37b6f80f629a8b827a5de682..0c5c362a4e75211255fb29c4c1d677cc020080b0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml
@@ -4,7 +4,7 @@ talc-121:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-121:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
index cdd5419809e22b14eb6763a12977cd958980e75c..ea7cb6fe846ad31b6825052f1ac74fce205169c3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
@@ -4,7 +4,7 @@ talc-122:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-122:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
index c5fa54c2e4e5458b13d1f3935850017783e4d5ca..fc67e58f62a2d483412fb46464bc1f3735daff78 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
@@ -4,7 +4,7 @@ talc-123:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-123:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml
index 18fde58bbf8f6aabcd8d57cdea0719c7295bdf07..171e3f4f32edec6e22defcc29cf8cfa8d00baeea 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml
@@ -4,7 +4,7 @@ talc-124:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-124:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
index 23a37d0cd0547791cefb7d0c4b467eb88cdba8ef..ef0b07cfb257e588864ca0e24c5c9229b1bd8683 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
@@ -4,7 +4,7 @@ talc-125:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-125:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml
index 1119165363e3bead6ae6b50cc15c424f13f8cd13..404966b37be4364a53a9a0fca4f77b37626f8f5c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml
@@ -4,7 +4,7 @@ talc-126:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-126:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
index 6b2817104d07a4738bdfec430558287c86449c42..c75ac8313733ca50d51e9fecdfce55fc6b88e5b3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
@@ -4,7 +4,7 @@ talc-127:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-127:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
index cfc2680be130c3e01ba4291b9d78ed105333fa0f..e43d0181a13ae4056c8d0078c37aa9ae43f152ed 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
@@ -4,7 +4,7 @@ talc-128:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-128:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
index db3aae73b68684ba9a10136cb2c069a85c8b8661..5f4f3220e257841eec020ad45cf584ac823d6cf4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
@@ -4,7 +4,7 @@ talc-129:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-129:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml
index b9060a7b7ba297fb467c1459ace9c4d77d66855a..924ae7b7573902ee163d07f2fd085f8f9ec47bfb 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml
@@ -4,7 +4,7 @@ talc-13:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-13:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
index 3b817187a6f3e496d3c8553ff5314e631908cbef..c7eafe5d7908d40434f818d7c45b80db5ec1fd13 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
@@ -4,7 +4,7 @@ talc-130:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-130:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
index afc2e9a419c515d8cc34bffe7453adc674985fe1..3e23f663dacf85e2d8768309eed803d10029d3b4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
@@ -4,7 +4,7 @@ talc-131:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-131:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
index d4f66facfd66e68bfe42f273a7ea086f58d79cdc..5dca6594b8b4c163754c5e041bab10155e92b4d2 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
@@ -4,7 +4,7 @@ talc-132:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-132:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml
index 48bdce522db7a14e53b657fc47527a95b1662ddb..075642516139dc16ea7586532c75105a125ec3e3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml
@@ -4,7 +4,7 @@ talc-133:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-133:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
index ac0239d23a4d7cf71c3b4dfa4bf32469e6f08e4b..6d88c7757dda970427d171348d3710328a2d220c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
@@ -4,7 +4,7 @@ talc-134:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-134:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml
index 9cba6565d46b97b624435a2fd9f4dc0dedc6353e..ce03a35baac374be5ce8154f7a58c88dd0fcd8b3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml
@@ -4,7 +4,7 @@ talc-14:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-14:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml
index 9c7da14f0417b5241f5767d85171994f4519b62d..f58052d5aaa433f403f1f1ae8e6c54324a52c21b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml
@@ -4,7 +4,7 @@ talc-15:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 04/24/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-15:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml
index c85e68219bc368075c59ae5267aa9fb439b06d61..44d0b9c5a590b0ea272ac6c9a9eb4a711cdb33ba 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml
@@ -4,7 +4,7 @@ talc-16:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-16:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml
index 68623dc2582c30cc643a965ce540d6b7c11f4747..9932ac2427393da4f5732e714d980d186ac505d8 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml
@@ -4,7 +4,7 @@ talc-17:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-17:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml
index f719b5655a8a29a6a08cf4d746e9bf2255f3be73..96090649fc6be909b847c1636f6b7829b41d62d6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml
@@ -4,7 +4,7 @@ talc-18:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-18:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml
index e22bfed336ed7d0bceb0019e97587f76f3a7b995..4f1ac270bd1b2c69252b0642347db5b642b88aee 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml
@@ -4,7 +4,7 @@ talc-19:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-19:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml
index 899d8b3f7bfb549d4cda3c49d3704574d5fd888d..06e60f5764579289a62adf141204bc87ab81615c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml
@@ -4,7 +4,7 @@ talc-2:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-2:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
index 3dabd8461664a5a2921617745df1148fddfcca3a..af6f32fd0970957d96b46ff52f1d4ff7dca0ca7d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
@@ -4,7 +4,7 @@ talc-20:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-20:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml
index 8afefd798b95b51235a3cada0e61ead09c22c519..1c7b5cae861d0b781b2626837fb8a99ef1ae1ba0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml
@@ -4,7 +4,7 @@ talc-21:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-21:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
index 4905881d2146e888e7e2d4e6aff53ea87cfa2308..13e50eee58abf976ab92b5fbfa4a50f79f556a37 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
@@ -4,7 +4,7 @@ talc-22:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-22:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml
index 1f7d181ebc7f10118116b29f97e6e7828d19a889..6f7b65151217bfe05ecc7c18fcb3a139e75c7f64 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml
@@ -4,7 +4,7 @@ talc-23:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-23:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml
index 291fd4acd3b55ab9194a7966868342eeeec975bc..67455aa2cbfb1790843d72acfd48e8485c14eb67 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml
@@ -4,7 +4,7 @@ talc-24:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-24:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
index 057307eaab903c4845a8df13f273ab60f17bcf69..ef4bc249d77d7c2842ec192138624c41a6d6aa57 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
@@ -4,7 +4,7 @@ talc-25:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-25:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml
index 364c3a0f1af258400ee5710506355c85c6f2e987..2e7926f0b72849d6e4a484fdeb15f6eaf6e2964b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml
@@ -4,7 +4,7 @@ talc-26:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-26:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml
index 5a470868e3af1d4a01ca97ebf386edaafa2d6d61..5802751d998cc4808b6d2fdf3aaf6b6c6a87e92f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml
@@ -4,7 +4,7 @@ talc-27:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-27:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml
index c4c64f1d702d94e9840588951af4c9bbcad73a2f..8de29b4b128fbe3d1611a408267f9b7e068fe980 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml
@@ -4,7 +4,7 @@ talc-28:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-28:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml
index 44b36495da17f21c34a3a36b09fd6d89fe33db5e..39f4f9e1491f61f01bd9f0c99dba893840c85941 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml
@@ -4,7 +4,7 @@ talc-29:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-29:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml
index fb1d38b587ff099d877da3138db342bc3186bdf0..61aa72f79a550a84e53f358249f6e3de5c0032b5 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml
@@ -4,7 +4,7 @@ talc-3:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-3:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
index 6c78e86417f4e3cced483d6580c7979cf027cee7..dc14c07e1bf4c0de7921cf05289d6e2868a22132 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
@@ -4,7 +4,7 @@ talc-30:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-30:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml
index 1622e023a5c8ea4b587a4993d7fdc464b6db5972..7934800d19a3de65998ab54cfc488d833f261a6c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml
@@ -4,7 +4,7 @@ talc-31:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-31:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml
index 702a409e2b6c9daba6e6339155a172c38b874bb3..640ea2e2c01fc0eb6c14efc9f292baee0ed8f392 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml
@@ -4,7 +4,7 @@ talc-32:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-32:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml
index 62af89edf1d6b433a72d25cc8ef8ec9bd78731f8..ae8a91a0dde1be13cdd7f0d27ea9f7236338785c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml
@@ -4,7 +4,7 @@ talc-33:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-33:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml
index ff9f31fe352f7e12c6db861b2af0d7f78adf0629..a21f42bafaafc75c756391e3c96be629fd308532 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml
@@ -4,7 +4,7 @@ talc-34:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-34:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml
index e6d9f0b33569d6f04aa32c36bd4691a9ebe01232..0cba99f7f283933e55b47134b2fe76163a3e451a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml
@@ -4,7 +4,7 @@ talc-35:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-35:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml
index 555ed1458b4b9416be96ce3a7b8fdee4c80a8bd7..d76ffefe64e27392bb84b9ab1dda45942bd60d2d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml
@@ -4,7 +4,7 @@ talc-36:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-36:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml
index 29efbc05786c25bea70e605a5c46e8fada7994cc..b21af2849149e4d238deb06605d66cfcda05ab71 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml
@@ -4,7 +4,7 @@ talc-37:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-37:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
index bba850e031d94fbdc73d9598b4f73822650692c4..ef566b052b24d141ece3f272d65c1a146efc4978 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
@@ -4,7 +4,7 @@ talc-38:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-38:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
index f4a9c59358f7be1b98a59e0b49dcf26f148bd3c1..676334d155d989731b23c03895a3ecec78639b22 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
@@ -4,7 +4,7 @@ talc-39:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-39:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml
index 3817546cbbd74b6da78ade79b053ec9791b9206a..48f1ea03cce336719b84afc15bbb776d7340afbf 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml
@@ -4,7 +4,7 @@ talc-4:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-4:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
index 64f96aad235d0041052355768ac464dc0b8e0037..bc47ca638b39e1ef34818005fd8ffe955b94e404 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
@@ -4,7 +4,7 @@ talc-40:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72503
@@ -30,11 +30,11 @@ talc-40:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
index 914ffb09d4b504ea4ceee8c148cb36918fecfe64..242ff1ad5bb1841c0fe9341320a58be5f9d2e367 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
@@ -4,7 +4,7 @@ talc-41:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-41:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
index 9d271c180b15f500ffc0d01639b59212984fcf9e..6e487d99ec177dd28f4211519d999bff29538c05 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
@@ -4,7 +4,7 @@ talc-42:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-42:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
index 0b6d6c2ec3eacfe6c46951944817c5a7ef97d66e..6061c7a3b94875d7608a69f3223b3535ed89c71e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
@@ -4,7 +4,7 @@ talc-43:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-43:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
index 927a7205f80d5c22f92d0f414fa6ebedb36ef051..67eabb99445088a1f22cce28a376efa55430c58f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
@@ -4,7 +4,7 @@ talc-44:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-44:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml
index 43b39a2f1b0b475c6c6574076084310635012508..fde0c438c8ea7d4db2621dd6f6c1a3995336f82f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml
@@ -4,7 +4,7 @@ talc-45:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-45:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml
index 97250386ec7dd27700913aa48e9d45d20241d0e5..11e032b5b5b722fec9a301051802a70fc524a78b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml
@@ -4,7 +4,7 @@ talc-46:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-46:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml
index 2ddf53f403f9a396e921226ef42715f5859afd08..c860a78a8d8bcdcf6080e88ac84dc1c4ea3b0c54 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml
@@ -4,7 +4,7 @@ talc-47:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-47:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml
index 275847a463ffeba170c29f570b6e3f061eec894b..f3363d2ebace338dce33ac532de9b75b67309872 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml
@@ -4,7 +4,7 @@ talc-48:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-48:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
index 0068f6183d1b5f8c38ffae504d533df018f15e9e..99344124153af807d7749e6dae77a1b9840bf6f7 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
@@ -4,7 +4,7 @@ talc-49:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-49:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml
index de2f4406dfac42cc97bd9b935567c4bdf08ac216..025587b91633119d64205c146d4688aa6ef239bd 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml
@@ -4,7 +4,7 @@ talc-5:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-5:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
index 9b42a3aa7391421e77856bee6d9f46b8e3a00d6f..5cd88c0840ca77c6f91f8570ccdf96fabc5f385e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
@@ -4,7 +4,7 @@ talc-50:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-50:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
index 5e2b7176361dd5f4722fba7aaeff05dd313ea860..9d72d8d33d4265f84f75f910e14610c0e93d83d4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
@@ -4,7 +4,7 @@ talc-51:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-51:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
index 695aa9c212462768dcc7457c5d90cfff177f926c..d6018444663748b6b5428dd3d74305ac802adb26 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
@@ -4,7 +4,7 @@ talc-52:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-52:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
index c6ab60b536fa8242d623ce1f7d5a7933e4add91a..c4bef147fa4de6b73c9f0eb5a2026962aee281ca 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
@@ -4,7 +4,7 @@ talc-53:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-53:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
index 0ee0b6a326a5cdc84ffb4ae0714678987cf0e38e..ce66732bf89418106ce41829458f5cd877e4294f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
@@ -4,7 +4,7 @@ talc-54:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-54:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
index e239a0c4c5d9b21ca9cd59874b1508c086389ec6..0b62326928766b5f401df689c961211ce4d10929 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
@@ -4,7 +4,7 @@ talc-55:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-55:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
index d69cded3813f5668253cdc5240e638dea7998a9a..9d9d0f1a5b4d09acc3100258d2729e4e5d55308c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
@@ -4,7 +4,7 @@ talc-56:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-56:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
index 977b8e5c7dbfb2f9824a7df686c95d34733f0671..03cbf0f9e218b9435eeba26591cac87820b7b2c7 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
@@ -4,7 +4,7 @@ talc-57:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-57:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
index 5bc82e668a7b36b7899db1080d5ecbce1c0a0183..e60d259531847e812da6030984173175f3359246 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
@@ -4,7 +4,7 @@ talc-58:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-58:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
index 06cea092019453ff6093e717d471520f1a135ca2..be15bb4921500b7f1c90173f568300443fad24ca 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
@@ -4,7 +4,7 @@ talc-59:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-59:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml
index e15406f0e2cf5b4e24b3ae121c87e63ba2dbe4e5..242d6b7b9b86bed1a9af2133072b50778836566d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml
@@ -4,7 +4,7 @@ talc-6:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-6:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml
index cf58fc202a6525d78f7429dd0cdf54c96ab876c6..56cb98c7b001c48aa023696756a3c66ce388948f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml
@@ -4,7 +4,7 @@ talc-60:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-60:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml
index 7a440a733bfcb00b4d6af47297692586705328a3..3dbd54855b9e5afee0cb44fd7af2e6c36616007c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml
@@ -4,7 +4,7 @@ talc-61:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-61:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml
index aeb87d59e3a3bd7db5067f98d4e307c6c1fbc226..11046e9e09313ab3c938475dc2ca3ebf8057d602 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml
@@ -4,7 +4,7 @@ talc-62:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-62:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml
index 6d18c1662a7450fa4fdf54568315b3eb16387da8..13b3b0efca1696f1ced31f8ba67eb40c379796de 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml
@@ -4,7 +4,7 @@ talc-63:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-63:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml
index e5900a6b2441f746618948404317d08abdceb677..c2a8589ec7bf330a51c3242f4596446adb825a6d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml
@@ -4,7 +4,7 @@ talc-64:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-64:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml
index 081ec78a5ff5bee72a1d0f35198c3fe9710c6fc7..e1f64b841592a1dfdebf8b2e653b85187a04a053 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml
@@ -4,7 +4,7 @@ talc-65:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-65:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml
index 30c82ba1c20b5a14edd2a4bd07f4c798c0132faf..5193fb8dfc0955bba7f6c4a6ffca02657d1ab4f6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml
@@ -4,7 +4,7 @@ talc-66:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-66:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml
index 46357c2640c9625d84f21b7c3a5990e3b6dc2b7b..8be294cbdf9236ff519e770c0a312f344d7b9510 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml
@@ -4,7 +4,7 @@ talc-67:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-67:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml
index 88929408b9cb170bd7b8f84edc7bf5e97e8eab28..3cb9a245c8991712821bc86f916ebfb443b3a484 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml
@@ -4,7 +4,7 @@ talc-68:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-68:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml
index e3a6b281d25b5bb0ccbf16951bfb8378f18376ab..e7435b922d12f3ac3fa052e929fd8567958de987 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml
@@ -4,7 +4,7 @@ talc-69:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-69:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
index d41fe3c10c7f4a9dcf7af5579bf04dd184429869..193f820ee2a893a9341da8232de0f3cb87228f29 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
@@ -4,7 +4,7 @@ talc-7:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-7:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml
index dfc215df1bb05805d43567ef1a4372a1ae541a9f..7883bb7be8fd566d59452891a8fe2b60c610c070 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml
@@ -4,7 +4,7 @@ talc-70:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-70:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml
index dbed10cdb6c1979198fcc756beab3a1b78d604ed..201aeb0eee3122ce18f7d245205b128c707db045 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml
@@ -4,7 +4,7 @@ talc-71:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-71:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml
index dcca1ad2a587fb391019ea394786c994824ad3b7..34e300045dd38647264f7d6bf15483bae8f2c454 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml
@@ -4,7 +4,7 @@ talc-72:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-72:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml
index ba394e702a18499a6cb906d6ffe83c59237c842c..381642abc59eb28949e3aef320d7b636907940c6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml
@@ -4,7 +4,7 @@ talc-73:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-73:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml
index 13d6a19d634d7df8bf28b81e84dba7f39ae57b34..b21835da8a748adf2b6e0353d2e1f64f0d5fa568 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml
@@ -4,7 +4,7 @@ talc-74:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-74:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
index 0b9bb7b91e040e4a5f90d877819c06937dd1b04c..e3ddc326576fc6b5578b183212670a6fc4c3460b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
@@ -4,7 +4,7 @@ talc-75:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-75:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
index 17a1aedbf17134342c97b287ff7c3d61068bd1d4..5b2473f7a90df556a0b034513ecc03c5eeacc2d3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
@@ -4,7 +4,7 @@ talc-76:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-76:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
index 34f96c1fa70224ac9099ad33bd7a82464fbb5e94..73c73fb56ae11356df5be4888b7ecdc2f87c9687 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
@@ -4,7 +4,7 @@ talc-77:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-77:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
index fc51659cc2fd0d014327b179efad04963a6b4c7f..6e6b5197d461e529e25036b9fa8cb48b6e9f00d6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
@@ -4,7 +4,7 @@ talc-78:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-78:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
index 306dad29c6e26e9013f6737589ab323fc067bc3c..5764962c11675ba3375d85c69667936601478cdf 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
@@ -4,7 +4,7 @@ talc-79:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-79:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml
index 82ddd5c29e68764ca1264d14a9865ec5873dcc35..a8e98909d856acfe8b104d9cf4c16e0b4885fd35 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml
@@ -4,7 +4,7 @@ talc-8:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-8:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
index c36061ebdfd69525942738eb49d0c916f2f77305..628588598860c5bcf50d234c2dee4d2dbb191497 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
@@ -4,7 +4,7 @@ talc-80:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-80:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml
index 64cc87af8ad3dc62dae31c565c9bd6b3f18fed7f..af6e5cd1fe6ce896719bf2d072b20c851f30ec10 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml
@@ -4,7 +4,7 @@ talc-81:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-81:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
index 90181e45edd185053111955a9d42bafffc9e4ec2..cd4dea60942268ae43c0bb2af40fe5e0d41b9cd3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
@@ -4,7 +4,7 @@ talc-82:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-82:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
index 49bdda215985739ff81486eb594c2b25c28ac038..81a68db967ac33a4547649eec8caa5400a1ad8be 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
@@ -4,7 +4,7 @@ talc-83:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-83:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml
index d399ed8c5a6c4a8c2af338aa7fd2fbc1c28f46fa..baf8b9efb3260fcc39f56070cfeefac272682fcd 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml
@@ -4,7 +4,7 @@ talc-84:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-84:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
index 207940f476c980f12b65ec4dafad8eb83e2d4c7f..980f9cd63739b18961ac55cd701be8d0ebf24acf 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
@@ -4,7 +4,7 @@ talc-85:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-85:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml
index 5e3fedcc729e9e83ba6a21012efc2e48b13b0274..1010d9f30f1f3ce2be6785410ac92039f086fa44 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml
@@ -4,7 +4,7 @@ talc-86:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDS72103
@@ -30,11 +30,11 @@ talc-86:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
index 93fef39efb244b7cc94eaa5e0a1d3c2c98447399..944070c365f8a5492eb8c3fde0f34d20994c9db4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
@@ -4,7 +4,7 @@ talc-87:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-87:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
index 9d1eead1009656971da71d7dc5ffe5140ee32a29..ad6a4526c7a66b6480bcd1b14c52c28cf9bbb81b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
@@ -4,7 +4,7 @@ talc-88:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-88:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
index ca35dfb1b11fcecb9872ffabc566ff0fa4127225..49dda7ee00995801ceb6a843e35fe06d009749bc 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
@@ -4,7 +4,7 @@ talc-89:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-89:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml
index 4539af2b369191f22a07d3b00082ef0d5c4261ff..8f35acb091e6450b0664093fb472f691f1bb0d10 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml
@@ -4,7 +4,7 @@ talc-9:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-9:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
index 57af7b9f961fbc463e7b83309b9ef729678ec5bd..f747f19c0146a1af7ab759819fa92814b7f9d564 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
@@ -4,7 +4,7 @@ talc-90:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-90:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
index 700e61c9c7cbe1c133d7e7d44eda2faf065a6434..cba9b1a16881bf975113154aa89da897f423059f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
@@ -4,7 +4,7 @@ talc-91:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-91:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
index ccc8d73370c58915abb078c635d66f925b8c85ab..6e0e59424717882aef12e16721db840c8ccfbe30 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
@@ -4,7 +4,7 @@ talc-92:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-92:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml
index c81d110aee0d46d5f72af2d3861468cb11ee38af..13a91ec8b34a4e13512d0e0df35b691e7308069c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml
@@ -4,7 +4,7 @@ talc-93:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-93:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
index 3d9474ae657e2dbab4d0d8347b7730b7be3f5e7a..2ce4235b374ca480bdd41150b42cff54744bed99 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
@@ -4,7 +4,7 @@ talc-94:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-94:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml
index 2f42ecae42dab1ed963148954dda34a34da065a7..b6ceb6cdc62ff15a69ef409f0ac9f93aa2f5acf8 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml
@@ -4,7 +4,7 @@ talc-95:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 04/24/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-95:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
index 4c69ef5948f94fe73d9d079fa872702b6ff692f5..e4fb85f6a32935a7a848df3b94de681baf31ef87 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
@@ -4,7 +4,7 @@ talc-96:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-96:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
index 6e42ed84be84f3b0ae1aaa499a6f59aa1cb74288..a5892d55841bb99dc1ad8961b1a1a2edf9a7507e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
@@ -4,7 +4,7 @@ talc-97:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-97:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
index 5ad3c2418d40e0abdbdced7f10628e50a5b07422..4a689c241c8e89914e5de32ff67c5401afde00b3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
@@ -4,7 +4,7 @@ talc-98:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
@@ -30,11 +30,11 @@ talc-98:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
index dca58ca69407d69796821b1495bf8d2f2158a59d..124d36b0ace0480016ddcd0974b1d7910337cc9f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
@@ -4,7 +4,7 @@ talc-99:
     vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: 08/21/2009
-  block_devices:
+  storage_devices:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
@@ -30,11 +30,11 @@ talc-99:
     cache_l3: 0
     instruction_set: x86-64
   chassis:
-    product_name: S5393
+    name: S5393
     manufacturer: TYAN Computer Corporation
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/talc.yaml b/input/grid5000/sites/nancy/clusters/talc/talc.yaml
index 76b16388c40f60c44f3daba9e32eb5144d3c2a32..08c86ba23c83149f42cf9c8280aa0d29109f7e10 100644
--- a/input/grid5000/sites/nancy/clusters/talc/talc.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/talc.yaml
@@ -17,11 +17,11 @@ nodes:
       virtual_size: null
     operating_system:
       release: Squeeze
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA II
         driver: ahci
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/nancy/dom0/dom0.yaml b/input/grid5000/sites/nancy/dom0/dom0.yaml
index 91a0704972e4dbd28714950bab038db9217a23fa..b0d9a6c4ffaa32474b4a4c9b8a93dd458a752ac0 100644
--- a/input/grid5000/sites/nancy/dom0/dom0.yaml
+++ b/input/grid5000/sites/nancy/dom0/dom0.yaml
@@ -1,51 +1,51 @@
 ---
 fgriffon1:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:E0:81:B2:C1:A8
       ip: 172.16.79.1
 fgriffon2:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:E0:81:B2:C0:16
       ip: 172.16.79.2
 grog:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 84:2B:2B:60:15:6D
       ip: 172.16.79.3
 fgrelon1:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:18:FE:7C:5F:B2
       ip: 172.16.79.9
 fgrelon2:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:1B:78:9D:24:FE
       ip: 172.16.79.10
 srv:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: A0:36:9F:28:10:AC
       ip: 172.16.79.15
 srv-data:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: A0:36:9F:2C:5D:B8
       ip: 172.16.79.16
 gras:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:0D:60:55:16:68
       ip: 172.16.79.14
 fmbi1:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:E0:81:B0:5E:90
       ip: 172.16.79.19
 fmbi2:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:E0:81:B2:C1:BC
       ip: 172.16.79.20
diff --git a/input/grid5000/sites/nancy/nancy.yaml b/input/grid5000/sites/nancy/nancy.yaml
index 0cf6549d94dcb9096347ec893acab0210c333edc..00e4f76f83c409eaceec51f71b7b82ec972bc3c1 100644
--- a/input/grid5000/sites/nancy/nancy.yaml
+++ b/input/grid5000/sites/nancy/nancy.yaml
@@ -20,19 +20,19 @@ production: true
 laptops:
   grosminet:
     user: emorel
-    network_interfaces:
+    network_adapters:
       eth0:
         ip: 172.16.79.6
         mac: D4:BE:D9:73:E2:D4
   grimoire:
     user: sbadia
-    network_interfaces:
+    network_adapters:
       eth0:
         ip: 172.16.79.5
         mac: 5C:26:0A:23:20:96
   cacahuete:
     user: cparisot
-    network_interfaces:
+    network_adapters:
       eth0:
         ip: 172.16.79.18
         mac: EC:B1:D7:99:11:68
diff --git a/input/grid5000/sites/nancy/net-links/net-links.yaml b/input/grid5000/sites/nancy/net-links/net-links.yaml
index d3d1df320dc5e68afa3202782bd1458d61c53274..fa10643a3fe3d020da759aef94fe43092de455ce 100644
--- a/input/grid5000/sites/nancy/net-links/net-links.yaml
+++ b/input/grid5000/sites/nancy/net-links/net-links.yaml
@@ -1,6 +1,6 @@
 ---
 sgraphene1:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 40:01:C6:8B:E4:80
       ip: 172.16.79.201
@@ -9,7 +9,7 @@ sgraphene1:
       ip: 172.17.79.201
 
 sgraphene2:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 40:01:C6:8C:06:00
       ip: 172.16.79.202
@@ -18,7 +18,7 @@ sgraphene2:
       ip: 172.17.79.202
 
 sgraphene3:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 40:01:C6:8B:C2:00
       ip: 172.16.79.203
@@ -26,7 +26,7 @@ sgraphene3:
       mac: 40:01:C6:BE:4D:00
       ip: 172.17.79.203
 sgraphene4:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 40:01:C6:8B:EE:00
       ip: 172.16.79.204
@@ -35,7 +35,7 @@ sgraphene4:
       ip: 172.17.79.204
 
 sgriffon1:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:22:57:39:F1:81
       ip: 172.16.79.205
@@ -43,7 +43,7 @@ sgriffon1:
       mac: 00:22:57:77:CD:81
       ip: 172.17.79.205
 sgriffon2:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:22:57:39:eb:81
       ip: 172.16.79.206
@@ -51,7 +51,7 @@ sgriffon2:
       mac: 00:22:57:77:cc:01
       ip: 172.17.79.206
 sgriffon3:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:22:57:39:e6:01
       ip: 172.16.79.207
@@ -59,12 +59,12 @@ sgriffon3:
       mac: 00:22:57:77:CD:41
       ip: 172.17.79.207
 sgriffonib:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 
       ip: 
 smbi1:
-  network_interfaces:
+  network_adapters:
     eth0:
       mac: 00:22:57:39:d2:01
       ip: 172.16.79.208
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome.yaml b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
index 8051bc245dc4aef029ea12d915fe4f7bb740d105..e92ee6b32882499ac7d93f9c6bd7533abe1db857 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
@@ -19,12 +19,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         rate: 10.0e+9
         device: eth0
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome_manual.yaml b/input/grid5000/sites/nantes/clusters/econome/econome_manual.yaml
index dc043739562579da3fc7fdde1f3f73efcf1ed349..2a56be7a3956ebcbc3542b61e75c53a71bf88dfc 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome_manual.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome_manual.yaml
@@ -1,92 +1,92 @@
 ---
 nodes:
   econome-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/45
   econome-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/44
   econome-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/15
   econome-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/14
   econome-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/43
   econome-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/42
   econome-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/17
   econome-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/16
   econome-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/41
   econome-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/40
   econome-11:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/19
   econome-12:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/18
   econome-13:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/39
   econome-14:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/38
   econome-15:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/21
   econome-16:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/20
   econome-17:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/13
   econome-18:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-nantes
         switch_port: Te0/22
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
index 4cfe8bf8d201687370ca24274eca218cfe787c6a..cb806f35ee45481ca8599c52ec5fdf4f317ad5ce 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -1,12 +1,12 @@
 ---
 econome-1:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -47,9 +47,9 @@ econome-1:
   main_memory:
     ram_size: 68719476736
   chassis:
-    serial_number: CP2YG5J
+    serial: CP2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   bios:
     vendor: Dell Inc.
     version: 2.1
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
index e96fa774066b49835a7df487b5513b9191ff7984..d7a06e07893f6ee63c93532ad075b5c30981abaa 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -1,6 +1,6 @@
 ---
 econome-10:
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -44,7 +44,7 @@ econome-10:
     vendor: Dell Inc.
     version: 2.1
     release_date: 09/06/2013
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
@@ -68,6 +68,6 @@ econome-10:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: G9GYG5J
+    serial: G9GYG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
index 14ffbe07b04ea7707cb43ad258e234f0275c6cb3..a52fde72248e789119de4cefc8963a09bfed451b 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -1,6 +1,6 @@
 ---
 econome-11:
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -59,7 +59,7 @@ econome-11:
     smp_size: 2
     smt_size: 16
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
@@ -68,6 +68,6 @@ econome-11:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: J9GYG5J
+    serial: J9GYG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
index 6ce8d2d052ca693be390d74178016a21087de77f..55f3a1e47d917ddc7b33438f21bc9a4baffd11fd 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -2,7 +2,7 @@
 econome-12:
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.192.12
       mac: 78:45:c4:f9:15:a5
@@ -41,9 +41,9 @@ econome-12:
       mounted: false
       management: false
   chassis:
-    serial_number: H9GYG5J
+    serial: H9GYG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   main_memory:
     ram_size: 68719476736
   processor:
@@ -65,7 +65,7 @@ econome-12:
     vendor: Dell Inc.
     version: 2.1
     release_date: 09/06/2013
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
index 41fd6dbb37e69984ebbde6897b597716310e0098..2563ba98718a9f7c79fb7fb2206137b0a47c45fc 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -1,6 +1,6 @@
 ---
 econome-13:
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -57,16 +57,16 @@ econome-13:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 20971520
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
   chassis:
-    serial_number: HN2YG5J
+    serial: HN2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   bios:
     vendor: Dell Inc.
     version: 2.1
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
index 0d3df299540d976569043d9770318e3d86afd5e5..399643544aac71055f173628c686708c8eed853d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -14,16 +14,16 @@ econome-14:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: JN2YG5J
+    serial: JN2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   bios:
     vendor: Dell Inc.
     version: 2.1
     release_date: 09/06/2013
   main_memory:
     ram_size: 68719476736
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.192.14
       mac: 78:45:c4:f9:2c:71
@@ -65,7 +65,7 @@ econome-14:
     smp_size: 2
     smt_size: 16
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
index 40041be031d62ab3b7ca019fb27496e04f6ca604..ae1ceadfc494c12401da83772d293011f8a4795f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -4,7 +4,7 @@ econome-15:
     vendor: Dell Inc.
     version: 2.1
     release_date: 09/06/2013
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
@@ -24,16 +24,16 @@ econome-15:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 1P2YG5J
+    serial: 1P2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   main_memory:
     ram_size: 68719476736
   architecture:
     smp_size: 2
     smt_size: 16
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
index 1fb418d098fa3464bbf9e1e4e417d6a4287a9760..02be2bab8a317645e94f726817ff51e313591e40 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -3,9 +3,9 @@ econome-16:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 2P2YG5J
+    serial: 2P2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   architecture:
     smp_size: 2
     smt_size: 16
@@ -21,7 +21,7 @@ econome-16:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 20971520
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.192.16
       mac: 78:45:c4:f9:2d:b2
@@ -63,7 +63,7 @@ econome-16:
     vendor: Dell Inc.
     version: 2.1
     release_date: 09/06/2013
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
index ed8b21df828183cafc1605084beb133eca47ee7b..15cbf10b1c123b1e054d5f153e37bebd0c8e128c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -1,6 +1,6 @@
 ---
 econome-17:
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -53,7 +53,7 @@ econome-17:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 20971520
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
@@ -62,9 +62,9 @@ econome-17:
   main_memory:
     ram_size: 68719476736
   chassis:
-    serial_number: 1Q2YG5J
+    serial: 1Q2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   bios:
     vendor: Dell Inc.
     version: 2.1
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
index eb091f4357bac748ba885e68d110370cc6654692..f20d5c4666b5c2be68c68265df4f3b93fe2c2ff6 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -2,7 +2,7 @@
 econome-18:
   main_memory:
     ram_size: 68719476736
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.192.18
       mac: 78:45:c4:f9:2d:73
@@ -61,13 +61,13 @@ econome-18:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 20971520
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
   chassis:
-    serial_number: 2Q2YG5J
+    serial: 2Q2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
index 59ec21d20c4f5bb889e0e8d9b0d9e37fad3c8c43..a84cd1bafc9a6361c97380a75c997260aa8814dc 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -21,13 +21,13 @@ econome-19:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 20971520
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -55,8 +55,8 @@ econome-19:
       mounted: false
       management: false
   chassis:
-    serial_number: JN30D5J
+    serial: JN30D5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   main_memory:
     ram_size: 68719476736
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
index 40e832d262aab30bcfd5dfed5460f159583b1fc2..eef6f56bc55bd56a90973469375bf3a3e24a10ad 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -1,6 +1,6 @@
 ---
 econome-2:
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -58,14 +58,14 @@ econome-2:
     cache_l2: 262144
     cache_l3: 20971520
   chassis:
-    serial_number: DP2YG5J
+    serial: DP2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   main_memory:
     ram_size: 68719476736
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
index 00d616e5b63ea9d0c9f4b7a2134d6defa115569a..223fe11c463d43e506f47a839d33d67302a7686d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -1,6 +1,6 @@
 ---
 econome-20:
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.192.20
@@ -28,9 +28,9 @@ econome-20:
       mounted: false
       management: false
   chassis:
-    serial_number: HN30D5J
+    serial: HN30D5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   supported_job_types:
     virtual: ivt
   processor:
@@ -46,7 +46,7 @@ econome-20:
     cache_l3: 20971520
   main_memory:
     ram_size: 68719476736
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
index c59bdfed9185d5c3057695441a758150958c52b0..03ce9e26760874eec3d33c71976685aa962d96e2 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -1,6 +1,6 @@
 ---
 econome-21:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
@@ -10,7 +10,7 @@ econome-21:
     vendor: Dell Inc.
     version: 1.0
     release_date: 04/26/2012
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -42,9 +42,9 @@ econome-21:
     smt_size: 16
     platform_type: x86_64
   chassis:
-    serial_number: 2P30D5J
+    serial: 2P30D5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   processor:
     clock_speed: 2200000000
     instruction_set: x86-64
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
index eccce8a06afb5c4d8ea8d2dfb1f34b066509de0a..968ea8bedc4b25537ac666063dc9a8690c744106 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -12,10 +12,10 @@ econome-22:
     cache_l2: 262144
     cache_l3: 20971520
   chassis:
-    serial_number: 1P30D5J
+    serial: 1P30D5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  block_devices:
+    name: PowerEdge C6220
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
@@ -27,7 +27,7 @@ econome-22:
     smp_size: 2
     smt_size: 16
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
index 2d191982420bed162514cd5bba11e15d49b20701..954cd62fa81d6d57c48887d7da96562005e2da06 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -1,10 +1,10 @@
 ---
 econome-3:
   chassis:
-    serial_number: FP2YG5J
+    serial: FP2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  block_devices:
+    name: PowerEdge C6220
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
@@ -33,7 +33,7 @@ econome-3:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 20971520
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
index 607b60101ee06a1160a7ecf12a84ca4723eee100..04debd105e73a844a747f389c5e347905ac6f78f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -3,9 +3,9 @@ econome-4:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: GP2YG5J
+    serial: GP2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   processor:
     clock_speed: 2200000000
     instruction_set: x86-64
@@ -21,7 +21,7 @@ econome-4:
     vendor: Dell Inc.
     version: 2.1
     release_date: 09/06/2013
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.192.4
       mac: 78:45:c4:f9:2c:c2
@@ -65,7 +65,7 @@ econome-4:
     platform_type: x86_64
   main_memory:
     ram_size: 68719476736
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
index 8844161a5c61f73e51c905a9ab777a1760502211..9af6ea7669a3a2ac757ecd1a1a0d9cb443ebd895 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -1,6 +1,6 @@
 ---
 econome-5:
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -40,7 +40,7 @@ econome-5:
       mac: 78:45:c4:f9:16:cc
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
@@ -68,6 +68,6 @@ econome-5:
     version: 2.1
     release_date: 09/06/2013
   chassis:
-    serial_number: CQ2YG5J
+    serial: CQ2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
index c23f7d5e73fb58f81b47abcae6be7ac5a8e31b1a..daba9cd953c978b8bce72ba24ec291548beba966 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -20,12 +20,12 @@ econome-6:
     cache_l2: 262144
     cache_l3: 20971520
   chassis:
-    serial_number: DQ2YG5J
+    serial: DQ2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   main_memory:
     ram_size: 68719476736
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -63,7 +63,7 @@ econome-6:
     bmc:
       ip: 172.17.192.6
       mac: 78:45:c4:f9:14:37
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
index 4b00eb6add1866dcab35b86d1f310f345cece374..d421bd3fb72894b122a1a90fd999da6f22df58d5 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -11,7 +11,7 @@ econome-7:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 20971520
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -52,14 +52,14 @@ econome-7:
   main_memory:
     ram_size: 68719476736
   chassis:
-    serial_number: FQ2YG5J
+    serial: FQ2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   architecture:
     smp_size: 2
     smt_size: 16
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
index d79a69b28456897b1015bb16b80cbddce5948c27..c2f4e889a875832200c3897599d19c292104da7c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -1,6 +1,6 @@
 ---
 econome-8:
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
@@ -10,7 +10,7 @@ econome-8:
     smp_size: 2
     smt_size: 16
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.192.8
       mac: 78:45:c4:f9:16:c0
@@ -68,6 +68,6 @@ econome-8:
     cache_l2: 262144
     cache_l3: 20971520
   chassis:
-    serial_number: GQ2YG5J
+    serial: GQ2YG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
index 61319c6dadf3169fcddb66fbaba2e985ed4dcb95..f591a7caaa55bcc2a6aed8075fc31e8a6b8e811a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -13,13 +13,13 @@ econome-9:
     cache_l3: 20971520
   main_memory:
     ram_size: 68719476736
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.192.9
       mac: 78:45:c4:f9:15:cc
@@ -64,9 +64,9 @@ econome-9:
     version: 2.1
     release_date: 09/06/2013
   chassis:
-    serial_number: F9GYG5J
+    serial: F9GYG5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
+    name: PowerEdge C6220
   architecture:
     smp_size: 2
     smt_size: 16
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml
index ad7ccce7992339cd77e44757dc48e778c3f5b5ec..0bccfbe92caf8a5ceed02caaec48d238392f50a9 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml
@@ -8,13 +8,13 @@ stremi-1:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -54,9 +54,9 @@ stremi-1:
       mac: 1c:c1:de:7b:16:d1
       ip: 172.17.160.1
   chassis:
-    serial_number: GB8043915P
+    serial: GB8043915P
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml
index 4aeb1ce2abfe0bc3ca98563c48d7520a61aabf3a..58f0ca3cdea738a2adfcc6dbc0d736ea864a1c9b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml
@@ -4,13 +4,13 @@ stremi-10:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -54,9 +54,9 @@ stremi-10:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB8043918S
+    serial: GB8043918S
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml
index 3ad86db13cd7de1b1ef7312a7021c44b975bad93..a28f5362775f29d0cc33b3cea3f77f2f1c996191 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml
@@ -4,7 +4,7 @@ stremi-11:
     version: O37
     release_date: 03/01/2012
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -14,7 +14,7 @@ stremi-11:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -54,9 +54,9 @@ stremi-11:
       mac: 1c:c1:de:7a:67:f0
       ip: 172.17.160.11
   chassis:
-    serial_number: T421NP0120
+    serial: T421NP0120
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml
index ef9a31d1963e78437c66015c091fb41b4200e2f9..36be49ab5181e278010135f206d7c5e569c5162d 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml
@@ -4,7 +4,7 @@ stremi-12:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,16 +47,16 @@ stremi-12:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
   chassis:
-    serial_number: GB804391F0
+    serial: GB804391F0
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml
index 08647fcf92fb1ef4bf53dfc5dd54b9c88a256db8..1afe140f08c0d98669856f193181aa79fca0cb74 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml
@@ -4,7 +4,7 @@ stremi-13:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -14,7 +14,7 @@ stremi-13:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-13:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390R1
+    serial: GB804390R1
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml
index d8ab756c619ee06d9309c9fe8cb4a03625d68f32..32de86c9c337fadf44f85cda1ab2f5707acd9f87 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml
@@ -8,7 +8,7 @@ stremi-14:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ stremi-14:
     bmc:
       mac: e8:39:35:af:48:14
       ip: 172.17.160.14
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-14:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: T421NP0071
+    serial: T421NP0071
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml
index 55ec2af09847bc1331797fc922c9ada14e2fa0db..c7f151fe80911bae416392d12baa1be4b1ea8058 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml
@@ -4,13 +4,13 @@ stremi-15:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-15:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390W8
+    serial: GB804390W8
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml
index 6de522f1c76d398a47fccc5d4929dd170b460418..c9810e93cad8c8db1471de4c8cefd14a7bbc8bdc 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml
@@ -4,7 +4,7 @@ stremi-16:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,7 +43,7 @@ stremi-16:
     bmc:
       mac: 1c:c1:de:7b:16:fa
       ip: 172.17.160.16
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -54,9 +54,9 @@ stremi-16:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB804390VM
+    serial: GB804390VM
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml
index a54b803a7531a7f748ad08353e45bbd53ac83cc0..2a310b6893e05f7e05e109162e8f86c1372e4621 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml
@@ -4,7 +4,7 @@ stremi-17:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -14,7 +14,7 @@ stremi-17:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-17:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB80439150
+    serial: GB80439150
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml
index 514a60e0655808f9fc5e84d352e4fa590db527b8..2fc20cd9d142e5a42d9605138812676af2d8f833 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml
@@ -4,7 +4,7 @@ stremi-18:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,7 +43,7 @@ stremi-18:
     bmc:
       mac: 1c:c1:de:7b:36:7d
       ip: 172.17.160.18
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -54,9 +54,9 @@ stremi-18:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB804390T7
+    serial: GB804390T7
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml
index cd6c7c31b6e14e6b3709535f03df891ebffab193..64a220e72d6a7facc71cce8adf6892ea3759fa5a 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml
@@ -8,7 +8,7 @@ stremi-19:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ stremi-19:
     bmc:
       mac: 1c:c1:de:7b:36:33
       ip: 172.17.160.19
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-19:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390TR
+    serial: GB804390TR
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml
index bc1bb82c02f06cc9e7fbcc97c2dd6167e2a2a3fd..1264a66e135fffde57a20fb4f226e718594406bb 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml
@@ -4,7 +4,7 @@ stremi-2:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -14,7 +14,7 @@ stremi-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-2:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390S8
+    serial: GB804390S8
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml
index 37e0e4fad1d2a9c72af3319b4373d49606a79a22..eef23ddeeec382c0424c13e56c91558a713033d1 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml
@@ -4,7 +4,7 @@ stremi-20:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,7 +43,7 @@ stremi-20:
     bmc:
       mac: 1c:c1:de:7a:87:41
       ip: 172.17.160.20
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-20:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB80439168
+    serial: GB80439168
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml
index 8e1b966e1c8b763ab9ea697debbbf5b1d51f5b56..ae80c518487116ec7ae926047c51f5c9b26049b1 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml
@@ -8,13 +8,13 @@ stremi-21:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-21:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390YT
+    serial: GB804390YT
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
index 02ee617dcf9ffa233449e6781aebd71a6b000790..4b7870685f0e06d651c70c73fdd4eeb8388fc7a0 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
@@ -8,13 +8,13 @@ stremi-22:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-22:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390WL
+    serial: GB804390WL
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml
index ecc8ac8fcc478a4b58200044c6a4b7098219bd85..7110e9e42bd88aded32ea749899c16854084e328 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml
@@ -8,7 +8,7 @@ stremi-23:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,16 +47,16 @@ stremi-23:
     bmc:
       mac: 1c:c1:de:7b:36:45
       ip: 172.17.160.23
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
   chassis:
-    serial_number: GB804390JC
+    serial: GB804390JC
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml
index d70ca30d125210fd45bc11ad5f461d5ab0b249d5..0e913d27ab8dba4000946f661e0b02f8be0e84c2 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml
@@ -4,13 +4,13 @@ stremi-24:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-24:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390HC
+    serial: GB804390HC
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml
index bbfedbbf8c4c424ede6465bfb2e62eb5cbe722b9..b7f3e4e6692bdf86164c3e028ed8a0008ee8f097 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml
@@ -4,13 +4,13 @@ stremi-25:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -54,9 +54,9 @@ stremi-25:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB804390RP
+    serial: GB804390RP
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml
index 5839ece5bd63f65e414ff2af7222165d8d3d367e..7219fa140faaa46e47de9f287ddb5399a888a388 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml
@@ -4,7 +4,7 @@ stremi-26:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,16 +47,16 @@ stremi-26:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
   chassis:
-    serial_number: GB804391C4
+    serial: GB804391C4
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml
index e0bd5ac2be363b3ebc4ae18269ed71d1a33d3927..71409e980f8f726aa5c8ba4f7d2acc6f8faea738 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml
@@ -8,13 +8,13 @@ stremi-27:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-27:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB8043917X
+    serial: GB8043917X
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml
index 709d80b936b043dcaab202005d357a80958d6624..44026a0430153c1bb39e02951722653e3444cd27 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml
@@ -4,13 +4,13 @@ stremi-28:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -54,9 +54,9 @@ stremi-28:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB80439174
+    serial: GB80439174
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml
index c59bd93ac5ce8ab0934e088a025cb09a609aa97e..39800a0f06b173ac57d8a7a3854e7f965e231f6e 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml
@@ -4,7 +4,7 @@ stremi-29:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,7 +43,7 @@ stremi-29:
     bmc:
       mac: 78:e7:d1:f7:09:93
       ip: 172.17.160.29
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -54,9 +54,9 @@ stremi-29:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB8043912D
+    serial: GB8043912D
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml
index 67eebcc4ee16182214ebab57e72404f5fa135a41..22bdd8c8ed66af8c5a50839b49ee5a7c0626c80e 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml
@@ -8,13 +8,13 @@ stremi-3:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-3:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390XD
+    serial: GB804390XD
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
index 362b7f944a99d2a8334503d8b653b26e7f739a77..2144c3b57b6100f0faac925dca4614ba00a904a1 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
@@ -4,7 +4,7 @@ stremi-30:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ stremi-30:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-30:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB80439102
+    serial: GB80439102
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml
index d94e435b542745ea71d3a68ca0bfa5d1e2b6e98e..8a9e76082f62de07e695f29b511f3733038582e4 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml
@@ -8,7 +8,7 @@ stremi-31:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ stremi-31:
     bmc:
       mac: 1c:c1:de:7b:36:be
       ip: 172.17.160.31
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-31:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB8043910P
+    serial: GB8043910P
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml
index 8c48db0bef371b364f1b444a3ab452ae75b64f25..214ee16e61822b5b2d1d939618976935cbf2daf2 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml
@@ -4,7 +4,7 @@ stremi-32:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ stremi-32:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-32:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390V1
+    serial: GB804390V1
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml
index 9ebf51139ece0b6a0af461d719225e96c23344a6..dfbb8e19f237b8423dcb22f426f2f49b5979aca7 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml
@@ -8,13 +8,13 @@ stremi-33:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-33:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB8043912Y
+    serial: GB8043912Y
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml
index f4144f06cbedfa1592faa022c43e437e4429b7a6..6f55dfdc171ffeeff45b4924ccc4099ec8b27a4e 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml
@@ -4,7 +4,7 @@ stremi-34:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -14,7 +14,7 @@ stremi-34:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-34:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB8043911H
+    serial: GB8043911H
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml
index 99d95ab5cb10bf7c34d30a28d69a9902fc3bfb2b..6f0298f40aa46606d40a26b0c60c53fea6b60a7d 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml
@@ -4,7 +4,7 @@ stremi-35:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,7 +43,7 @@ stremi-35:
     bmc:
       mac: 1c:c1:de:7b:16:db
       ip: 172.17.160.35
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -54,9 +54,9 @@ stremi-35:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB804390SR
+    serial: GB804390SR
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml
index 781fde2f8dee6a3f47e6c60fd39c8c96a7d0d654..ca89f113b9dfa6fd8175b8180f5a08d6e1cabfba 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml
@@ -4,7 +4,7 @@ stremi-36:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -14,7 +14,7 @@ stremi-36:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-36:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804391DA
+    serial: GB804391DA
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
index cb64acb87835a41092c190506bb6f7cb9420dc81..e49072fb3d3cdba83b0677cbf0a23bb7ab41fad9 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
@@ -4,7 +4,7 @@ stremi-37:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,7 +43,7 @@ stremi-37:
     bmc:
       mac: 1c:c1:de:7b:26:4b
       ip: 172.17.160.37
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-37:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804391BD
+    serial: GB804391BD
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
index 70e38e7e49aacda4a41c8e61a6f36103883f7c63..65edb832624c6f01eab0fd956536ae26399a970e 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
@@ -4,7 +4,7 @@ stremi-38:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ stremi-38:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-38:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB80439141
+    serial: GB80439141
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml
index 62958d51eb6288a9dbfbbaff3db9d1eb0459dd14..4749444e98e9d608439b37366bb33756538f06c0 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml
@@ -4,7 +4,7 @@ stremi-39:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ stremi-39:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-39:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390N3
+    serial: GB804390N3
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 49392123904
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml
index 0e258902ee46bb45f3b1beedfab947461dd69e94..debcffb5bea96e9840ed335a7300e416975ebff2 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml
@@ -8,7 +8,7 @@ stremi-4:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,16 +47,16 @@ stremi-4:
     bmc:
       mac: 1c:c1:de:7b:26:1a
       ip: 172.17.160.4
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
   chassis:
-    serial_number: GB804391AS
+    serial: GB804391AS
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml
index 9ed2bfd7747e64a78bf9c7995a7193cb5326976f..bf12b8b33418b128bf66ba0f3ca6eb8d451e90be 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml
@@ -4,7 +4,7 @@ stremi-40:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,7 +43,7 @@ stremi-40:
     bmc:
       mac: 1c:c1:de:7b:26:30
       ip: 172.17.160.40
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -54,9 +54,9 @@ stremi-40:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB804391DP
+    serial: GB804391DP
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml
index 09cb657fa6efd909e577aec2c74084346ef494e5..f86e86c1fc7c8b853948e3bcbe9ed5462bfef35e 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml
@@ -4,7 +4,7 @@ stremi-41:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,7 +43,7 @@ stremi-41:
     bmc:
       mac: 1c:c1:de:7b:46:2f
       ip: 172.17.160.41
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -54,9 +54,9 @@ stremi-41:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB804390P1
+    serial: GB804390P1
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml
index 8e7f2b6319a09251b372d36146188df5770ea382..dd5f071b6c91d042367cf3c95ef2709d1dd946f6 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml
@@ -4,7 +4,7 @@ stremi-42:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -47,7 +47,7 @@ stremi-42:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-42:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804391A2
+    serial: GB804391A2
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml
index 8e981ce509422c4e42a4371438d62c30baef0f55..7854dc7a17580e810bbfddace10a3288ed094fa6 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml
@@ -4,7 +4,7 @@ stremi-43:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,7 +43,7 @@ stremi-43:
     bmc:
       mac: 1c:c1:de:7b:16:eb
       ip: 172.17.160.43
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -54,9 +54,9 @@ stremi-43:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB804390L2
+    serial: GB804390L2
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml
index c043903c623999615cf97271176bef3c25f31e81..3ba2fa2556505e94daf1fdede971616325fa73c4 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml
@@ -8,13 +8,13 @@ stremi-44:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -54,9 +54,9 @@ stremi-44:
       mac: 1c:c1:de:7b:26:db
       ip: 172.17.160.44
   chassis:
-    serial_number: GB8043919A
+    serial: GB8043919A
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml
index 111fb9238a27081af6a0c8bdca9e1abb95545bab..b4dd532a64152019e8263480d0ff36cf8c394488 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml
@@ -4,7 +4,7 @@ stremi-5:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -14,7 +14,7 @@ stremi-5:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-5:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390PM
+    serial: GB804390PM
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml
index 57e6d9608d454e36d7c20b403c6f60804c35c3a1..cc91e0fb4502f3af2f66297988b223f1cbf41164 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml
@@ -4,13 +4,13 @@ stremi-6:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -54,9 +54,9 @@ stremi-6:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB804390XX
+    serial: GB804390XX
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml
index ed746b444f42b273c483a747217a819995e0fa85..3a5babd64973bf5a86e44658382b1724592c172b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml
@@ -4,13 +4,13 @@ stremi-7:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -54,9 +54,9 @@ stremi-7:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: GB804391EK
+    serial: GB804391EK
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml
index 0e4dfdd16f7b532f4793c967ed68e7e84b970d2d..1771a21ba3ebe8f78bd3acb3108f9aa8f2c7be0b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml
@@ -4,13 +4,13 @@ stremi-8:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -56,9 +56,9 @@ stremi-8:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB80439116
+    serial: GB80439116
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml
index 4e00a1c3631a23b049ba8c4db3ba7f155acd53da..3d46f0547881f0dfdce94d336bd64b83a23c4f3e 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml
@@ -4,7 +4,7 @@ stremi-9:
     version: O37
     release_date: 01/26/2011
     vendor: HP
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -43,7 +43,7 @@ stremi-9:
     bmc:
       mac: 1c:c1:de:7b:26:b3
       ip: 172.17.160.9
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -56,9 +56,9 @@ stremi-9:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB804390M4
+    serial: GB804390M4
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/reims/clusters/stremi/stremi.yaml b/input/grid5000/sites/reims/clusters/stremi/stremi.yaml
index 7bf66eb1270972e3198affcdc0fcecd361d24b3d..2758f91af41b1850b459a1835d052bf1da9edf6f 100644
--- a/input/grid5000/sites/reims/clusters/stremi/stremi.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/stremi.yaml
@@ -19,12 +19,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/reims/clusters/stremi/stremi_manual.yaml b/input/grid5000/sites/reims/clusters/stremi/stremi_manual.yaml
index 2cd98626ab2346f69294588f8887fa7700a7c7de..35fead150d46fd5f4db307f1415b206e0944a5e1 100644
--- a/input/grid5000/sites/reims/clusters/stremi/stremi_manual.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/stremi_manual.yaml
@@ -1,7 +1,7 @@
 ---
 nodes:
   stremi-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/1
@@ -9,7 +9,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 1
   stremi-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/2
@@ -17,7 +17,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 2
   stremi-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/3
@@ -25,7 +25,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 3
   stremi-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/4
@@ -33,7 +33,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 4
   stremi-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/5
@@ -41,7 +41,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 5
   stremi-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/6
@@ -49,7 +49,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 6
   stremi-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/7
@@ -57,7 +57,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 7
   stremi-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/8
@@ -65,7 +65,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 8
   stremi-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/9
@@ -73,7 +73,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 9
   stremi-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/10
@@ -81,7 +81,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 10
   stremi-11:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/11
@@ -89,7 +89,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 11
   stremi-12:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/12
@@ -97,7 +97,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 12
   stremi-13:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/13
@@ -105,7 +105,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 13
   stremi-14:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/14
@@ -113,7 +113,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 14
   stremi-15:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/15
@@ -121,7 +121,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 15
   stremi-16:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/16
@@ -129,7 +129,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 16
   stremi-17:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/17
@@ -137,7 +137,7 @@ nodes:
       pdu_name: stremi-pdu2.reims.grid5000.fr
       pdu_position: 17
   stremi-18:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/18
@@ -145,7 +145,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 1
   stremi-19:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/19
@@ -153,7 +153,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 2
   stremi-20:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/20
@@ -161,7 +161,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 3
   stremi-21:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/21
@@ -169,7 +169,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 4
   stremi-22:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/22
@@ -177,7 +177,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 5
   stremi-23:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/23
@@ -185,7 +185,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 6
   stremi-24:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/24
@@ -193,7 +193,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 7
   stremi-25:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/25
@@ -201,7 +201,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 8
   stremi-26:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/26
@@ -209,7 +209,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 9
   stremi-27:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/27
@@ -217,7 +217,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 10
   stremi-28:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/28
@@ -225,7 +225,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 11
   stremi-29:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/29
@@ -233,7 +233,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 12
   stremi-30:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/30
@@ -241,7 +241,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 13
   stremi-31:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/31
@@ -249,7 +249,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 14
   stremi-32:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/32
@@ -257,7 +257,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 15
   stremi-33:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/34
@@ -265,7 +265,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 16
   stremi-34:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/33
@@ -273,7 +273,7 @@ nodes:
       pdu_name: stremi-pdu1.reims.grid5000.fr
       pdu_position: 17
   stremi-35:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/35
@@ -281,7 +281,7 @@ nodes:
       pdu_name: stremi-pdu3.reims.grid5000.fr
       pdu_position: 1
   stremi-36:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/36
@@ -289,7 +289,7 @@ nodes:
       pdu_name: stremi-pdu3.reims.grid5000.fr
       pdu_position: 2
   stremi-37:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/37
@@ -297,7 +297,7 @@ nodes:
       pdu_name: stremi-pdu3.reims.grid5000.fr
       pdu_position: 3
   stremi-38:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/38
@@ -305,7 +305,7 @@ nodes:
       pdu_name: stremi-pdu3.reims.grid5000.fr
       pdu_position: 4
   stremi-39:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/39
@@ -313,7 +313,7 @@ nodes:
       pdu_name: stremi-pdu3.reims.grid5000.fr
       pdu_position: 5
   stremi-40:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/40
@@ -321,7 +321,7 @@ nodes:
       pdu_name: stremi-pdu3.reims.grid5000.fr
       pdu_position: 6
   stremi-41:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/41
@@ -329,7 +329,7 @@ nodes:
       pdu_name: stremi-pdu3.reims.grid5000.fr
       pdu_position: 7
   stremi-42:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/42
@@ -337,7 +337,7 @@ nodes:
       pdu_name: stremi-pdu3.reims.grid5000.fr
       pdu_position: 8
   stremi-43:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/43
@@ -345,7 +345,7 @@ nodes:
       pdu_name: stremi-pdu3.reims.grid5000.fr
       pdu_position: 9
   stremi-44:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/44
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
index 949589e94e658986c530ebc83fd01698eaa01004..633f65e2ca1734e4b26baea70b2fca35e5180b29 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -4,7 +4,7 @@ paranoia-1:
     vendor: Dell Inc.
     version: 2.1
     release_date: 09/06/2013
-  block_devices:
+  storage_devices:
     sdc:
       device: sdc
       size: 600127266816
@@ -46,14 +46,14 @@ paranoia-1:
     cache_l2: 262144
     cache_l3: 26214400
   chassis:
-    serial_number: 9N20LZ1
+    serial: 9N20LZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
+    name: PowerEdge C6220 II
   architecture:
     smp_size: 2
     smt_size: 20
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
index dd55cde7fe93af7224c9309f32eb09003b46cf46..2f5bc87a6fae1ac7c15fcf5d7b84ad4d1beaa2e2 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -11,7 +11,7 @@ paranoia-2:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 26214400
-  block_devices:
+  storage_devices:
     sdc:
       device: sdc
       size: 600127266816
@@ -41,7 +41,7 @@ paranoia-2:
     smp_size: 2
     smt_size: 20
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.100.2
       mac: f0:4d:a2:73:cc:7a
@@ -80,9 +80,9 @@ paranoia-2:
       mounted: false
       management: false
   chassis:
-    serial_number: DB12LZ1
+    serial: DB12LZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
+    name: PowerEdge C6220 II
   main_memory:
     ram_size: 137438953472
   supported_job_types:
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
index 55e6dd8c0f79e8ce6a3ac4d45a8856ad7ba3d52a..21dedae15e7f06e40e9e7f493998c5197b999cd5 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -5,10 +5,10 @@ paranoia-3:
     smt_size: 20
     platform_type: x86_64
   chassis:
-    serial_number: 9PJ4LZ1
+    serial: 9PJ4LZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
-  network_interfaces:
+    name: PowerEdge C6220 II
+  network_adapters:
     bmc:
       ip: 172.17.100.3
       mac: f0:4d:a2:74:06:b8
@@ -53,7 +53,7 @@ paranoia-3:
     release_date: 09/06/2013
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdc:
       device: sdc
       size: 600127266816
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
index 132a8ef701f78915255810654bcd409b5ffabfe1..5a144daba35f99dec96344cb0eabddd64253dc64 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -1,6 +1,6 @@
 ---
 paranoia-4:
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -43,12 +43,12 @@ paranoia-4:
     version: 2.1
     release_date: 09/06/2013
   chassis:
-    serial_number: BVY4LZ1
+    serial: BVY4LZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
+    name: PowerEdge C6220 II
   main_memory:
     ram_size: 137438953472
-  block_devices:
+  storage_devices:
     sde:
       device: sde
       size: 600127266816
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
index 430410b3070add9caf5274447fa1969a111f7335..d03744b941dcdb0f9733c0c63fd3af8994e129c2 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -1,6 +1,6 @@
 ---
 paranoia-5:
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.100.5
       mac: f0:4d:a2:73:cc:71
@@ -55,7 +55,7 @@ paranoia-5:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 26214400
-  block_devices:
+  storage_devices:
     sdd:
       device: sdd
       size: 600127266816
@@ -88,6 +88,6 @@ paranoia-5:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 9912LZ1
+    serial: 9912LZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
+    name: PowerEdge C6220 II
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
index af58ded538f1059ad40be0917e14d5c72a739b42..846e0de1f899b7df0e206ef75ad9556c3afc0b1a 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -3,14 +3,14 @@ paranoia-6:
   main_memory:
     ram_size: 137438953472
   chassis:
-    serial_number: 8TY4LZ1
+    serial: 8TY4LZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
+    name: PowerEdge C6220 II
   architecture:
     smp_size: 2
     smt_size: 20
     platform_type: x86_64
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -48,7 +48,7 @@ paranoia-6:
     bmc:
       ip: 172.17.100.6
       mac: f0:4d:a2:73:ce:24
-  block_devices:
+  storage_devices:
     sdb:
       device: sdb
       size: 600127266816
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
index eb852c448f02c5eaecd99a75da0648639575b0b4..f318469574f434e5a49f9b40f821cda5171d95f2 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -1,9 +1,9 @@
 ---
 paranoia-7:
   chassis:
-    serial_number: 5M20LZ1
+    serial: 5M20LZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
+    name: PowerEdge C6220 II
   supported_job_types:
     virtual: ivt
   processor:
@@ -17,7 +17,7 @@ paranoia-7:
     cache_l1d: 32768
     cache_l2: 262144
     cache_l3: 26214400
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.100.7
@@ -55,7 +55,7 @@ paranoia-7:
     bmc:
       ip: 172.17.100.7
       mac: f0:4d:a2:73:ca:af
-  block_devices:
+  storage_devices:
     sdb:
       device: sdb
       size: 600127266816
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
index 572d8343150feac898ae60bde080fd03cc01dfe4..f2fa290dec1967e7be0b9f751750fbc3af775feb 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -1,6 +1,6 @@
 ---
 paranoia-8:
-  block_devices:
+  storage_devices:
     sdd:
       device: sdd
       size: 600127266816
@@ -38,12 +38,12 @@ paranoia-8:
     cache_l2: 262144
     cache_l3: 26214400
   chassis:
-    serial_number: D14YKZ1
+    serial: D14YKZ1
     manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
+    name: PowerEdge C6220 II
   supported_job_types:
     virtual: ivt
-  network_interfaces:
+  network_adapters:
     bmc:
       ip: 172.17.100.8
       mac: f0:4d:a2:73:ce:3f
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
index 27478901c6d261d723e345969a0a5b30afa2a6d6..87d0a3823e21e96ca3efb4ba11a04fb3e9b23139 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
@@ -19,7 +19,7 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
@@ -40,7 +40,7 @@ nodes:
         interface: SATA
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         rate: 10.0e+9 #10G
         device: eth0
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/paranoia_manual.yaml b/input/grid5000/sites/rennes/clusters/paranoia/paranoia_manual.yaml
index 2e3e4310d577b3fcba7acdbb9ed8b1f3d6d3c63f..33e2f27e09f2b5b42ca17637b7fb5024415d62f5 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/paranoia_manual.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia_manual.yaml
@@ -1,7 +1,7 @@
 ---
 nodes:
   paranoia-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: bigdata-sw
         switch_port: Te0/47
@@ -9,7 +9,7 @@ nodes:
         switch: gw-rennes
         switch_port: Gi3/3
   paranoia-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: bigdata-sw
         switch_port: Te0/46
@@ -17,7 +17,7 @@ nodes:
         switch: gw-rennes
         switch_port: Gi3/9
   paranoia-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: bigdata-sw
         switch_port: Te0/23
@@ -25,7 +25,7 @@ nodes:
         switch: gw-rennes
         switch_port: Gi2/3
   paranoia-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: bigdata-sw
         switch_port: Te0/22
@@ -33,7 +33,7 @@ nodes:
         switch: gw-rennes
         switch_port: Gi3/1
   paranoia-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: bigdata-sw
         switch_port: Te0/45
@@ -41,7 +41,7 @@ nodes:
         switch: gw-rennes
         switch_port: Gi3/7
   paranoia-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: bigdata-sw
         switch_port: Te0/44
@@ -49,7 +49,7 @@ nodes:
         switch: gw-rennes
         switch_port: Gi3/10
   paranoia-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: bigdata-sw
         switch_port: Te0/21
@@ -57,7 +57,7 @@ nodes:
         switch: gw-rennes
         switch_port: Gi2/6
   paranoia-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: bigdata-sw
         switch_port: Te0/20
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
index 1e08f07b8cfeef962bb344919fb122a26e78cf7e..c28d60fd00aef9a57b13a4c510641e259a019c45 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -4,7 +4,7 @@ parapide-1:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
@@ -14,7 +14,7 @@ parapide-1:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:ad
@@ -62,9 +62,9 @@ parapide-1:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 0935XEF04D
+    serial: 0935XEF04D
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
index ad59d0b6df9a510732d7727ead21f39d611ea733..01b23f8244894a611aec51c4392d807646804b80 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -4,7 +4,7 @@ parapide-10:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:6d:45
@@ -49,16 +49,16 @@ parapide-10:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
   chassis:
-    serial_number: 0935XEF046
+    serial: 0935XEF046
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   processor:
@@ -78,7 +78,7 @@ parapide-10:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
index 9b504bc5718e4770eac5a3e3a7fa95daa93dbae2..ca69ab1cefe1b5811c983e2744200629f7f56074 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
@@ -4,7 +4,7 @@ parapide-11:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
@@ -14,7 +14,7 @@ parapide-11:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:75
@@ -62,9 +62,9 @@ parapide-11:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 0935XEF055
+    serial: 0935XEF055
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
index d4e2f5d6162957abafc395a56aea46f706deb734..47816766a232256722e3e8fef6f869877c600ecb 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -4,13 +4,13 @@ parapide-12:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:55
@@ -56,9 +56,9 @@ parapide-12:
       driver: igb
       mountable: false
   chassis:
-    serial_number: 0935XEF042
+    serial: 0935XEF042
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   processor:
@@ -78,7 +78,7 @@ parapide-12:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
index ebb5d64142608d2274c8532dbe2f347483a9be38..6d7b813cdaf67605ac716955b2de59ab2f9bd0d0 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -4,7 +4,7 @@ parapide-13:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:61
@@ -49,7 +49,7 @@ parapide-13:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
@@ -58,9 +58,9 @@ parapide-13:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 0935XEF059
+    serial: 0935XEF059
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   main_memory:
     ram_size: 25769803776
   processor:
@@ -78,7 +78,7 @@ parapide-13:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
index 33d0b02fd8ef0c38c44a6f45587950a7a7cd2eab..19d25e14c6cd85642e5f87c7774801672d5208d0 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
@@ -4,13 +4,13 @@ parapide-14:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:95:11
@@ -58,9 +58,9 @@ parapide-14:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 0935XEF054
+    serial: 0935XEF054
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   main_memory:
     ram_size: 25769803776
   processor:
@@ -78,7 +78,7 @@ parapide-14:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
index 3439d882b327386aeca93c51fbeefa2fb1bbc729..d74be8dd4a5fa02452226357471d692cd9d2560c 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
@@ -4,7 +4,7 @@ parapide-15:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
@@ -14,7 +14,7 @@ parapide-15:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:e9
@@ -60,9 +60,9 @@ parapide-15:
       driver: igb
       mountable: false
   chassis:
-    serial_number: 0935XEF058
+    serial: 0935XEF058
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
index dfdd29795fe4069b0e28d9ec41afb08bf35eb377..48ce8da69f631e0862ffdbb884ceee10bb06b96e 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -4,13 +4,13 @@ parapide-16:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC4A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:aa:d9
@@ -56,9 +56,9 @@ parapide-16:
       driver: igb
       mountable: false
   chassis:
-    serial_number: 0935XEF04F
+    serial: 0935XEF04F
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -78,7 +78,7 @@ parapide-16:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
index c069819b049110158c3c89e2f28557182d1f629f..179ddbe4016329878d31fb494bba5d63af8bc929 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
@@ -4,7 +4,7 @@ parapide-17:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:59
@@ -49,16 +49,16 @@ parapide-17:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC4A
   chassis:
-    serial_number: 0935XEF048
+    serial: 0935XEF048
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   processor:
@@ -78,7 +78,7 @@ parapide-17:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
index 5b3f7992fe9f86b5341670eb7eff464f84b88725..032e8caa733d6ed8570e49e08441a7bd332dbaae 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -4,7 +4,7 @@ parapide-18:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:e9
@@ -49,16 +49,16 @@ parapide-18:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
   chassis:
-    serial_number: 0935XEF044
+    serial: 0935XEF044
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   processor:
@@ -78,7 +78,7 @@ parapide-18:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
index ae3545c99635ca01d94d5e337c62b448138b10d1..faa6cc8b4f8ee04667a6bfd6e1518919f08b3d02 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -4,7 +4,7 @@ parapide-19:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:67:39
@@ -49,16 +49,16 @@ parapide-19:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
   chassis:
-    serial_number: 0935XEF04E
+    serial: 0935XEF04E
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   processor:
@@ -78,7 +78,7 @@ parapide-19:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
index 82bb25e8d54c725f9010b24c56d13d750c034718..724227430a6526c1264e5a25f68d0981336c3562 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -4,7 +4,7 @@ parapide-2:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:71
@@ -49,7 +49,7 @@ parapide-2:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
@@ -62,9 +62,9 @@ parapide-2:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 0935XEF052
+    serial: 0935XEF052
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
index fe623eaeacd1ac0af18ce6ab45f9d653114dd48f..f49ab2e9536cdb0caee2139bece415e00273d817 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
@@ -4,7 +4,7 @@ parapide-20:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e5
@@ -49,7 +49,7 @@ parapide-20:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
@@ -58,9 +58,9 @@ parapide-20:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 0935XEF053
+    serial: 0935XEF053
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   processor:
     model: Intel Xeon
     cache_l1d: 32768
@@ -78,7 +78,7 @@ parapide-20:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
index 3bc06d61be86607720cbed2d4ddf13a5507ad233..f396c4383b27a4338b7691898d0586ae87a62156 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -4,13 +4,13 @@ parapide-21:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:ab:c5
@@ -56,9 +56,9 @@ parapide-21:
       driver: igb
       mountable: false
   chassis:
-    serial_number: 0935XEF049
+    serial: 0935XEF049
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   processor:
@@ -78,7 +78,7 @@ parapide-21:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
index be5fef3bb84df80dd800eecb34807dc7cd69de9b..ba87e9927ee56bdeb9c9cde516070c83428e2897 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
@@ -4,7 +4,7 @@ parapide-22:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e1
@@ -49,16 +49,16 @@ parapide-22:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
   chassis:
-    serial_number: 0935XEF043
+    serial: 0935XEF043
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   processor:
@@ -78,7 +78,7 @@ parapide-22:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
index b8ff18fdefc1e0d48a77296dd8c1a93c92393c60..2ff6ed268d029cb6cf5fe958b8928fb0a179ed8c 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
@@ -4,13 +4,13 @@ parapide-23:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC4A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:ab:99
@@ -58,9 +58,9 @@ parapide-23:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 0935XEF057
+    serial: 0935XEF057
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   processor:
     model: Intel Xeon
     cache_l1d: 32768
@@ -78,7 +78,7 @@ parapide-23:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
index 03935b7f3ae9c72b1cdee5a5cf4d432f37b70b39..01e258cb3769dffbbaddb83e0b4e46304d191c8a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -4,13 +4,13 @@ parapide-24:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC4A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:fd
@@ -58,9 +58,9 @@ parapide-24:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 0935XEF056
+    serial: 0935XEF056
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   processor:
     model: Intel Xeon
     cache_l1d: 32768
@@ -78,7 +78,7 @@ parapide-24:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
index 625f0cd6973ffbb6c0424c7695474f8e739d5361..39089888fdc2a6cc927063722edebfe8a562d91c 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -4,7 +4,7 @@ parapide-25:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
@@ -14,7 +14,7 @@ parapide-25:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:49
@@ -60,9 +60,9 @@ parapide-25:
       driver: igb
       mountable: false
   chassis:
-    serial_number: 0935XEF04C
+    serial: 0935XEF04C
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
index eb5a87f8bf80abd1811a202755a42d11b80ad488..af30d6a2fba60729cad795f91d09f1ca878eb0db 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -4,13 +4,13 @@ parapide-3:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:dd
@@ -56,9 +56,9 @@ parapide-3:
       driver: igb
       mountable: false
   chassis:
-    serial_number: 0935XEF041
+    serial: 0935XEF041
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -78,7 +78,7 @@ parapide-3:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
index be83bfb7e473a334cd0e2393df334cfac6d49329..d4c9ee4144bc153186bd77dd150cbafe2842abaf 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
@@ -4,13 +4,13 @@ parapide-4:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:69:b5
@@ -56,9 +56,9 @@ parapide-4:
       driver: igb
       mountable: false
   chassis:
-    serial_number: 0935XEF047
+    serial: 0935XEF047
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   processor:
@@ -78,7 +78,7 @@ parapide-4:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
index b01ab4a5b43f944e880dae13c63a31f8bc16907f..500b8a4ceab121bbac917c3bf6849e0614cbda58 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -4,13 +4,13 @@ parapide-5:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC4A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:6d:a1
@@ -56,9 +56,9 @@ parapide-5:
       driver: igb
       mountable: false
   chassis:
-    serial_number: 0935XEF051
+    serial: 0935XEF051
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -78,7 +78,7 @@ parapide-5:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
index 18c64f4640a995dff98583195ee0e50e5f6edf4d..faeb3770f3598de0da5fb741d2cea986ebddb47e 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -4,13 +4,13 @@ parapide-6:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:bd
@@ -56,9 +56,9 @@ parapide-6:
       driver: igb
       mountable: false
   chassis:
-    serial_number: 0935XEF04B
+    serial: 0935XEF04B
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   processor:
@@ -78,7 +78,7 @@ parapide-6:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
index b6de4a21c18ad14bc0db6ad28f5a5e1c28485ada..20101df3065b15a2d8e80b5a80f57c44120ab251 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -4,13 +4,13 @@ parapide-7:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC4A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:80:f1
@@ -56,9 +56,9 @@ parapide-7:
       driver: igb
       mountable: false
   chassis:
-    serial_number: 0935XEF050
+    serial: 0935XEF050
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -78,7 +78,7 @@ parapide-7:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
index f278370b5242e459089fba4c3cab5b305c0396d5..d529df783993416c4399ba797a7051f65cb07cdf 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -4,7 +4,7 @@ parapide-8:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:55
@@ -49,16 +49,16 @@ parapide-8:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
   chassis:
-    serial_number: 0935XEF045
+    serial: 0935XEF045
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -78,7 +78,7 @@ parapide-8:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
index e2ae07f76936828edd14f9e8dcafebb248e0af9e..6f40e07cced7819dec00d2d9361141367ee9862b 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -4,13 +4,13 @@ parapide-9:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       device: sda
       size: 500107862016
       rev: AC5A
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:b1
@@ -58,9 +58,9 @@ parapide-9:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 0935XEF04A
+    serial: 0935XEF04A
     manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
+    name: SUN FIRE X2270
   main_memory:
     ram_size: 25769803776
   processor:
@@ -78,7 +78,7 @@ parapide-9:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HUA7250S
       size: '976773168'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
index ab2af4a25e6c5ad704cfcb0f04811c4cd198e65a..3b2297ff6f4f137cae138839cafb6fc6bb26eeaf 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
@@ -19,12 +19,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide_manual.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide_manual.yaml
index 1cb21b845876716a9180ef13093fcd8f44d37818..1eb77e4c30d365d8ae64507ec0d90ab64378bd88 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide_manual.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide_manual.yaml
@@ -1,175 +1,175 @@
 ---
 nodes:
   parapide-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/47
     pdu:
       pdu_name: parapide-pdu-4
   parapide-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/48
     pdu:
       pdu_name: parapide-pdu-3
   parapide-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/34
     pdu:
       pdu_name: parapide-pdu-4
   parapide-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/46
     pdu:
       pdu_name: parapide-pdu-3
   parapide-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/44
     pdu:
       pdu_name: parapide-pdu-3
   parapide-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/39
     pdu:
       pdu_name: parapide-pdu-4
   parapide-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/40
     pdu:
       pdu_name: parapide-pdu-4
   parapide-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/42
     pdu:
       pdu_name: parapide-pdu-3
   parapide-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/41
     pdu:
       pdu_name: parapide-pdu-3
   parapide-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/43
     pdu:
       pdu_name: parapide-pdu-3
   parapide-11:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/45
     pdu:
       pdu_name: parapide-pdu-4
   parapide-12:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/48
     pdu:
       pdu_name: parapide-pdu-4
   parapide-13:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/47
     pdu:
       pdu_name: parapide-pdu-4
   parapide-14:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/44
     pdu:
       pdu_name: parapide-pdu-1
   parapide-15:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/46
     pdu:
       pdu_name: parapide-pdu-2
   parapide-16:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/42
     pdu:
       pdu_name: parapide-pdu-1
   parapide-17:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/41
     pdu:
       pdu_name: parapide-pdu-2
   parapide-18:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/39
     pdu:
       pdu_name: parapide-pdu-1
   parapide-19:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/40
     pdu:
       pdu_name: parapide-pdu-2
   parapide-20:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/43
     pdu:
       pdu_name: parapide-pdu-1
   parapide-21:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/36
     pdu:
       pdu_name: parapide-pdu-2
   parapide-22:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/38
     pdu:
       pdu_name: parapide-pdu-1
   parapide-23:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/37
     pdu:
       pdu_name: parapide-pdu-2
   parapide-24:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/37
     pdu:
       pdu_name: parapide-pdu-1
   parapide-25:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/38
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
index d624145668ff6e2b301c264c6caaea7ad12018c8..58e78f0375022d6170e0e9d02b8d08bf1f3e7914 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -4,14 +4,14 @@ parapluie-1:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:0f
@@ -74,9 +74,9 @@ parapluie-1:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651KY
+    serial: GB803651KY
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
index c27ed6db32dcda4f83a80fc737951a3a167e47c7..21b019ad1226c676a485a7c474558d4eb3e1cc0d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
@@ -4,7 +4,7 @@ parapluie-10:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1b
@@ -66,7 +66,7 @@ parapluie-10:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -76,9 +76,9 @@ parapluie-10:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651KK
+    serial: GB803651KK
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
index 69f49e4bae826a6482c21083416376b0c6733c07..16fe8d9062d8e9632891a3195d52512a17566fca 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -4,7 +4,7 @@ parapluie-11:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:b9
@@ -66,7 +66,7 @@ parapluie-11:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -76,9 +76,9 @@ parapluie-11:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651L5
+    serial: GB803651L5
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
index 446178a4356395d706fb226df506e39cb8fbdc7d..7a4a9d2fc10569328fb86aaea687d8ac78e96a37 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -4,7 +4,7 @@ parapluie-12:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:61
@@ -66,7 +66,7 @@ parapluie-12:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -76,9 +76,9 @@ parapluie-12:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651MC
+    serial: GB803651MC
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
index 9c1c2ae5ac7ffbdd768538c5d91e82927180b207..2a194f4ff1bf8b08883f24837247419b055840e6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
@@ -4,14 +4,14 @@ parapluie-13:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:69
@@ -74,9 +74,9 @@ parapluie-13:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651MP
+    serial: GB803651MP
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
index fb80bae355ecc8f71352603044240d691dc5f0e1..b315b90615ca03efe0cb7cd86ef29f4a3780ab31 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
@@ -4,7 +4,7 @@ parapluie-14:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:65
@@ -66,7 +66,7 @@ parapluie-14:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -76,9 +76,9 @@ parapluie-14:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651JY
+    serial: GB803651JY
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
index b2e6e57e3c180908b90d9a95efdac91a2ffc4362..b4957766fa07857a293f4d4a994b3beddcd697d3 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -4,14 +4,14 @@ parapluie-15:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:72:75
@@ -74,9 +74,9 @@ parapluie-15:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651LD
+    serial: GB803651LD
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
index c74465256c0d73e9da33f285d63ea418cec7c4b0..02383a4148f7bbc964cceafefe51b807b245af5f 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
@@ -4,7 +4,7 @@ parapluie-16:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:51
@@ -66,7 +66,7 @@ parapluie-16:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -76,9 +76,9 @@ parapluie-16:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651P6
+    serial: GB803651P6
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
index 761c30b92aa9abbba0d3804a180101e4c85573dd..fe0a441e16ceb5ebb0f7bcd89d7eb2ce8063bf0c 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
@@ -4,7 +4,7 @@ parapluie-17:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:31
@@ -66,7 +66,7 @@ parapluie-17:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -74,9 +74,9 @@ parapluie-17:
       rev: HPG0
       vendor: ATA
   chassis:
-    serial_number: GB803651JT
+    serial: GB803651JT
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
index d687975695a2b30e2d889137bebfa6df6da93fc8..d70d28de660deaff73dafb944c011b66d16b8a30 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
@@ -4,14 +4,14 @@ parapluie-18:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
       size: 250059350016
       rev: HPG2
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:d9
@@ -74,9 +74,9 @@ parapluie-18:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651KF
+    serial: GB803651KF
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
index af948b70efbf31e554b31623ce4861e053dedaae..15b53468e28bce087f222a31a7a2ac672be24ab5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -4,7 +4,7 @@ parapluie-19:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1d
@@ -66,7 +66,7 @@ parapluie-19:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -74,9 +74,9 @@ parapluie-19:
       rev: HPG0
       vendor: ATA
   chassis:
-    serial_number: GB803651JB
+    serial: GB803651JB
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
index f6789bebafdbb3e1b9b86e3d07af794fe33f0c65..6b7899a079b8347c068c595a0dbb3cbeee346990 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -4,7 +4,7 @@ parapluie-2:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:c9
@@ -66,7 +66,7 @@ parapluie-2:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -74,9 +74,9 @@ parapluie-2:
       rev: HPG0
       vendor: ATA
   chassis:
-    serial_number: GB803651JH
+    serial: GB803651JH
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
index daa3158a98cf79b7c6f1e3e916096ffcc659a7a4..c1df3d34c3dcd4c078cf2985bf0f3d447d3edecb 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -4,7 +4,7 @@ parapluie-20:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:19
@@ -66,7 +66,7 @@ parapluie-20:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -76,9 +76,9 @@ parapluie-20:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651J7
+    serial: GB803651J7
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
index 1c5b165b7281fe40c3921a35bbff18075e88bdcd..16b50461a370292d4aec5df7e978962fa1510af9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -4,14 +4,14 @@ parapluie-21:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:35
@@ -76,9 +76,9 @@ parapluie-21:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651PW
+    serial: GB803651PW
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
index c2fc4cdda2ac17d96988ab83cb8359e7e74b065d..012b272d88e1a6499c1aba64f06c7e3635d26382 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -4,14 +4,14 @@ parapluie-22:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:fd
@@ -76,9 +76,9 @@ parapluie-22:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651NB
+    serial: GB803651NB
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
index 6058dbeb6e78e318cc1e939268acaa9d472cb95f..74bf06438dc189a6f72fb8a96265fd2d5522708b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
@@ -4,14 +4,14 @@ parapluie-23:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:55
@@ -74,9 +74,9 @@ parapluie-23:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651P2
+    serial: GB803651P2
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
index 8079a37a8413608110e243e3952f6dcaafc62b89..9426eb4e45df3bde58e752e2c3d9a878b6c85846 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
@@ -4,7 +4,7 @@ parapluie-24:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:45
@@ -66,7 +66,7 @@ parapluie-24:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -76,9 +76,9 @@ parapluie-24:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651N6
+    serial: GB803651N6
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
index d3e541cc084bb606fedc0da78749325ae52969f1..3816bbf45561982bda5817ec14021ec277823c28 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -4,7 +4,7 @@ parapluie-25:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:3f
@@ -66,7 +66,7 @@ parapluie-25:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -76,9 +76,9 @@ parapluie-25:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651MV
+    serial: GB803651MV
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
index b80e8453f9c364f12b65aa4fddebcf77a4dfec7b..bfeab4eb6768648582325c8d0fa18ffae2adcf56 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
@@ -4,7 +4,7 @@ parapluie-26:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1d
@@ -66,7 +66,7 @@ parapluie-26:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -76,9 +76,9 @@ parapluie-26:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651LW
+    serial: GB803651LW
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
index 6ec3764056e3ec6b3ea1c0c754ebd693a2580b55..15ab5d269d1b1f33f1ad654ce90ecc98eb36b10d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
@@ -4,14 +4,14 @@ parapluie-27:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:15
@@ -76,9 +76,9 @@ parapluie-27:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651M1
+    serial: GB803651M1
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
index 284ed7e78c5e29e6521452a6307a8a940d1ece5a..7d35bd09594d34fcf02f3674dded44cd1cb1ddc4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -4,14 +4,14 @@ parapluie-28:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e5
@@ -76,9 +76,9 @@ parapluie-28:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651JD
+    serial: GB803651JD
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
index 2ccc4451af4ce4f00c9fcdb4c488144efa9f7e6b..11122a7735d3b85c60690872f0dee31a59f4b20b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
@@ -4,7 +4,7 @@ parapluie-29:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e1
@@ -66,7 +66,7 @@ parapluie-29:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -76,9 +76,9 @@ parapluie-29:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651K4
+    serial: GB803651K4
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
index 689f72537577c8ddf05540ea829d1349d142efe9..432b9988bbdce348cd0b2262c57de0f2c51e97a5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
@@ -4,14 +4,14 @@ parapluie-3:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:a9
@@ -76,9 +76,9 @@ parapluie-3:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651K8
+    serial: GB803651K8
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
index 361f84ffa0a572e06ebdb5e55791f98d774f0867..b381dcb633bef6c9262ff292388207178e99ee7e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
@@ -4,14 +4,14 @@ parapluie-30:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fb
@@ -74,9 +74,9 @@ parapluie-30:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651N2
+    serial: GB803651N2
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
index d7ed460b0464238c355bc1f7dbcda4c8b2bd6d09..6be5af72f67ea64209bdf1deb3686f024d751e89 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -4,7 +4,7 @@ parapluie-31:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:35
@@ -66,7 +66,7 @@ parapluie-31:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -74,9 +74,9 @@ parapluie-31:
       rev: HPG0
       vendor: ATA
   chassis:
-    serial_number: GB803651LJ
+    serial: GB803651LJ
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
index d9eaef57cc3ddd0e64823bb64163af5cce5838d8..dff7d291a47a75a1c446bd767086ec16dab8641e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -4,7 +4,7 @@ parapluie-32:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:59
@@ -66,7 +66,7 @@ parapluie-32:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -76,9 +76,9 @@ parapluie-32:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651L9
+    serial: GB803651L9
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
index d517b41fdb8e16551c63716c27239794a75aadb2..dc13bac25cbd803a3eb9940042d7255fffd8451e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
@@ -4,14 +4,14 @@ parapluie-33:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d5
@@ -74,9 +74,9 @@ parapluie-33:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651P9
+    serial: GB803651P9
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
index 3cfe1fbb2b1545ba4a011cfbdfe824468c942df6..0f17db42d56efd98fa481e111874b5ea938bf457 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
@@ -4,14 +4,14 @@ parapluie-34:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9d
@@ -74,9 +74,9 @@ parapluie-34:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651NV
+    serial: GB803651NV
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
index 2ca12a7bbefb3b921c2d3da0a92fb8c13d1a8af3..12c949d785dca48ca931ca1c5ad41b577c7d9d0d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -4,14 +4,14 @@ parapluie-35:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:50:19
@@ -74,9 +74,9 @@ parapluie-35:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651PH
+    serial: GB803651PH
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
index bdd6a39a2c5897e5cc073862bad4a712b45ef5f2..051592681c84bfb3b889545bbcc01d4bd1b0e499 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
@@ -4,7 +4,7 @@ parapluie-36:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:59
@@ -66,7 +66,7 @@ parapluie-36:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -74,9 +74,9 @@ parapluie-36:
       rev: HPG0
       vendor: ATA
   chassis:
-    serial_number: GB803651NR
+    serial: GB803651NR
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
index 96497b6ef6f15f35e5ca2cfcb2364b8edbbf019e..d8c10dd060efb843da5df9fa825c54a87571ddc6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
@@ -4,7 +4,7 @@ parapluie-37:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:41
@@ -66,7 +66,7 @@ parapluie-37:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -74,9 +74,9 @@ parapluie-37:
       rev: HPG0
       vendor: ATA
   chassis:
-    serial_number: GB803651P3
+    serial: GB803651P3
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
index 00a76c21e858851888589dcfdb2b55da5978e7e1..394fd1d60a20596138babb4ecc205152d3d6b825 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -4,7 +4,7 @@ parapluie-38:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:21
@@ -66,7 +66,7 @@ parapluie-38:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -74,9 +74,9 @@ parapluie-38:
       rev: HPG0
       vendor: ATA
   chassis:
-    serial_number: GB803651M7
+    serial: GB803651M7
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
index 2263fe5d7f32b200bad0f9486724bffe7d57ca73..d8ad519d821b50dfc947e827438e48947965946b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
@@ -4,14 +4,14 @@ parapluie-39:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:29
@@ -74,9 +74,9 @@ parapluie-39:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651NW
+    serial: GB803651NW
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
index 9e0a745cfc99b13833bc7f89050d4366a968b0ca..ae32155156ddd84c90cf1cb2ec1e0cf1a402cbec 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
@@ -4,14 +4,14 @@ parapluie-4:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:49
@@ -74,9 +74,9 @@ parapluie-4:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651NH
+    serial: GB803651NH
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
index 237d7672c82ff95a92e54b9dc2f44c31769efd0d..89e5977df23f9fbf386d92827ee7c6ba6e622550 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
@@ -4,7 +4,7 @@ parapluie-40:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:1f
@@ -66,7 +66,7 @@ parapluie-40:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: GB0250EAFYK
       device: sda
@@ -76,9 +76,9 @@ parapluie-40:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651KS
+    serial: GB803651KS
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   main_memory:
     ram_size: 51539607552
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
index 8fcbef7aa8eb60bc22a63f24a8c4f7d7e93b43d9..e8bd03062d50690e57de63e8754b938d4edca641 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
@@ -4,7 +4,7 @@ parapluie-5:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:49
@@ -66,7 +66,7 @@ parapluie-5:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -74,9 +74,9 @@ parapluie-5:
       rev: HPG0
       vendor: ATA
   chassis:
-    serial_number: GB803651PN
+    serial: GB803651PN
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
index fb72a648d46dc29ddcafbd510234e461f5d51dfb..bb6e9bdcd6b3eefad869ce8184f130dfa5fa3621 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
@@ -4,14 +4,14 @@ parapluie-6:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:39
@@ -74,9 +74,9 @@ parapluie-6:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651NM
+    serial: GB803651NM
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
index 9888314ad426da795d3f36ac3fb124963d375357..8aadea6d9a82b64b9c4a4c600fb5ecea5ee95848 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
@@ -4,14 +4,14 @@ parapluie-7:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4d
@@ -76,9 +76,9 @@ parapluie-7:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: GB803651J9
+    serial: GB803651J9
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
index 314c235e988b207cedc6202005fe6604db61674c..f8016cfa7a140f806b2bd8c93f5082793ac89972 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
@@ -4,14 +4,14 @@ parapluie-8:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
       size: 250059350016
       rev: HPG0
       vendor: ATA
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4d
@@ -74,9 +74,9 @@ parapluie-8:
       driver: igb
       mountable: false
   chassis:
-    serial_number: GB803651MH
+    serial: GB803651MH
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
index 00fc6c0eecbfeb43af2f09c8215dcea8231388ab..8f8434eacc3d99261e81d3d6e651c371b75343e7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -4,7 +4,7 @@ parapluie-9:
     version: O37
     release_date: 09/06/2010
     vendor: HP
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:21
@@ -66,7 +66,7 @@ parapluie-9:
       interface: Ethernet
       driver: igb
       mountable: false
-  block_devices:
+  storage_devices:
     sda:
       model: VB0250EAVER
       device: sda
@@ -74,9 +74,9 @@ parapluie-9:
       rev: HPG0
       vendor: ATA
   chassis:
-    serial_number: GB803651P0
+    serial: GB803651P0
     manufacturer: HP
-    product_name: ProLiant DL165 G7
+    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
index d54e16a08341cfdd867b2a6104882511837d25a7..eda8d38f26e873f62c25f56335c353801ccd6fc5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
@@ -19,12 +19,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: false
         vendor: Intel
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie_manual.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_manual.yaml
index 063862a609753d6657d214891ddda4ccc458f7c4..f631b65fc344044164ff668759444beec6ba572c 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie_manual.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_manual.yaml
@@ -1,7 +1,7 @@
 ---
 nodes:
   parapluie-1:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/42
@@ -9,7 +9,7 @@ nodes:
       pdu_name: parapluie-pdu-1
       pdu_position: 24
   parapluie-2:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/32
@@ -17,7 +17,7 @@ nodes:
       pdu_name: parapluie-pdu-1
       pdu_position: 23
   parapluie-3:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/34
@@ -25,7 +25,7 @@ nodes:
       pdu_name: parapluie-pdu-1
       pdu_position: 22
   parapluie-4:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/45
@@ -33,7 +33,7 @@ nodes:
       pdu_name: parapluie-pdu-1
       pdu_position: 21
   parapluie-5:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/29
@@ -41,7 +41,7 @@ nodes:
       pdu_name: parapluie-pdu-1
       pdu_position: 20
   parapluie-6:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/36
@@ -49,7 +49,7 @@ nodes:
       pdu_name: parapluie-pdu-1
       pdu_position: 5
   parapluie-7:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/44
@@ -57,7 +57,7 @@ nodes:
       pdu_name: parapluie-pdu-1
       pdu_position: 4
   parapluie-8:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/33
@@ -65,7 +65,7 @@ nodes:
       pdu_name: parapluie-pdu-1
       pdu_position: 3
   parapluie-9:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/35
@@ -73,7 +73,7 @@ nodes:
       pdu_name: parapluie-pdu-1
       pdu_position: 2
   parapluie-10:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/31
@@ -81,7 +81,7 @@ nodes:
       pdu_name: parapluie-pdu-1
       pdu_position: 1
   parapluie-11:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/40
@@ -89,7 +89,7 @@ nodes:
       pdu_name: parapluie-pdu-2
       pdu_position: 24
   parapluie-12:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/41
@@ -97,7 +97,7 @@ nodes:
       pdu_name: parapluie-pdu-2
       pdu_position: 23
   parapluie-13:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/37
@@ -105,7 +105,7 @@ nodes:
       pdu_name: parapluie-pdu-2
       pdu_position: 22
   parapluie-14:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/38
@@ -113,7 +113,7 @@ nodes:
       pdu_name: parapluie-pdu-2
       pdu_position: 21
   parapluie-15:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/39
@@ -121,7 +121,7 @@ nodes:
       pdu_name: parapluie-pdu-2
       pdu_position: 20
   parapluie-16:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/44
@@ -129,7 +129,7 @@ nodes:
       pdu_name: parapluie-pdu-2
       pdu_position: 5
   parapluie-17:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/46
@@ -137,7 +137,7 @@ nodes:
       pdu_name: parapluie-pdu-2
       pdu_position: 4
   parapluie-18:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/45
@@ -145,7 +145,7 @@ nodes:
       pdu_name: parapluie-pdu-2
       pdu_position: 3
   parapluie-19:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/42
@@ -153,7 +153,7 @@ nodes:
       pdu_name: parapluie-pdu-2
       pdu_position: 2
   parapluie-20:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/43
@@ -161,7 +161,7 @@ nodes:
       pdu_name: parapluie-pdu-2
       pdu_position: 1
   parapluie-21:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/47
@@ -169,7 +169,7 @@ nodes:
       pdu_name: parapluie-pdu-3
       pdu_position: 24
   parapluie-22:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/48
@@ -177,7 +177,7 @@ nodes:
       pdu_name: parapluie-pdu-3
       pdu_position: 23
   parapluie-23:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/46
@@ -185,7 +185,7 @@ nodes:
       pdu_name: parapluie-pdu-3
       pdu_position: 22
   parapluie-24:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/48
@@ -193,7 +193,7 @@ nodes:
       pdu_name: parapluie-pdu-3
       pdu_position: 21
   parapluie-25:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/47
@@ -201,7 +201,7 @@ nodes:
       pdu_name: parapluie-pdu-3
       pdu_position: 20
   parapluie-26:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/46
@@ -209,7 +209,7 @@ nodes:
       pdu_name: parapluie-pdu-3
       pdu_position: 5
   parapluie-27:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/32
@@ -217,7 +217,7 @@ nodes:
       pdu_name: parapluie-pdu-3
       pdu_position: 4
   parapluie-28:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/31
@@ -225,7 +225,7 @@ nodes:
       pdu_name: parapluie-pdu-3
       pdu_position: 3
   parapluie-29:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/48
@@ -233,7 +233,7 @@ nodes:
       pdu_name: parapluie-pdu-3
       pdu_position: 2
   parapluie-30:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/42
@@ -241,7 +241,7 @@ nodes:
       pdu_name: parapluie-pdu-3
       pdu_position: 1
   parapluie-31:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/41
@@ -249,7 +249,7 @@ nodes:
       pdu_name: parapluie-pdu-4
       pdu_position: 24
   parapluie-32:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/40
@@ -257,7 +257,7 @@ nodes:
       pdu_name: parapluie-pdu-4
       pdu_position: 23
   parapluie-33:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi6/33
@@ -265,7 +265,7 @@ nodes:
       pdu_name: parapluie-pdu-4
       pdu_position: 22
   parapluie-34:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/39
@@ -273,7 +273,7 @@ nodes:
       pdu_name: parapluie-pdu-4
       pdu_position: 21
   parapluie-35:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/33
@@ -281,7 +281,7 @@ nodes:
       pdu_name: parapluie-pdu-4
       pdu_position: 20
   parapluie-36:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/35
@@ -289,7 +289,7 @@ nodes:
       pdu_name: parapluie-pdu-4
       pdu_position: 5
   parapluie-37:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/38
@@ -297,7 +297,7 @@ nodes:
       pdu_name: parapluie-pdu-4
       pdu_position: 4
   parapluie-38:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/34
@@ -305,7 +305,7 @@ nodes:
       pdu_name: parapluie-pdu-4
       pdu_position: 3
   parapluie-39:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/36
@@ -313,7 +313,7 @@ nodes:
       pdu_name: parapluie-pdu-4
       pdu_position: 2
   parapluie-40:
-    network_interfaces:
+    network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/37
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
index c330b390ceadcffda4955f1c8c1e88b72aba6419..6b2e0f66e677cd91e27c2960752554876cacda08 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-1:
   chassis:
-    serial_number: 1GZGG42
+    serial: 1GZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth3:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-1:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
index 1930d48a5d4a3760f6c1cdaedc5110ca7841d94a..32172a7d429ce010b9190ea4b123c0fd1e8ed110 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-10:
   chassis:
-    serial_number: 1FZGG42
+    serial: 1FZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-10:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
index 2b06b4c3f929dfe104fd27ea391204ce5fdbe651..273dde10c5e9d582d8c873508d4819f05ede1043 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-11:
   chassis:
-    serial_number: 7GZGG42
+    serial: 7GZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-11:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
index eb59d1e03c4875fc2c91932cdce13ce76f8744a4..0290c26a4e4844f3773aa536f36dd1cd1f59c1c1 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-12:
   chassis:
-    serial_number: 4GZGG42
+    serial: 4GZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-12:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
index 923a3f804bbbfd7b5a5ede593dcb40fe37b3963e..b1195fe283cb104960b518bc50749e72d0b9c53b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-13:
   chassis:
-    serial_number: 5LZGG42
+    serial: 5LZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -55,7 +55,7 @@ parasilo-13:
     smt_size: 16
     smp_size: 2
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
index 5f6d269ffed445c1d355bb35190c458fb04e3643..71528bbf143e89a1120195d3ce08db283a2f120e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-14:
   chassis:
-    serial_number: 8ZQGG42
+    serial: 8ZQGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -55,7 +55,7 @@ parasilo-14:
     smt_size: 16
     smp_size: 2
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
index cc963013e9e83248f3ce726d0f371131f636c2ec..03cf3c7444e4b59d782ae14f005c58d55cca2b13 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -1,6 +1,6 @@
 ---
 parasilo-15:
-  network_interfaces:
+  network_adapters:
     eth3:
       interface: Ethernet
       management: false
@@ -29,9 +29,9 @@ parasilo-15:
       mac: ec:f4:bb:d0:25:90
       mounted: true
   chassis:
-    serial_number: 9JZGG42
+    serial: 9JZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   bios:
     version: 1.0
     vendor: Dell Inc.
@@ -51,7 +51,7 @@ parasilo-15:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
index 60eae78fe1cef314f92e2c90019eb45302b8f3e2..b6ad78365558734cd510d0adb2127e603c11e8ea 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -2,7 +2,7 @@
 parasilo-16:
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth0:
       interface: Ethernet
       ip: 172.16.97.16
@@ -48,10 +48,10 @@ parasilo-16:
     cache_l2: 262144
     cache_l3: 20971520
   chassis:
-    serial_number: 2XG6152
+    serial: 2XG6152
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
+    name: PowerEdge R630
+  storage_devices:
     sdc:
       device: sdc
       size: 600127266816
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
index aca0fbfe09dca6c6e5f651b0857ea15300d9544e..e660c2af2fe1448524f3b8a18798480453524893 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -1,6 +1,6 @@
 ---
 parasilo-17:
-  network_interfaces:
+  network_adapters:
     eth3:
       interface: Ethernet
       management: false
@@ -29,9 +29,9 @@ parasilo-17:
       mac: ec:f4:bb:d1:01:b8
       mounted: true
   chassis:
-    serial_number: 3JZGG42
+    serial: 3JZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   bios:
     version: 1.0
     vendor: Dell Inc.
@@ -51,7 +51,7 @@ parasilo-17:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
index 47c4c1782894dc50160a0a6c4a2cffa61f92c7f9..bafd7abded8e22e82cc0ad2b4818ef3d1b811c98 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-18:
   chassis:
-    serial_number: FZQGG42
+    serial: FZQGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth3:
       interface: Ethernet
       management: false
@@ -55,7 +55,7 @@ parasilo-18:
     smt_size: 16
     smp_size: 2
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
index abf49f908a38b4d31741d827a939aed9cf5b2d38..151094e5e02062013de3d0ca7e9526b24cf1e8c0 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-19:
   chassis:
-    serial_number: C0RGG42
+    serial: C0RGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-19:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
index 4c6fefd69a8bd11ba93c86803ed718956c21553f..165f7a24123c3d58b7169aa7a0da8b01b5c63552 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-2:
   chassis:
-    serial_number: BGZGG42
+    serial: BGZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth3:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-2:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
index 59e91245322d39b62dae3e7ff47cb11067cdcbab..bbf1c913a8859482ade1ecc81e800652150c8790 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-20:
   chassis:
-    serial_number: 31000000000G42
+    serial: 31000000000G42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth3:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-20:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
index 9ab659633a5b2365ea2d5a7cc39b69c2ee5cbc8f..f9534a8cecb19b3a1aeb334014684e67ab2f8e09 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-21:
   chassis:
-    serial_number: 7HZGG42
+    serial: 7HZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -55,7 +55,7 @@ parasilo-21:
     smt_size: 16
     smp_size: 2
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
index ab4b1ee5babdb9e7d3d55ace59b65a2a4652815a..49df858adab94014ab15393e6a80ba7de96499f3 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -1,6 +1,6 @@
 ---
 parasilo-22:
-  network_interfaces:
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -29,9 +29,9 @@ parasilo-22:
       mac: ec:f4:bb:d1:00:64
       mounted: false
   chassis:
-    serial_number: 4KZGG42
+    serial: 4KZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   bios:
     version: 1.0
     vendor: Dell Inc.
@@ -51,7 +51,7 @@ parasilo-22:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
index 189ae94fbb42cb644b1051f82cb7d3b39c880ec4..94485df7e49e1c32df76275152454af1002618ec 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -1,6 +1,6 @@
 ---
 parasilo-23:
-  network_interfaces:
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -29,9 +29,9 @@ parasilo-23:
       mac: ec:f4:bb:d1:0e:60
       mounted: true
   chassis:
-    serial_number: 20RGG42
+    serial: 20RGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   bios:
     version: 1.0
     vendor: Dell Inc.
@@ -51,7 +51,7 @@ parasilo-23:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
index daf9d2ca963c4f5238fc264237cdb09541a38e68..de4ba7b954b2a4bd987c9d8a08c9bbcc3eb29732 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -1,6 +1,6 @@
 ---
 parasilo-24:
-  network_interfaces:
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -29,9 +29,9 @@ parasilo-24:
       mac: ec:f4:bb:d1:10:1c
       mounted: false
   chassis:
-    serial_number: 50RGG42
+    serial: 50RGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   bios:
     version: 1.0
     vendor: Dell Inc.
@@ -55,7 +55,7 @@ parasilo-24:
     smt_size: 16
     smp_size: 2
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
index 04e3b9ed085f0e2d6790c4abae0eb8afa07a6aa0..36966c5860bf95c178a031463c18c35208a553cf 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -1,6 +1,6 @@
 ---
 parasilo-25:
-  network_interfaces:
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -29,9 +29,9 @@ parasilo-25:
       mac: ec:f4:bb:d1:0d:d8
       mounted: true
   chassis:
-    serial_number: 70RGG42
+    serial: 70RGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   bios:
     version: 1.0
     vendor: Dell Inc.
@@ -51,7 +51,7 @@ parasilo-25:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
index ce95940a0f659665e101e18a9d4c5612a7640702..d597959ddb8af93b9e450e7a2cb490e92df2c5ad 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-26:
   chassis:
-    serial_number: 90RGG42
+    serial: 90RGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-26:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
index 5984d6f202860fc277e27b3f82824e2bfcf41b0f..b5f1115299a530706bf89201e70146d7678c73c8 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-27:
   chassis:
-    serial_number: H0RGG42
+    serial: H0RGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-27:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
index 646221d7008b4865b0f5739f1b525418f4e3c4e3..4e13cfb680f30e03f3c49412d71fd69412263dd2 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-28:
   chassis:
-    serial_number: 30RGG42
+    serial: 30RGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-28:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
index 861aa2fa1d3bf79b2d97e0c1cca28a4ae18d1050..b62cbdbb0330ffdbc7a0020c4358055c6c9664fe 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -1,6 +1,6 @@
 ---
 parasilo-3:
-  network_interfaces:
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -29,9 +29,9 @@ parasilo-3:
       mac: ec:f4:bb:d0:f3:1c
       mounted: false
   chassis:
-    serial_number: 8FZGG42
+    serial: 8FZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   bios:
     version: 1.0
     vendor: Dell Inc.
@@ -55,7 +55,7 @@ parasilo-3:
     smt_size: 16
     smp_size: 2
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
index 138d589011272625451c930f34c1c2e1efac9650..3cac2b1adb34270871b2bdb89067a5bc9579709d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -1,6 +1,6 @@
 ---
 parasilo-4:
-  network_interfaces:
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -29,9 +29,9 @@ parasilo-4:
       mac: ec:f4:bb:d1:02:8c
       mounted: false
   chassis:
-    serial_number: HHZGG42
+    serial: HHZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   bios:
     version: 1.0
     vendor: Dell Inc.
@@ -51,7 +51,7 @@ parasilo-4:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
index 8c232dbe9e7b11c9745091650358645cf6c7127e..853652e012f55d6419b49bedf1e1d41e7707196e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-5:
   chassis:
-    serial_number: CKZGG42
+    serial: CKZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth1:
       interface: Ethernet
       management: false
@@ -55,7 +55,7 @@ parasilo-5:
     smt_size: 16
     smp_size: 2
     platform_type: x86_64
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
index bfb6a7609aea9d8cc39fee9b8bad3886b94b3071..f2246d799014a40a1c64b1091e24a9a203a9d4f0 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-6:
   chassis:
-    serial_number: HKZGG42
+    serial: HKZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth3:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-6:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
index 9e4f25f448fe2ce54dc5b853bc005250004e1452..530820132258ab5db8e1eb79fe2b79e6ac0d6a0f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -1,6 +1,6 @@
 ---
 parasilo-7:
-  network_interfaces:
+  network_adapters:
     eth3:
       interface: Ethernet
       management: false
@@ -29,9 +29,9 @@ parasilo-7:
       mac: ec:f4:bb:d0:fc:38
       mounted: true
   chassis:
-    serial_number: 3FZGG42
+    serial: 3FZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   bios:
     version: 1.0
     vendor: Dell Inc.
@@ -51,7 +51,7 @@ parasilo-7:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
index 320b46ebb737f92e2e3f30fb82d23b3da5652e3f..9e7a63758a79e9fe1276aace2326d56259cc5250 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -1,10 +1,10 @@
 ---
 parasilo-8:
   chassis:
-    serial_number: GFZGG42
+    serial: GFZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
+    name: PowerEdge R630
+  network_adapters:
     eth3:
       interface: Ethernet
       management: false
@@ -51,7 +51,7 @@ parasilo-8:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
index bd47739ccc29c2a98318f354911a38f00a762ea2..94dabe6150947bf4edd47fd23fb890f762149472 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -1,6 +1,6 @@
 ---
 parasilo-9:
-  network_interfaces:
+  network_adapters:
     eth3:
       interface: Ethernet
       management: false
@@ -29,9 +29,9 @@ parasilo-9:
       mac: ec:f4:bb:d0:f0:b8
       mounted: true
   chassis:
-    serial_number: DDZGG42
+    serial: DDZGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   bios:
     version: 1.0
     vendor: Dell Inc.
@@ -51,7 +51,7 @@ parasilo-9:
     clock_speed: 2400000000
   supported_job_types:
     virtual: ivt
-  block_devices:
+  storage_devices:
     sdf:
       device: sdf
       rev: A4AE
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
index 044c54e08772b7fd3ed6149c3d8d5f8aa3bb4bd8..3ed6c4f3b2edb40181317a61a1119a7d9f28b1fe 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
@@ -19,7 +19,7 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
@@ -44,7 +44,7 @@ nodes:
         interface: SATA
         driver: ahci
         storage: SSD
-    network_interfaces:
+    network_adapters:
       eth0:
         rate: 10.0e+9
         device: eth0
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
index 020ad887db91abe1ec7df9af9e8c39050fe457a9..0a484bd10483f910680803739f387aff6f8c0647 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-1:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-1:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 42RGG42
+    serial: 42RGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     bmc:
       mac: b8:2a:72:fc:f6:22
       ip: 172.17.96.1
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
index c7e1d1889b4f293d537fa24e3452b0ca7ca155ee..1b50a3fdd29ece85362b8eab3670558794ddec0e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-10:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-10:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 79WGG42
+    serial: 79WGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
index 98e0ce6f028968e184b9e8c0ab88d6fb76d85e51..8bec2c1c0bb053301b28701181f110a997bcd3aa 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-11:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-11:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: HTQGG42
+    serial: HTQGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
index 7957e69a194885a3046f4481fe3f996e2667cfae..0f49a48128d47fbb916525ea11aab07e0d6363ed 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-12:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-12:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 3TZGG42
+    serial: 3TZGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
index 9ab8e89d1ec84a257cb9d11c44410dab1a765de1..fab5ce68f7f956db848925e45b27f12db750fdd7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-13:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-13:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: F3RGG42
-  network_interfaces:
+    serial: F3RGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
index d14e05bd1e4944ef760f1bb6c2ac457c55c30ff0..6e055f8fe52ec0c2f0ee16262ec168c22023e904 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-14:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-14:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: GSZGG42
-  network_interfaces:
+    serial: GSZGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
index 7376743449c654dd2d15375e0faa43099bec4bf2..f1d531349f7940265753212ff83c60bcd44f5356 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-15:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-15:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 63RGG42
-  network_interfaces:
+    serial: 63RGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
index 241855537f0d655113b4dd8da462da0b5714f1e7..2b31c1284a407bbff2de5296b584057cafd53ff9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-16:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-16:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 2HXGG42
+    serial: 2HXGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
index 29070a32e7b535a892fc425b996bd79cd178e417..eb43066ae7584f918e0271ef6f3d94cc79d19e07 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-17:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-17:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 3MXGG42
+    serial: 3MXGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
index e9fefe66401a8c27f3ed11e21deba079b4443566..75ab83c4d63a2de1119d97fe64285810139baf95 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-18:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-18:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 10VGG42
-  network_interfaces:
+    serial: 10VGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
index 865c8c39717f51b134d563ecbcb8ab83ecf318fb..c4b7fc2ace3574a0f509806b7d2d01b44e6d70aa 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-19:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-19:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: CFXGG42
-  network_interfaces:
+    serial: CFXGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
index 6c9df2aece1d598458ff28d14b631621898041ec..b8bcbe614ca55b80403b436b0628718c83e7474d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-2:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-2:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 6XQGG42
+    serial: 6XQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
index 72970f12d62feb52a161df3674d05fa36f7d8fd5..3adf47eb410ed0eef38ea81e288730190cf034d5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-20:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-20:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 4VXGG42
+    serial: 4VXGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
index d24f4c137f0ad38df3bfa26f835a130ec86af031..1594bffa568d2e19c2dfada43b607c2d64967dbe 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-21:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-21:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 3NXGG42
+    serial: 3NXGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
index 311f44a6863ad8caa2e4e759329825e3a2408477..5ecdd4302a47f7af5b87dd24771db50ea39fc767 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-22:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-22:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 81000000000G42
+    serial: 81000000000G42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
index 1eb1c7fc6bd8d957eee36abebf43e56bed2f0fb5..08f1e0c5a17cd8d6e129a86ca67da1081fb05790 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-23:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-23:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 1XQGG42
+    serial: 1XQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
index 51368bf3baed7123ab160ff59eaf3f3fd601d118..ac176af0e599a6a631f2cb39ca13596db574914f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-24:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-24:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: CVQGG42
+    serial: CVQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
index e29f8749df4e9dfd3635956d1c2735e7de74c0df..f2a61bd9731e1bacdfaa2ac0850a2a33fe0e376c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-25:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-25:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: BFWGG42
-  network_interfaces:
+    serial: BFWGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
index 03d79c1ba5e118cb104a74adbfe46a9128cfc2e6..965de6254c8f679b03c4a59d6a124efe844a92eb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-26:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-26:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: D9WGG42
+    serial: D9WGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
index 171f88b64d2ea46b1b4f6a9b0910a13c6ecd4f6d..62a1779309aacf3432b11681659a3cb71d601ba4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-27:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-27:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 2FWGG42
+    serial: 2FWGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
index 1a74a6cffbac49ebd8ead08925de7fcdf7486548..65654208054d7fea98fa7b72e06593ce4fc22665 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-28:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-28:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: BQQGG42
-  network_interfaces:
+    serial: BQQGG42
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
index 20402a1f2bd869622467acf70ae3563d858dc3a2..64431b27b4d6de22724e96304a6c701c0c0e62a7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-29:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-29:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: J9WGG42
-  network_interfaces:
+    serial: J9WGG42
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
index ade7e743e546c8e536c6b7110744272226ce9de1..4bdb413084145ce6d2b2f3497479589f1c6f5ace 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-3:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-3:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: G1000000000G42
+    serial: G1000000000G42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
index 5684a3db87d44b7a0ad04515975414aa3d44fd20..ff157b4d863362144b49d2a835536d4e6fc7889a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-30:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-30:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: C7VGG42
+    serial: C7VGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
index 13cb33a9687acf8043b8916132d0de15665628c9..fc6885280d56ea448e0bd283b4658a8c4348baad 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-31:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-31:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 14RGG42
-  network_interfaces:
+    serial: 14RGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
index 99de2c723a8306b1e3b3f7095f1d1bafe384c9d8..56b7b8d016072d8cf2b80f410f3acebbd8359aca 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-32:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-32:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 5QXGG42
+    serial: 5QXGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
index 2f98ae957006e149cd6051bc1224b0f2613117cb..7e8fe57ed1caa330a87bec7893968e17cdfcb97b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-33:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-33:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 3DWGG42
-  network_interfaces:
+    serial: 3DWGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
index 5c38e805c07ac2fd5fd411ca563c9121319ea12e..4e5449b8f8953dddee1af307c6a7898587c6f95f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-34:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-34:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: BRQGG42
+    serial: BRQGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
index 94f8ba13629354598f2f1957084b3f06fad851bc..e7d6b33bcbb2b7945a01029eabbe13e59352ad2d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-35:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-35:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: G8WGG42
+    serial: G8WGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
index 02a74697a552e9ec4eead70616e3904c2347ef27..e0f66e46e13458e16215901dc7b2b5fd3b2aa23a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-36:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-36:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: FBWGG42
+    serial: FBWGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
index 1541eba9bd0092876b0b72bf652ef63f992b0d6d..bb1ae1c7e8360ed0dd54d1f796d9a19a62831ca7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-37:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-37:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 23RGG42
-  network_interfaces:
+    serial: 23RGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
index de86ffab5c2f564562ac52b306af3e57810f3a29..833f48ae6644c238ca03ad870adf8edf83fb2264 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-38:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-38:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 3XQGG42
+    serial: 3XQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
index 4253ec2a0b018e5212d20ba738c9aada93b3e12d..f2f4ca2a2b484c4dd3068ccce159242b6b616e33 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-39:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-39:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: B3VGG42
+    serial: B3VGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
index b8312975be0c9a001a6514f569ce0971731e8dbe..fd609b6763ee20e706a9c6a0fc9c905534f665b9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-4:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-4:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: DWQGG42
+    serial: DWQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
index 91f92137444a6ef183e2e3d8550b669e6a82c037..6857cc1e73e59c4937b2b4c06eaf869c22b6dcae 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-40:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-40:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 92RGG42
+    serial: 92RGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
index 39f3058466520444630801d58a4a3a4e4bc87145..053f61a601f3e0c03ee7eb127e23f1c9cc12240e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-41:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-41:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 8PQGG42
+    serial: 8PQGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
index 0b5ecb5eb9275afd5522880be61eabcf68f79422..d0ac62ad925733d890876cb974a3fabf0be169a5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-42:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-42:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 64RGG42
+    serial: 64RGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
index 8961223439222fef54cfc2a7ada9508b98e0615d..995d5c26746c6acb4ce492389603e48d116b9bee 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-43:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-43:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 3SQGG42
+    serial: 3SQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
index 1f1ea466beebd36c7f57fea272aeb23152ba7c7e..047e997be0f0bcfb3c63f5fbf2b1228ac86183e6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-44:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-44:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 9NXGG42
+    serial: 9NXGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
index 940defed5570d3ac149c86edf8ef2a0c8d72c9f2..26b96c451caa525cb647082a2577cc43f25ad3af 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-45:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-45:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 9XQGG42
-  network_interfaces:
+    serial: 9XQGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
index 0fd9dbbc8faa43f819d6967a34d6cbf5f2023364..db6f54257bf15a4d44211fb1a2a021242bb64a83 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-46:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-46:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: BVQGG42
+    serial: BVQGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
index 9c8ab252b683393c6b46ba470c957b395a71f85b..b6f071ac800c935a91ccbd1209e8f05774adda7b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-47:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-47:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: DDXGG42
+    serial: DDXGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
index 5bbac5ccbe5f38044d48d6531c7dfcd692bd0ea3..b9c4d62757b5bedd72a566f8d24d0cbb1a23e624 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-48:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-48:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: GWQGG42
+    serial: GWQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
index a53e5862045b4e51b3d9e42210cb86717ef56d96..31bedc5c104ddf1e37f55be0abe9b9598392609c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-49:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-49:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: FRXGG42
+    serial: FRXGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
index b33906af5f04a0a5eebb96cd83409f198392519b..f3d5485f6f581100b24547dc9c99307f09a63db9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-5:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-5:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 3WQGG42
+    serial: 3WQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
index b2c9f5bf51293f87433f406a6958ed775f584d13..145e9cabcb171436af78c0ab14a9319293bfe506 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-50:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-50:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 9PXGG42
+    serial: 9PXGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
index a4f4d7c668dd80858cb2d8a5f122bdd8acaee31d..221ece73eec9de30fc48f3af7a24370fa6640860 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-51:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-51:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 8JXGG42
+    serial: 8JXGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
index 5fb631724aa6294e41bf72aa6bff86e5ad29f40b..3d56ddc09b30790a8d10b607f78e6f48ef8f979f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-52:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-52:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: DSQGG42
+    serial: DSQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
index 9a14cef4975da227714f8335580553dfcd35d4c9..231068a8105140a3824547f8b4b04556196f26ec 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-53:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-53:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 4FXGG42
-  network_interfaces:
+    serial: 4FXGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
index 350e143904c7324bf584af73399830d00e275e69..53b720cfe55ecd315c3abfd3b6e051225c759a87 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-54:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-54:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 1RQGG42
+    serial: 1RQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
index e40e43f22eaed4f83fd6e09026594a59c1e31f5e..07fb2e0f2a08042b8cb1412c99f06cf6aad07575 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-55:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-55:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 5BWGG42
-  network_interfaces:
+    serial: 5BWGG42
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
index d010990383bc51bad75f0773c5aa5713a9eebb9b..c1d8de0f68607e8d68dc77722c69f1d18edee01a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-56:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-56:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 7KXGG42
+    serial: 7KXGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
index d9c64adedf4eb53023c8944519600e3bc55c430c..dc7c4825445a5f99d41596b9ed73dc3af1f43e96 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-57:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-57:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 92VGG42
+    serial: 92VGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
index ef67d0bfcf6a7f00bba1375a592008aa2606f418..44408a2a4435035a897ccccc9f54c07538d58027 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-58:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-58:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 1WQGG42
+    serial: 1WQGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
index c45ac7dd171f18ae7e364b08265d9bb2fec18012..a1784f8f4bcab79d6d6900b8d7f584cbf0981569 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-59:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-59:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 58VGG42
+    serial: 58VGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
index 2ac979950e10eb1d91a402176563a2f221a659c3..20ee6b4253564006f697e3b175a3cc12102fe8a4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-6:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-6:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: B4RGG42
+    serial: B4RGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
index 26d6de2ae6e9e53d1a1eb965717b01d5cfb690ec..c2c52f2f9937283401dd2d83218e4251a12ee59e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-60:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-60:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 33VGG42
+    serial: 33VGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
index 70fbeb9a3300d90f4a4feee422f30e1b892e0c21..6d35ffc216b25978972b21eec6600e49e38b4d28 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-61:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-61:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 2SXGG42
+    serial: 2SXGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
index 3e8ebedefaee637697f074c4b017b657706b9106..e19f345b1b31c09d0581e582ead3ce57f90c3ba7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-62:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-62:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 7LXGG42
-  network_interfaces:
+    serial: 7LXGG42
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
index 5582a35a8bf7f4df7d0bbf2527cac049200ff156..c1c3feb1a2f072264b62a30bea0391f294b08708 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-63:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-63:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 8SXGG42
+    serial: 8SXGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
index 97211e56606b3ea82b68119c93e4d42e688d7be7..845cfe141bd723c5df91de2f90e84636680a4988 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-64:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-64:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 26VGG42
+    serial: 26VGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
index 1d8085845e16446ba86c761c68fe3abb9bf085ac..76cdf83e684b0db61f8a6c3134cc40445fa96307 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-65:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-65:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 4PXGG42
+    serial: 4PXGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
index 03f16f7d579e0ac4b244bc54120c2b34a6bf6f71..13ea1862e4a91a2cd123839257147caa38066da6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-66:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,16 +12,16 @@ paravance-66:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 2GWGG42
+    serial: 2GWGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
index bc98e912a8937176bc19847376c5ae104212dfe2..0604786f1a662dbe57ab45ab37036d911a28aa9b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-67:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-67:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 3GXGG42
+    serial: 3GXGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
index 31f86990c68afe341bcb8104957c2d8241f6d8dd..886aade0b72004571d886758b11ec3a3f8a41a2d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-68:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -12,14 +12,14 @@ paravance-68:
       model: ST600MM0006
       device: sda
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 8HXGG42
+    serial: 8HXGG42
   architecture:
     platform_type: x86_64
     smt_size: 16
     smp_size: 2
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
index 0c5117794399e4f670f422841ec94a985874f390..a8659011e084d015d758049e54889d08a0d72fed 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-69:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-69:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 47VGG42
+    serial: 47VGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
index 8fd7e07c3d7cfc6e103f4a69eb48c50a386f96db..7d544f9adcf25c9433f15777c8d0e98ed3b45ca1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -2,7 +2,7 @@
 paravance-7:
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth2:
       interface: Ethernet
       driver: igb
@@ -34,7 +34,7 @@ paravance-7:
     vendor: Dell Inc.
     version: 1.0
     release_date: 08/28/2014
-  block_devices:
+  storage_devices:
     sda:
       device: sda
       size: 600127266816
@@ -48,9 +48,9 @@ paravance-7:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 6SQGG42
+    serial: 6SQGG42
     manufacturer: Dell Inc.
-    product_name: PowerEdge R630
+    name: PowerEdge R630
   architecture:
     smp_size: 2
     smt_size: 16
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
index 49a3ba66d21956383d24f93b66f6354a4bc327b6..fc352e0a4ea2915cbb82877dd60aed68839b1e6d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-70:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-70:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 86VGG42
-  network_interfaces:
+    serial: 86VGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
index 47b6c889430424ae732526d3cc52399c0b5d4e99..8557d2cab9f20a1d1a7db6fea75e2354769d1082 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-71:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-71:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: F0VGG42
+    serial: F0VGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
index eacdfb0562bc82b48e160f8a0d554534c2104264..0112a66e31d5227bc0e6626aa7d5f3d3ff42e524 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-72:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-72:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: 2JXGG42
+    serial: 2JXGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth3:
       driver: igb
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
index beb7d6cc0582ccea1a12053367617960a0270b12..079ca026341949218ac3cf074f1fccb4cbf4dda1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-8:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,10 +16,10 @@ paravance-8:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: JXQGG42
-  network_interfaces:
+    serial: JXQGG42
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
index daec1b94535cec8659ca3ee950969b209ec8ae0c..0b5d293dbde5e9e6e20553e5672d3f804bc548bf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -1,6 +1,6 @@
 ---
 paravance-9:
-  block_devices:
+  storage_devices:
     sdb:
       size: 600127266816
       rev: LS0A
@@ -16,12 +16,12 @@ paravance-9:
     smt_size: 16
     smp_size: 2
   chassis:
-    product_name: PowerEdge R630
+    name: PowerEdge R630
     manufacturer: Dell Inc.
-    serial_number: HSQGG42
+    serial: HSQGG42
   main_memory:
     ram_size: 137438953472
-  network_interfaces:
+  network_adapters:
     eth1:
       driver: ixgbe
       mounted: false
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
index 9f6a5e73157e0c810b9758637c083dde42c0e08e..bb616d15880e58dd66ca4c458e5162df66b92bbf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
@@ -19,7 +19,7 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
@@ -28,7 +28,7 @@ nodes:
         interface: SATA
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         rate: 10.0e+9
         device: eth0
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml
index 48fe068d3094f06f12c8a6f9cb181d9a98056d11..28cafaede3ad10908bc0acfed7dcf090b030421c 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml
@@ -8,14 +8,14 @@ sol-1:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ sol-1:
       mac: 00:16:36:c5:92:c8
       ip: 172.17.129.1
   chassis:
-    serial_number: 0650QBT132
+    serial: 0650QBT132
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml
index e99fa8f2bf18c68cad3eb5662a2fc0fa02770409..00f37378f91e106c9ce2cb48b6c795bc321a4b2b 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml
@@ -4,14 +4,14 @@ sol-10:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ sol-10:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 0650QBT12E
+    serial: 0650QBT12E
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml
index d7c8b4b039ac2ab07bf0238fc1701a04f422151d..9c146c21120fb0f5209b6d8a97208f9284cd0b77 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml
@@ -4,7 +4,7 @@ sol-11:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ sol-11:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -39,9 +39,9 @@ sol-11:
       rev: A9CA
       vendor: Hitachi
   chassis:
-    serial_number: 0650QBT134
+    serial: 0650QBT134
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml
index e7bed7752fb1df5ba35cf107f9401c7e19b0e7b8..6e2d976f7131fbe4c305fe07233161ccdd7b8803 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml
@@ -4,7 +4,7 @@ sol-12:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -27,7 +27,7 @@ sol-12:
     bmc:
       mac: 00:16:36:c5:93:8e
       ip: 172.17.129.12
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -41,9 +41,9 @@ sol-12:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT10A
+    serial: 0650QBT10A
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml
index 706e7471f700c2ccff49e47b634f3e7f042cc818..374591751d2dbdbd62e93fb0e0fa5118f347b4b0 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml
@@ -8,14 +8,14 @@ sol-13:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ sol-13:
       mac: 00:16:36:c5:92:d9
       ip: 172.17.129.13
   chassis:
-    serial_number: 0650QBT111
+    serial: 0650QBT111
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml
index 4af99c2aa2c4f5a01cc570dd6a7d5c7efbcf888c..811616f332f49dcbf04841f805048e735b883aa6 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml
@@ -8,7 +8,7 @@ sol-14:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ sol-14:
     bmc:
       mac: 00:16:36:ca:0b:1a
       ip: 172.17.129.14
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -39,9 +39,9 @@ sol-14:
       rev: A9CA
       vendor: Hitachi
   chassis:
-    serial_number: 0650QBT119
+    serial: 0650QBT119
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml
index 2693b31fe1ac742548fc6bd378047eee2770bcb0..b8fec96eb900acf5e737f8b2c96543c6c80b4012 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml
@@ -4,7 +4,7 @@ sol-15:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ sol-15:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -39,9 +39,9 @@ sol-15:
       rev: A9CA
       vendor: Hitachi
   chassis:
-    serial_number: 0650QBT11A
+    serial: 0650QBT11A
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml
index 8016699864633361bb9b87341cb4b7c5a147531b..f9af7af3541bc7ed1f8115a8639e6072d7d067c5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml
@@ -8,14 +8,14 @@ sol-16:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ sol-16:
       mac: 00:16:36:ca:0b:06
       ip: 172.17.129.16
   chassis:
-    serial_number: 0650QBT10F
+    serial: 0650QBT10F
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml
index 079cceaab5499ddb83777277d695598e21e1d2b5..396dc0900322cc5ba9617c26223fc6cd92a896dd 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml
@@ -4,14 +4,14 @@ sol-17:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ sol-17:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 0650QBT113
+    serial: 0650QBT113
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml
index c4a3c0c171d6287ebdef20291e4f0f318b99e3de..34b31131e1963b455f8c07a5b71c3cafc9a15858 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml
@@ -8,7 +8,7 @@ sol-18:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ sol-18:
     bmc:
       mac: 00:16:36:c5:93:b9
       ip: 172.17.129.18
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -39,9 +39,9 @@ sol-18:
       rev: A9CA
       vendor: Hitachi
   chassis:
-    serial_number: 0650QBT118
+    serial: 0650QBT118
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml
index 8232da4dfc4cf20ff2970ab426b39aaf9c723b96..0079facb1df7d754efc2fb07fa28fa5dface8a67 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml
@@ -8,14 +8,14 @@ sol-19:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ sol-19:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT126
+    serial: 0650QBT126
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml
index 6f2a016ccdf4be95d3d746a476389ce8fb2e8cca..0a262383199e025c7b9920fafbd47cf8c0c36357 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml
@@ -8,7 +8,7 @@ sol-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ sol-2:
     bmc:
       mac: 00:16:36:c5:93:97
       ip: 172.17.129.2
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -41,9 +41,9 @@ sol-2:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT108
+    serial: 0650QBT108
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml
index bcbe64a2566305dff6b72f36e2e0305a7bed81c7..ecad2023ba4f96944dfcf66692a8641056cc619f 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml
@@ -4,7 +4,7 @@ sol-20:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -15,7 +15,7 @@ sol-20:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ sol-20:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT11B
+    serial: 0650QBT11B
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml
index 3f4b364de0d35c7381eeef8d7c3ad9d665529a1a..b321260d6f1a3fa8ee591617056f849c418a20e5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml
@@ -8,14 +8,14 @@ sol-21:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ sol-21:
       mac:
       ip: 172.17.129.21
   chassis:
-    serial_number: 0650QBT11C
+    serial: 0650QBT11C
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml
index 20e9f5ba6c953cc53c648e70a61535d277963085..16cd66fd9f59c2d00bb47311e3188d31187d1f03 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml
@@ -4,7 +4,7 @@ sol-22:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -15,7 +15,7 @@ sol-22:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ sol-22:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT12B
+    serial: 0650QBT12B
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml
index 87b9ede57df2d6b673f704fa45fdbb4b63e45756..74156b002a037d8e764094dc31634b7c17b6c6c7 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml
@@ -8,14 +8,14 @@ sol-23:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ sol-23:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT116
+    serial: 0650QBT116
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml
index 00bda86efc9adf3a705fb7e91d7e8f9f884d66d2..f330774901a3f3b0559744b52ea6b6b6818705e8 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml
@@ -4,7 +4,7 @@ sol-24:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -15,7 +15,7 @@ sol-24:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ sol-24:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT129
+    serial: 0650QBT129
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml
index 6e0899afe52703778531474b03ffe980f329b4c0..4016c69541d7353ed230863663f2cd1d8ee68834 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml
@@ -4,7 +4,7 @@ sol-25:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -27,7 +27,7 @@ sol-25:
     bmc:
       mac: 00:16:36:91:f6:f6
       ip: 172.17.129.25
-  block_devices:
+  storage_devices:
     sda:
       model: SEAGATE ST32500N
       device: sda
@@ -41,9 +41,9 @@ sol-25:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT11F
+    serial: 0650QBT11F
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml
index fa2728f4d19d93164ddd2021f1a36b20efc37fc7..c9991ec1e2dfeb240e7801725add8ea5e62331e1 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml
@@ -4,14 +4,14 @@ sol-26:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ sol-26:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT124
+    serial: 0650QBT124
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml
index 99b91b24137b961d3ac853690ab4f62615430a90..24cd9893bf562f4dea274e87251c67e6c7c67a25 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml
@@ -8,7 +8,7 @@ sol-27:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ sol-27:
     bmc:
       mac: 00:16:36:c5:93:48
       ip: 172.17.129.27
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -41,9 +41,9 @@ sol-27:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT106
+    serial: 0650QBT106
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml
index 22d07feff9b74f61f8b5a8acfb6c0ac09921cd2b..60c9137b1677be89c531466f573d51d50b572153 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml
@@ -4,7 +4,7 @@ sol-28:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ sol-28:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -41,9 +41,9 @@ sol-28:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT12A
+    serial: 0650QBT12A
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml
index cfb29db838ba18b5c0348c0b264737e4664ccf75..f441694a9af603ed62dcb061c055d2c80c2e2efb 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml
@@ -4,7 +4,7 @@ sol-29:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -38,7 +38,7 @@ sol-29:
     bmc:
       mac: 00:16:36:c5:93:27
       ip: 172.17.129.29
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -50,9 +50,9 @@ sol-29:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 0650QBT127
+    serial: 0650QBT127
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
index f580d9446b1822e0d85a1dbb3774b58f1bd0b998..c4a487746abeb42326f843ed2aaa85949fa4db0c 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
@@ -8,14 +8,14 @@ sol-3:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ sol-3:
       mac: 00:16:36:91:f6:f4
       ip: 172.17.129.3
   chassis:
-    serial_number: 0650QBT10B
+    serial: 0650QBT10B
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml
index fed97aac11842d7d206b773ee5f43c937c144fce..1a856384c18d8f87b87d41b7d139b744bcf12d38 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml
@@ -4,7 +4,7 @@ sol-30:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -42,7 +42,7 @@ sol-30:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -50,9 +50,9 @@ sol-30:
       rev: A9CA
       vendor: Hitachi
   chassis:
-    serial_number: 0650QBT136
+    serial: 0650QBT136
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml
index 95c186fa2fc4d84c28f3cf86c39a312d824b51a7..e4a2604c8ab3d515768c09bfb1e381d9cedac79c 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml
@@ -4,7 +4,7 @@ sol-31:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -38,7 +38,7 @@ sol-31:
     bmc:
       mac: 00:16:36:ca:0a:7e
       ip: 172.17.129.31
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -52,9 +52,9 @@ sol-31:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT10D
+    serial: 0650QBT10D
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml
index 583c4a682b7b3e96a53a9eced12abc8c31bb5b0e..29add49c8d97810c05170130ff4318f5473a4b2a 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml
@@ -4,7 +4,7 @@ sol-32:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -38,7 +38,7 @@ sol-32:
     bmc:
       mac: 00:16:36:c5:93:08
       ip: 172.17.129.32
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -52,9 +52,9 @@ sol-32:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT122
+    serial: 0650QBT122
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml
index 1ab12b5d0de7e34179d7dad8448b76a255e75675..5351934405cfd95de02714adc63f1e8fa5df0227 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml
@@ -4,14 +4,14 @@ sol-33:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -50,9 +50,9 @@ sol-33:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 0650QBT125
+    serial: 0650QBT125
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml
index 65d73d03ba8eb13c4b0581b3c225a84a1de727ca..975fb327a91ca64ed3047ad57438bf2646ed944b 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml
@@ -8,7 +8,7 @@ sol-34:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -42,7 +42,7 @@ sol-34:
     bmc:
       mac: 00:16:36:c5:93:9f
       ip: 172.17.129.34
-  block_devices:
+  storage_devices:
     sda:
       model: SEAGATE ST32500N
       device: sda
@@ -50,9 +50,9 @@ sol-34:
       rev: 3.0
       vendor: Seagate
   chassis:
-    serial_number: 0650QBT114
+    serial: 0650QBT114
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml
index 527e7538eb47bf0e616f68a82bc16dc917e39a8e..f89c0666aa790289c55a2cec6237fb75d087a710 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml
@@ -4,14 +4,14 @@ sol-35:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -50,9 +50,9 @@ sol-35:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 0650QBT112
+    serial: 0650QBT112
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
index 08b36716e43c9e6278f6008af4e17988d98515f3..b0ca95ef22366a6f08ec62ff4d5cfb78365bb92b 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
@@ -8,14 +8,14 @@ sol-36:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -50,9 +50,9 @@ sol-36:
       mac: 00:16:36:91:f6:f7
       ip: 172.17.129.36
   chassis:
-    serial_number: 0650QBT10B
+    serial: 0650QBT10B
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml
index b8a05cd58cff8d44e707ea9ddf2f1bd7b5ad65cf..545c01567122febaa2afd847bf2a1857182b10c2 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml
@@ -4,7 +4,7 @@ sol-37:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -15,7 +15,7 @@ sol-37:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -50,9 +50,9 @@ sol-37:
       mac: 00:16:36:c5:93:0c
       ip: 172.17.129.37
   chassis:
-    serial_number: 0650QBT120
+    serial: 0650QBT120
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml
index e21b3871c9c8dc8ef7b480a115c46825abe9f688..edb5faaec1500b14a62b5f69cdfabcbc6dc6fbaa 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml
@@ -4,7 +4,7 @@ sol-38:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -42,7 +42,7 @@ sol-38:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -52,9 +52,9 @@ sol-38:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT123
+    serial: 0650QBT123
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml
index def808a987a8e8c02f134da89cc5b56fc69d35b3..69c6badef0bbd4f498716ed400f7618be57a027a 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml
@@ -4,7 +4,7 @@ sol-39:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -15,7 +15,7 @@ sol-39:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -52,9 +52,9 @@ sol-39:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT10C
+    serial: 0650QBT10C
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml
index ca96979ca14aa21ba48b5c0b83700522d7374f7a..87954bbf3d980ea237543e0312aa45f30248e03f 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml
@@ -4,7 +4,7 @@ sol-4:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -15,7 +15,7 @@ sol-4:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ sol-4:
       mac: 00:16:36:c5:93:41
       ip: 172.17.129.4
   chassis:
-    serial_number: 0650QBT12C
+    serial: 0650QBT12C
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml
index f9fa128a9f740c1f11e4af46e090931dc6e57f5e..ac0cded69ca780ffb889d7d00145d05acba35f55 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml
@@ -4,14 +4,14 @@ sol-40:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -52,9 +52,9 @@ sol-40:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT11D
+    serial: 0650QBT11D
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml
index 76746af0087d5f6dafa677cb16b34cf2793fc2e2..dd03cf169c3b299c1eb340c271b9f1e16d161e84 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml
@@ -4,7 +4,7 @@ sol-41:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -42,7 +42,7 @@ sol-41:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -50,9 +50,9 @@ sol-41:
       rev: A9CA
       vendor: Hitachi
   chassis:
-    serial_number: 0650QBT12D
+    serial: 0650QBT12D
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
index b225656609a0ec7aba2e1b6012142d1e9fb1cc8e..dfeb4fed8772122352ca371aae0fd4544ca7faf2 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
@@ -8,14 +8,14 @@ sol-42:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -50,9 +50,9 @@ sol-42:
       mac: 00:16:36:c5:93:79
       ip: 172.17.129.42
   chassis:
-    serial_number: 0650QBT10B
+    serial: 0650QBT10B
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml
index b8b99a9735e4023617119f301079a82ef1d8a479..398b6a7211372faf020c5f41d5f560d1c150890c 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml
@@ -4,14 +4,14 @@ sol-43:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -52,9 +52,9 @@ sol-43:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT12F
+    serial: 0650QBT12F
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml
index 594f5bb8d9c7909680442307c8dcb122c7404568..39d8b29f13a13aeb32dee5e42089c71875bee7ec 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml
@@ -8,14 +8,14 @@ sol-44:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -50,9 +50,9 @@ sol-44:
       mac: 00:16:36:c5:93:33
       ip: 172.17.129.44
   chassis:
-    serial_number: 0650QBT10B
+    serial: 0650QBT10B
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml
index 467a626831ac69af20c101d7c1e87103c7b94809..218e97093dc70458c74bac66c8e0b669407ff62f 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml
@@ -4,14 +4,14 @@ sol-45:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -50,9 +50,9 @@ sol-45:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 0650QBT135
+    serial: 0650QBT135
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml
index aa9e5265b3ae97993ad371787ba09201d4698d49..6ea6b5aa995cddc6c95a2872f7bee3e34ce966b6 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml
@@ -4,7 +4,7 @@ sol-46:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -42,7 +42,7 @@ sol-46:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -50,9 +50,9 @@ sol-46:
       rev: A9CA
       vendor: Hitachi
   chassis:
-    serial_number: 0650QBT131
+    serial: 0650QBT131
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
index 31820737a1a524434802301629d6a0ce4c4b21e9..b714bcabe8d441633aad2d52addd1819643f5488 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
@@ -8,14 +8,14 @@ sol-47:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -52,9 +52,9 @@ sol-47:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: xxxxxxxxxx
+    serial: xxxxxxxxxx
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml
index cc571ab39fc222ab5cd3e46c14f7aa0dac38ef70..81a37218b1deb103b08b3ba152153444962d5370 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml
@@ -8,14 +8,14 @@ sol-48:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -50,9 +50,9 @@ sol-48:
       mac: 00:16:36:91:f6:f5
       ip: 172.17.129.48
   chassis:
-    serial_number: 0650QBT133
+    serial: 0650QBT133
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
index b63ac031128135023539a699bda322a3b7712539..0115c889dff850c04e1a76a12a159cfb7351d345 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
@@ -4,14 +4,14 @@ sol-49:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -52,9 +52,9 @@ sol-49:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT110
+    serial: 0650QBT110
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml
index 1c89b54c973613faab9c1938571456ff53e6a583..068afa896d5163940ebc8e2552eca34eab60055e 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml
@@ -8,7 +8,7 @@ sol-5:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ sol-5:
     bmc:
       mac: 00:16:36:c5:93:2a
       ip: 172.17.129.5
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -39,9 +39,9 @@ sol-5:
       rev: A9CA
       vendor: Hitachi
   chassis:
-    serial_number: 0650QBT107
+    serial: 0650QBT107
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml
index b618e08c9ee9a2e0a432a20fbf7b26a12b81e5db..292268ddd37ea886966fc9a8e4f740fac2e0bd29 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml
@@ -4,14 +4,14 @@ sol-50:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     myri0:
       mounted: true
       rate: 10000000000
@@ -52,9 +52,9 @@ sol-50:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: xxxxxxxxxx
+    serial: xxxxxxxxxx
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml
index 556bc999504df75cc999a0738051d5a9641f7502..76a59ecdfaf4a8420fe10ad0b876b414ca1afe1f 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml
@@ -8,14 +8,14 @@ sol-6:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
       size: 250056000000
       rev: A9CA
       vendor: Hitachi
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ sol-6:
       mac: 00:16:36:c5:92:e3
       ip: 172.17.129.6
   chassis:
-    serial_number: 0650QBT130
+    serial: 0650QBT130
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml
index 84358a6981c14b413d5e536497eba66d5d647a78..752070621e541dfcc729576ddf087e7082a9e8de 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml
@@ -4,7 +4,7 @@ sol-7:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -27,7 +27,7 @@ sol-7:
     bmc:
       mac: 00:16:36:c5:93:7c
       ip: 172.17.129.7
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -39,9 +39,9 @@ sol-7:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 0650QBT109
+    serial: 0650QBT109
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   supported_job_types:
     virtual: amd-v
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml
index 3e3c5d906db80a98e71052771052f57b72fa98f4..456c04f60bcb00648fdb77d0024a5ac8c875fa3a 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml
@@ -4,7 +4,7 @@ sol-8:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ sol-8:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -41,9 +41,9 @@ sol-8:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT115
+    serial: 0650QBT115
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   processor:
     model: AMD Opteron
     cache_l1d: 65536
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml
index a1a6b7bda997c7a95c6a26a93b8ae7770e8e3a87..4efd7e33caed49a2c766ed8b11c4744cc8c859ee 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml
@@ -4,7 +4,7 @@ sol-9:
     version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -27,7 +27,7 @@ sol-9:
     bmc:
       mac: 00:16:36:c5:93:07
       ip: 172.17.129.9
-  block_devices:
+  storage_devices:
     sda:
       model: HITACHI HDS7225S
       device: sda
@@ -41,9 +41,9 @@ sol-9:
   supported_job_types:
     virtual: amd-v
   chassis:
-    serial_number: 0650QBT128
+    serial: 0650QBT128
     manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
+    name: Sun Fire X2200 M2
   main_memory:
     ram_size: 4293918720
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/sol/sol.yaml b/input/grid5000/sites/sophia/clusters/sol/sol.yaml
index 5dca789ef3eedd25bf0c4e8b625d1fa52b722aea..81e7c48f3938b236daeec11b88975df0468578a3 100644
--- a/input/grid5000/sites/sophia/clusters/sol/sol.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/sol.yaml
@@ -19,12 +19,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: sata_nv
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
@@ -61,11 +61,11 @@ nodes:
       virtual_size: null
     operating_system:
       release: Squeeze
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: sata_nv
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/sophia/clusters/sol/sol_manual.yaml b/input/grid5000/sites/sophia/clusters/sol/sol_manual.yaml
index 1bb1b1b3ea42c7c8c2a492a46d232adfcd54cbcf..6eeebbca7bdbc803b6edbe05148d6fe89efc26b5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/sol_manual.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/sol_manual.yaml
@@ -1,252 +1,252 @@
 ---
 nodes:
   sol-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/1
   sol-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/3
   sol-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/5
   sol-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/7
   sol-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/9
   sol-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/11
   sol-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/13
   sol-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/15
   sol-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/17
   sol-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/19
   sol-11:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/21
   sol-12:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/23
   sol-13:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/1
   sol-14:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/3
   sol-15:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/5
   sol-16:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/7
   sol-17:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/9
   sol-18:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/11
   sol-19:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/13
   sol-20:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/15
   sol-21:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/17
   sol-22:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/19
   sol-23:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/21
   sol-24:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/23
   sol-25:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/2
   sol-26:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/4
   sol-27:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/6
   sol-28:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/8
   sol-29:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/10
   sol-30:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/12
   sol-31:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/14
   sol-32:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/16
   sol-33:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/18
   sol-34:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/20
   sol-35:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/22
   sol-36:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 3/24
   sol-37:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/2
   sol-38:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/4
   sol-39:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/6
   sol-40:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/8
   sol-41:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/10
   sol-42:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/12
   sol-43:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/14
   sol-44:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/16
   sol-45:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/18
   sol-46:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/20
   sol-47:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/22
   sol-48:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 4/24
   sol-49:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 9/1
   sol-50:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 9/3
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
index 020fcfa38892fb6626e91302cbf7fd42805690c1..9c1c36ac5bf6f81203632b836fb0adceef971386 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
@@ -4,7 +4,7 @@ suno-1:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -27,7 +27,7 @@ suno-1:
     bmc:
       mac: 00:26:b9:58:e6:84
       ip: 172.17.130.1
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -41,9 +41,9 @@ suno-1:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: ''
+    serial: ''
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
index 7f5a8e4dea045513cc413700ecea154ec5fe17f4..e4b870d44d22296dc95cd75cb80b5fc91ce4ee74 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
@@ -4,7 +4,7 @@ suno-10:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -15,7 +15,7 @@ suno-10:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ suno-10:
       mac: 00:26:b9:3f:49:67
       ip: 172.17.130.10
   chassis:
-    serial_number: G4JPH4J
+    serial: G4JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
index dbabba6ab48eac2134eb29c21036836eb3d085c5..99d494669b7fe4834be25f2dbe391cba4fa1d031 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
@@ -8,14 +8,14 @@ suno-11:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ suno-11:
       mac: 00:26:b9:3f:47:0e
       ip: 172.17.130.11
   chassis:
-    serial_number: H3JPH4J
+    serial: H3JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
index 3d7659934e0a38d7713c48225a6e50d512436cde..b53219f78ef0d05fb30819d3baaf5092e8497608 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
@@ -4,14 +4,14 @@ suno-12:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ suno-12:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 45JPH4J
+    serial: 45JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
index 3fe3f5f45bacfcca7809f1c85bd8ba5714e54907..ef6fac5bda11de8aa25556151d80e55b72865f23 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
@@ -4,14 +4,14 @@ suno-13:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ suno-13:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 15JPH4J
+    serial: 15JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
index ed960d74f20de80b123c7296e09a76303c0d9ea3..d8d09667536d70a815ff257de3556b8325253395 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
@@ -4,14 +4,14 @@ suno-14:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-14:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 95JPH4J
+    serial: 95JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
index bce2f4ec5d077285a996d9e016d677dcefaa1001..999406bb86b6911a12057973e84f326f0e3f81d4 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
@@ -8,14 +8,14 @@ suno-15:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ suno-15:
       mac: 00:26:b9:3f:44:8b
       ip: 172.17.130.15
   chassis:
-    serial_number: F3JPH4J
+    serial: F3JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
index dd8d58133e9b2c0d03ff665e202bf0aad0b13d9a..a262f17e72ec987a00897d08abfbc170d7ba914a 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
@@ -8,14 +8,14 @@ suno-16:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ suno-16:
       mac: 00:26:b9:3f:41:0e
       ip: 172.17.130.16
   chassis:
-    serial_number: 33JPH4J
+    serial: 33JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
index b8f996aa9b9384d144c26c84f60ebae2d99fffb0..20229b953aa8d4bb6c21e3ebb321e64b28af353d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
@@ -4,7 +4,7 @@ suno-17:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -15,7 +15,7 @@ suno-17:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-17:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 54JPH4J
+    serial: 54JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
index 48223e1fd9822d1e00974b0dca244b11a6712c23..0289067db0dea9fedf3868d87a4cc8702b508b30 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
@@ -4,7 +4,7 @@ suno-18:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ suno-18:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -39,9 +39,9 @@ suno-18:
       rev: 1.22
       vendor: Dell
   chassis:
-    serial_number: 13JPH4J
+    serial: 13JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
index cdfca967eb5310b976ae89eeeaac20a6596eea56..b0561991f7c23305e669d4b28a890cf594ee299a 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
@@ -8,7 +8,7 @@ suno-19:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ suno-19:
     bmc:
       mac: 00:26:b9:3f:40:69
       ip: 172.17.130.19
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -41,9 +41,9 @@ suno-19:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 74JPH4J
+    serial: 74JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
index 94077cdd0b9beeccf75e2b3a8da3b538d6dc0414..6691e5323af476a62cb283c718d9f1ad937baca4 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
@@ -8,14 +8,14 @@ suno-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-2:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: B5JPH4J
+    serial: B5JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
index efb5fc0f2709ed6e59274ab171173a4a0cf561bd..bbe6f45a3bd3a22d590daf756f45c7f512f56268 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
@@ -8,14 +8,14 @@ suno-20:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-20:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 43JPH4J
+    serial: 43JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
index 69b51590d934541be69accd601df9f3b02107567..ec704b66214070103d85cd0b502a371436f0c539 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
@@ -8,14 +8,14 @@ suno-21:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-21:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 85JPH4J
+    serial: 85JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
index 4ef20d6ba2810b9c404d3ed39d340fe0508db1af..105d2dcb2270e15509d498f07550a33b21fd5a52 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
@@ -4,14 +4,14 @@ suno-22:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-22:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 55JPH4J
+    serial: 55JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
index 37e542c654e80b2abde4bcc3b7b0d3bebb1ff3d8..d7cc933888c1d74e2c8aab32c03df211a4b7fb52 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
@@ -8,14 +8,14 @@ suno-23:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-23:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: C5JPH4J
+    serial: C5JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
index f81bb38bc4a99ec554421a6c27e09a9710f505aa..82344ebcc5345a5fdd104bd2acd5dd565470fae8 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
@@ -4,7 +4,7 @@ suno-24:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -27,7 +27,7 @@ suno-24:
     bmc:
       mac: 00:26:b9:3f:47:b6
       ip: 172.17.130.24
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -39,9 +39,9 @@ suno-24:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: 24JPH4J
+    serial: 24JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
index b7bf960e214c8a5a155caab4e0126bc2d93d1b92..0d0ac6c4874b4d7afe2546706760cfe56aef5d10 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
@@ -4,7 +4,7 @@ suno-25:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ suno-25:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -41,9 +41,9 @@ suno-25:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 44JPH4J
+    serial: 44JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
index 3da549ffee06ac5da20fe53017e7da2a0f20aaba..885b2d939e1e0dd18a86ba3616acc44cef60c8d5 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
@@ -4,7 +4,7 @@ suno-26:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -15,7 +15,7 @@ suno-26:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ suno-26:
       mac: 00:26:b9:3f:4b:4f
       ip: 172.17.130.26
   chassis:
-    serial_number: 75JPH4J
+    serial: 75JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
index 34e759555507f0dea253f6cfab765a28b0cc0be4..3e6f5f2af9c6e30ea1708e43877c2df2561fc0ce 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
@@ -8,14 +8,14 @@ suno-27:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-27:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 35JPH4J
+    serial: 35JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
index 8038ce45816398d0ef1c48b24888e3b67286e093..5707e38cb88e0a3f357d9a861712db2a39be4b01 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
@@ -4,14 +4,14 @@ suno-28:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 299439751168
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-28:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: F4JPH4J
+    serial: F4JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
index be0830747f03298a6862de97de4f5e3bf74b051e..d6364a33853124888b077ab5b529f9251a5f305a 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
@@ -4,7 +4,7 @@ suno-29:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ suno-29:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -41,9 +41,9 @@ suno-29:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: D3JPH4J
+    serial: D3JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
index 0af491e63b270809166cd3c0d4a1080f0d6500d5..5068986996753c6e6b64536f4e25103973ffbb15 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
@@ -8,14 +8,14 @@ suno-3:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-3:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 14JPH4J
+    serial: 14JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
index 55f000bb835944c2f4f7eec7856733fb51a0b50f..b72ae5c14bac04f98383d174fbc0dd6ca1310ad5 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
@@ -4,14 +4,14 @@ suno-30:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-30:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 63JPH4J
+    serial: 63JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
index 2e6fe3e335c8d33508aaed68f34a1c628687185e..100f2424b5e2540bb8c33b7513dc7b409c1a60c3 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
@@ -4,7 +4,7 @@ suno-31:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ suno-31:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -41,9 +41,9 @@ suno-31:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: C4JPH4J
+    serial: C4JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
index 105b92318284aeb644b4d017a0937e60fce8f2d7..e81ff6ae6a41345a3f6483d626e449aad263c074 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
@@ -8,14 +8,14 @@ suno-32:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-32:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: F5JPH4J
+    serial: F5JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
index aab854df7014d923c63ce6f8fd7c54756571d5e2..b0ba693af102735415e9064f56e37616d3564908 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
@@ -4,7 +4,7 @@ suno-33:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -15,7 +15,7 @@ suno-33:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ suno-33:
       mac: 00:26:b9:3f:3f:69
       ip: 172.17.130.33
   chassis:
-    serial_number: 84JPH4J
+    serial: 84JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
index 6f037e105bfb9581d134713bb003abf1b676a636..142220599999e01d754c0d6e72e2642629ae8fcb 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
@@ -4,14 +4,14 @@ suno-34:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-34:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 53JPH4J
+    serial: 53JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
index e36b754ba0fc7e60eb316bccc44900b9cb0f5c50..1adb61c0e5f6be026578a33b12b07794a012a80d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
@@ -4,7 +4,7 @@ suno-35:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -27,7 +27,7 @@ suno-35:
     bmc:
       mac: 00:26:b9:3f:3f:1e
       ip: 172.17.130.35
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -39,9 +39,9 @@ suno-35:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: B4JPH4J
+    serial: B4JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
index 886cb83369f76db954bc3589711e891918259e43..2696ae74335858da0de9456f12cf21406eaebc0d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
@@ -8,14 +8,14 @@ suno-36:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-36:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 94JPH4J
+    serial: 94JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
index ea8be6d9d4d2c4943e263b885760b1a8205c19e6..f3dab6f3706fd3d204f376d5b954090ab521a687 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
@@ -8,14 +8,14 @@ suno-37:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-37:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: H4JPH4J
+    serial: H4JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
index c9c776c01efc63db9c7c0d1ecb7714b46ac225bb..8ba71fd4c3384054acd38e9ae1bb2ab2c495957d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
@@ -8,14 +8,14 @@ suno-38:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-38:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 34JPH4J
+    serial: 34JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
index 0995af8d53fb20d7e6325a76ee6c3edbca43a091..6f301117d6f677ed28e3b683e92e87543001a929 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
@@ -4,7 +4,7 @@ suno-39:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ suno-39:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -39,9 +39,9 @@ suno-39:
       rev: 1.22
       vendor: Dell
   chassis:
-    serial_number: J4JPH4J
+    serial: J4JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
index 07ae2ea07f61e59cc189c4d71828e25b60a3106e..177b368d0f3c358bc8fdb8405d1aa4a9bcd7dd7f 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
@@ -4,14 +4,14 @@ suno-4:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ suno-4:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: D5JPH4J
+    serial: D5JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
index 9a6aeb56d1e255f6d0e503f24362e5fc6b6bd010..ba73802f8754e53cf7836282a22cba029cd54933 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
@@ -8,7 +8,7 @@ suno-40:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ suno-40:
     bmc:
       mac: 00:26:b9:3f:49:46
       ip: 172.17.130.40
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -39,9 +39,9 @@ suno-40:
       rev: 1.22
       vendor: Dell
   chassis:
-    serial_number: 65JPH4J
+    serial: 65JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
index 1161c5a15a34b55af1acff021bbf3ff59f132eab..dc4210bdca31ba6356d6b2e0b20503aa34044ed5 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
@@ -4,7 +4,7 @@ suno-41:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ suno-41:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -39,9 +39,9 @@ suno-41:
       rev: 1.22
       vendor: Dell
   chassis:
-    serial_number: J3JPH4J
+    serial: J3JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
index e02e5af8bb492650e4c062654c49613774116a34..c5325896c002e3065fccbd293075a17add190638 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
@@ -8,14 +8,14 @@ suno-42:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -39,9 +39,9 @@ suno-42:
       mac: 00:26:b9:3f:41:23
       ip: 172.17.130.42
   chassis:
-    serial_number: 93JPH4J
+    serial: 93JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
index 6edc568d3b2394134c77cb578610df45e6964d7d..885e03badd0b0771ff886036893bc5f2724b8ca9 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
@@ -4,7 +4,7 @@ suno-43:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -31,7 +31,7 @@ suno-43:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -39,9 +39,9 @@ suno-43:
       rev: 1.22
       vendor: Dell
   chassis:
-    serial_number: 23JPH4J
+    serial: 23JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
index dd0b941286a4622dcd0c161876c919ebd57d8596..2c3bc4e7a47f8d90759d546bf9a2f5857c7e22f3 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
@@ -4,7 +4,7 @@ suno-44:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -27,7 +27,7 @@ suno-44:
     bmc:
       mac: 00:26:b9:3f:45:30
       ip: 172.17.130.44
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -39,9 +39,9 @@ suno-44:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: B3JPH4J
+    serial: B3JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
index 2a66e75f742b1ceb4c20101e8a93e366d79e898b..c571aa75790d21569ad15623af70f510d2b31131 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
@@ -8,14 +8,14 @@ suno-45:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-45:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 25JPH4J
+    serial: 25JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
index 7236be5b18a83954ed873d7400691b6f33c439a5..ef4798169a73171263fbdb8c210252c8b15c82ab 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
@@ -4,14 +4,14 @@ suno-5:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-5:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 73JPH4J
+    serial: 73JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
index bff88d5958f65d2191b9840e4d11a53b99bd02f1..0cc94fac1a7a53988562e3b0312536dbef6f150f 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
@@ -4,7 +4,7 @@ suno-6:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -27,7 +27,7 @@ suno-6:
     bmc:
       mac: 00:26:b9:3f:40:b1
       ip: 172.17.130.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
@@ -41,9 +41,9 @@ suno-6:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: G3JPH4J
+    serial: G3JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
index 1fde45954c07d373330d236ab83aea5a2ded0ee1..7f2dda39f06d7920af2c100cdcd67b9a292fa13e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
@@ -8,14 +8,14 @@ suno-7:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-7:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 64JPH4J
+    serial: 64JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
index 71bc4fdf2f8ed9299572aea5a1a49063a829b7a7..c2de4faf04e8f83f1125703df4326da02f662f9d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
@@ -4,14 +4,14 @@ suno-8:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-8:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: C3JPH4J
+    serial: C3JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
index 43ee424ae9c817c5db297261844fcdcf2603e62b..75f73fb2f89add39befd026b7b0ebbb1feb762bb 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
@@ -4,14 +4,14 @@ suno-9:
     version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: PERC 6/i Adapter
       device: sda
       size: 598879502336
       rev: 1.22
       vendor: Dell
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: true
       rate: 1000000000
@@ -41,9 +41,9 @@ suno-9:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 83JPH4J
+    serial: 83JPH4J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+    name: PowerEdge R410
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/sophia/clusters/suno/suno.yaml b/input/grid5000/sites/sophia/clusters/suno/suno.yaml
index f2e2edddd853ca4a1ff8bc8423fb0a4a8e0e9fc5..a8319c027f2423b2bbf9ed44fa3359ae5ee60c10 100644
--- a/input/grid5000/sites/sophia/clusters/suno/suno.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/suno.yaml
@@ -19,13 +19,13 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: megaraid_sas
         raid: 0
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0
diff --git a/input/grid5000/sites/sophia/clusters/suno/suno_manual.yaml b/input/grid5000/sites/sophia/clusters/suno/suno_manual.yaml
index 07266e518d729adc021384bd3c0874fa5bfa9195..602dfa06ff89151c384d250bffa56cf2406d0a0e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/suno_manual.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/suno_manual.yaml
@@ -1,227 +1,227 @@
 ---
 nodes:
   suno-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/10
   suno-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/11
   suno-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/1
   suno-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/5
   suno-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/4
   suno-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/7
   suno-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/8
   suno-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/12
   suno-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/9
   suno-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/3
   suno-11:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/2
   suno-12:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/6
   suno-13:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/13
   suno-14:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/19
   suno-15:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/17
   suno-16:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/21
   suno-17:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 5/15
   suno-18:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/1
   suno-19:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/2
   suno-20:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/3
   suno-21:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/4
   suno-22:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/5
   suno-23:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/6
   suno-24:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/7
   suno-25:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/8
   suno-26:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/9
   suno-27:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/10
   suno-28:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/11
   suno-29:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/12
   suno-30:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/13
   suno-31:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/14
   suno-32:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/15
   suno-33:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/16
   suno-34:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/17
   suno-35:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 6/18
   suno-36:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 7/1
   suno-37:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 7/2
   suno-38:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 7/3
   suno-39:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 7/4
   suno-40:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 7/5
   suno-41:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 7/6
   suno-42:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 7/7
   suno-43:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 7/8
   suno-44:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 7/9
   suno-45:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-sophia
         switch_port: 7/10