diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
index 2f945240f13b22593f6bfa367ac155b9ee3e885f..f88b96cdb41311b33ea37dd3dbd8c0c81fbe3bf1 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL, altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
index 3867d3b7cdaae72d90aaf068e170f36a6b8a2f4f..171cb9e6a68e9a028f2b02081e674be9ae67771f 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
index 6573d31802fc4cfd732b92d69ba4a3762ec5d30e..33c526ad653e0733a1ec4bee12794ac691a65c07 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
index 4c006d6875b57880c952f2c1656289c602b79698..467864fb6aae90305ae2cb6d9fd3afdf2883a84f 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
index e6dcd2c58823234180d6892b898cc6efe84f345e..5bcb2332f12e1e28e37735643039fd39652809b9 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL, altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
index 938fd14ca10b0cee192256711024957a68902928..074f66c99dd06bcf2baad60141142674103c52e8 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL, altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
index cfb5c7c9511bf66e596d9af786de7f9eaea6ea83..d9a78a65d7dac4ad878ce14809b8e258bbd05bce 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
index 9d38381406b67c826fa26e997aa4262f290f9f28..88425d767d2d5b45e1c283c8ab707771f34a2f4a 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
index 4dc949d3211c86f6698f39bf5510d00099eb25f2..4f38988dffce49d6ad32302b1b3e71e373cc13d7 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
index 796936d8b0e26eea05d27903fbd7eaacaee975c4..78c9e8f0cf576eb7a3978a08c904999e4f50e10a 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
index 92708fef08e3f037b644a34920dc09102e44fcf6..030aa9faa8de95b9886aa9ba24b19bd341fdd175 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
index cecbf510f1c4c310313a53c82396f8727bf5e879..3c07d77c290e1a254e943f43507e8cf1d2f70a27 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
@@ -193,7 +193,7 @@
     "clock_speed": 4000000000,
     "ht_capable": true,
     "instruction_set": "ppc64le",
-    "microarchitecture": "POWER8NVL",
+    "microarchitecture": "POWER8",
     "microcode": "unknown",
     "model": "POWER8NVL",
     "other_description": "POWER8NVL (raw), altivec supported",
diff --git a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
index 3f1e6104312385138bf37119ee1414d64576b167..ed515b47923d6d3e5c1a2cfd1c89435f5fb9e11b 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
@@ -9,7 +9,7 @@ queues:
 nodes:
   drac-[1-12]:
     processor:
-      microarchitecture: POWER8NVL
+      microarchitecture: POWER8
       clock_speed: 4000000000
     supported_job_types:
       deploy: true
diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index 228fa419f22a2d2a7fdb7b4ebea917ec7fb1a74a..3a39f6956d56da11425bb18266d06b98c2d7fbd9 100644
--- a/lib/refrepo/gen/wiki/generators/hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/hardware.rb
@@ -335,7 +335,7 @@ class G5KHardwareGenerator < WikiGenerator
       'Westmere' => '2011',
       'Sandy Bridge' => '2012',
       'Haswell' => '2013',
-      'POWER8NVL' => '2014',
+      'POWER8' => '2014',
       'Broadwell' => '2015',
       'Skylake' => '2016',
       'Zen' => '2017',