diff --git a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
index f627f0e7e25882838ffe20845af8256820f78acd..861a073deba76394e0d4d6b187b8f484588e35c2 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/grenoble/clusters/troll/troll.json b/data/grid5000/sites/grenoble/clusters/troll/troll.json
index 3b4663e34e5f82d6475e753701d664d5de6148c2..301d98c35d51c75908c7bb77ef4dc2cb5e6de8c9 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/troll.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/troll.json
@@ -60,7 +60,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
index bd9f36a78d557a83767280d0187661b556c4ed3e..9052e1a685724ab2e05f507fcee9d2151a886700 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
@@ -87,7 +87,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
index 3ee8676db99f451919f9a0aceb6e88ec066ef2b2..26db16dde3ad815d56e5e969e8f5b917b5c94564 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
index 00824259e6adb0dd58c9866197630d085aecf80a..91a4724f6802177038b9699e5667a61fe1c9d96c 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
index b3a1e8552e7beab5e1c9451fe7e8a4b2b44140ba..cfa013112373e86665be3b829ddc407b6a2221c2 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
index c9eb5401006957baa728344979d94e9e20c894e2..59258789baf677dcdba7f8599e52ab5ecc57bc3c 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
index 9d90b49441f527c4bb41717e322e4543d6c25328..b246cc23c3cc23bffa5eb71e586f1ae139573621 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
@@ -24,7 +24,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index 3071a98285b27519b1c0423903df59e266d940cb..1c545b9b5b58cdec755ec222228fe7788674bdef 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -33,7 +33,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index ad91fdebf4375da4dbab1d1a7ea30cefa093d890..c86510c9f0fa2f4fd466460fac083dfa709e5d42 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -60,7 +60,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index f4d79303ec557d74857b20ffd00086efc886136b..3bafe1a393753e496a0221c0db3558873bbce5ba 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -60,7 +60,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
index dee727ae2e92bcdf45a26ef0da98d490979244d2..2f47b542677129c17079c9fed19ac9b9284c23c3 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/graoully/graoully.json b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
index 27ce73840db00a3109e29a43dc88ad465ebe1d0c..7cd5ff558a9d9d5c9c953fb49b27a5626be38685 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/graoully.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
@@ -59,7 +59,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/graphique/graphique.json b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
index 103e46cc25344dc1451f04c7e26a0587aba1a42f..743d8097e84589bce3eb6e5e4574f05a8f4d1477 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/graphique.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/graphite/graphite.json b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
index 1ff2c713677ed691b8e4d068aac0376126604940..786801e39791416ebb7e457ddbf0fd03d1326bb0 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/graphite.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grele/grele.json b/data/grid5000/sites/nancy/clusters/grele/grele.json
index 7346acd55858c4a4e8ae7a9fe4a65cad22ac58d6..54ce58edfa4d1a61980a4b85336c8c60f4c9cb49 100644
--- a/data/grid5000/sites/nancy/clusters/grele/grele.json
+++ b/data/grid5000/sites/nancy/clusters/grele/grele.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grimani/grimani.json b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
index 34dbce12408391dcd41f75d205da96c20e711f70..d9d517cce704a9441327af4d4080e7419d67b56e 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/grimani.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
index 6ba365f0e21086f55ea3aa27be080b6d937e97cf..87ddfb2d13b80ab2ed57a3fae0cca426c488aa0b 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
@@ -59,7 +59,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/grisou.json b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
index f42f103eb7999dcd8ab2c7c04e0c191f95d0000e..16df87f58979990999867676af8fa94da9018992 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/grisou.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
@@ -59,7 +59,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/gros.json b/data/grid5000/sites/nancy/clusters/gros/gros.json
index 064f4e27884e11e27af7c8b63942156166da1a2f..d949f9def2f68edc119641d4a9a7b9246b00e29c 100644
--- a/data/grid5000/sites/nancy/clusters/gros/gros.json
+++ b/data/grid5000/sites/nancy/clusters/gros/gros.json
@@ -60,7 +60,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grue/grue.json b/data/grid5000/sites/nancy/clusters/grue/grue.json
index 1ece0a49e482def23607194b10737ae169d84bf3..ecd6444d376722f7c93ad40b6b840454974469e9 100644
--- a/data/grid5000/sites/nancy/clusters/grue/grue.json
+++ b/data/grid5000/sites/nancy/clusters/grue/grue.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
index e648cffb1b65fe2a23876d5609eae5ac60fcb46b..03fc1427c52e082f4229b716b1e310fbd4aefb6e 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
index 2c3b6b6f9dc638f84d18cab6f17f1b7858f9a277..56a39fc08ce0ca4eaf564dc9fa37c446d0007d10 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
index 04aa91aeee0c0ed3117bb1c326c70e8eacf1ca79..b8bea6355a648f8c543d3c887db807ecdfabf50f 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
@@ -59,7 +59,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/rennes/clusters/paravance/paravance.json b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
index 83def1b8f0181183221bb2d58c2d076ede30b1d2..ffcd58836a320e3a2db54a73de784323dab1e2fb 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/paravance.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
@@ -59,7 +59,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
index 924530cf070c22f504cc94d5f5fa89c1c0513254..3b5100f4de30b562de9b722b295ed9b76cf5e117 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
index 9179286031fef5b1f70c1bd243903965ef9a9124..d84ebe7719ee7e73f38c6e9e00f63fabe4472303 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
@@ -54,7 +54,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
index 1f3c2779d4f44b57c1f92bb2e7c9fd691e795cd1..eb78c9c3e6a98988c52b2ca0289596656b1e3f22 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
@@ -73,7 +73,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
index e0eeca8b64539723f7e209dc28159069c22cfd5b..1c6de56ae2cf56045d7550247174908220e76f08 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
index fc845c942d0cc5d25da33dcbfdbe696b2a7a946e..96dbb4bfd2e746d5b196b167904b61294193a4c1 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
index b770338d7e752fca74e20203037793c74af64f7a..3e8f4a66d3cdbf8d4e5ad8eecf2bad513a579bbe 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
index d7cd1c013438428f30af120a6b900de72403bb81..2da75133b96e97b727c35654670267fdbd64c4a1 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
index 87c00a4efab97c799b25232d6d48c881ea282805..d3854fb51c94de429c6543e3968d7636267d0202 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
@@ -28,7 +28,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
index 2c376836e7002475210bfd45f8bc11118b36add9..c99752d4b8de745a14f90bce72cf0a0914d0c532 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
@@ -57,7 +57,7 @@ metrics:
# protocol: snmp
# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
index 5b28c4990e1fd789e99faf5dd23ed6f25bafcef3..4d495763bfda14b3438b1579b90e0677c47916da 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
@@ -74,7 +74,7 @@ metrics:
# protocol: snmp
# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
index c83e454fedb372ba243ef3e82bea44ab8d4c973e..10772233cd4cccccd592860f78108bcff490bcda 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
@@ -75,7 +75,7 @@ metrics:
# protocol: snmp
# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
index 933151ef6953a2281801dc69546bf8b3c904b582..4e09e8e200fcc54317b733cea090b137f6ad913b 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
index 2899d2ca52aa7262211cb3e4e0d80738b91a8426..d3fd32ca6744083d9b57df074b961d8bae19d5b2 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
@@ -53,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
index b770338d7e752fca74e20203037793c74af64f7a..3e8f4a66d3cdbf8d4e5ad8eecf2bad513a579bbe 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
index b770338d7e752fca74e20203037793c74af64f7a..3e8f4a66d3cdbf8d4e5ad8eecf2bad513a579bbe 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
index b770338d7e752fca74e20203037793c74af64f7a..3e8f4a66d3cdbf8d4e5ad8eecf2bad513a579bbe 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
index b770338d7e752fca74e20203037793c74af64f7a..3e8f4a66d3cdbf8d4e5ad8eecf2bad513a579bbe 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
index 2899d2ca52aa7262211cb3e4e0d80738b91a8426..d3fd32ca6744083d9b57df074b961d8bae19d5b2 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
@@ -53,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
index 2899d2ca52aa7262211cb3e4e0d80738b91a8426..d3fd32ca6744083d9b57df074b961d8bae19d5b2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
@@ -53,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
index 0e9b27458b59dd385ab486f00c5ab8c8dd933c96..e65dc3f70bc722c43be683274145807a27620aae 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
@@ -54,7 +54,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
index 15b96be44b97025223887bd265da632b2e7a2315..5f2ff52f8d75efa6427162f285300f516da65161 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
index 924530cf070c22f504cc94d5f5fa89c1c0513254..3b5100f4de30b562de9b722b295ed9b76cf5e117 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
index e0eeca8b64539723f7e209dc28159069c22cfd5b..1c6de56ae2cf56045d7550247174908220e76f08 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
index 2899d2ca52aa7262211cb3e4e0d80738b91a8426..d3fd32ca6744083d9b57df074b961d8bae19d5b2 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
@@ -53,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
index 2899d2ca52aa7262211cb3e4e0d80738b91a8426..d3fd32ca6744083d9b57df074b961d8bae19d5b2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
@@ -53,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000