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 d424a8ef40abfa52e0026370afa354df848c7860..e31445220cee2b8800c483c64384fb249313134b 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -143,10 +143,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 46964f95b67c25775d137b513d73743a6d937f5b..44636be77a8eac128204b710c6488b631e417feb 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 26b07cc4581be0f49d1f74e7c092a33994ffbff5..9075fd3a477232ede81297b5ebd8173572af5947 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 e15d608b06b338987f58b8379827f90e0391e952..dcf36218fb09af7534a164b6e598b1c5b911d5dd 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 ed442c14f4ff307ae664a1e4c9b49faa4a538441..6340410eff21186b3560f4fe918c6a92171e5311 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -143,10 +143,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 d25c8a5bc389996a0639cf4acdbc184a60d78dab..1f202595e9850f4be6ba9cc91589c03569793a1e 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -143,10 +143,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 f92872cec1cfb5eedbb82e6e374e54b7be9fccd3..d167d44217a0d16734c5ef1e26bbfc3ca413e4e1 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -143,10 +143,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 575ba926f2f21b7743b60f8c076e4156f53a4414..ff06bd0a15c0c5f0306a7ea3658b3bcbfc08ddb9 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 b0448d68ce19509a7afa77d898322a3d4f2d33b5..db4bf809d1020ba84d5deb05c41ecceb57258f25 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 279108055340e5bd4627ff50caba7b3080dd6eef..9827e872f168984fab35c3b9280b4b18d623f8e7 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 223a13b1827fdb3b652e06f51f89d656f1edefcd..6dab5a3f0bb7416f9d3e213ec37c36e50b9cc8c8 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 a09ea25e8f7c7bdcac2908e9d0db3e44bb47efdd..6d96ec1aa658ed30a9ebf131ee0728f7fd0637aa 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
index fe3b41b942b4df2a2ae58f82c1b8572176d05d1b..4abba4b1e12914693ab6ad23a008633df7aabbc9 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
@@ -2,7 +2,7 @@
 ---
 drac-1:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -84,10 +84,10 @@ drac-1:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
index 93034f616ae2fc9720b3d2442ad576faa23abb36..0463013d24226577673ad5168e83c9066ca163a2 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
@@ -2,7 +2,7 @@
 ---
 drac-10:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-10:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
index 4b3593d0f731732aea5586e3729b370e32798e96..c0df891da3ee99a6a4d425e535c542849cd3e0fd 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
@@ -2,7 +2,7 @@
 ---
 drac-11:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-11:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
index d8c86f38fefdbe358de9c11b1217b21a8040f756..f3a60f2adb31ed22197e11a6bcf3784673c35676 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
@@ -2,7 +2,7 @@
 ---
 drac-12:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-12:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
index e5ee72d6e0ea13a9793847a4dcdfb895ce601c90..0221fd2db6d2bcd51a936dd8bdd67d5c07f57f59 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
@@ -2,7 +2,7 @@
 ---
 drac-2:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -84,10 +84,10 @@ drac-2:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
index c1b9723bf24eb219ca35fcd96a816b8fcdf893ec..d627d914f466989d7c7b9b7dfbb3f84ef497cd64 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
@@ -2,7 +2,7 @@
 ---
 drac-3:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -84,10 +84,10 @@ drac-3:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
index 521363f1dda133e209d2988b3b159321ee404f67..531f31d3a11f7f5de60a8cfca221e62ef134e64f 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
@@ -2,7 +2,7 @@
 ---
 drac-4:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -84,10 +84,10 @@ drac-4:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
index 5f92077c78866553af7dd4f1aba79dd2a2968da6..9191101661e617d3b27f0ec3f59233578a58098d 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
@@ -2,7 +2,7 @@
 ---
 drac-5:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-5:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
index bb2d4150ff916ea069ae0bb2ff3d1a4b972b9526..5b1bf574ecf8f79109f0095ffd4658e013830e16 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
@@ -2,7 +2,7 @@
 ---
 drac-6:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-6:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
index 9081ff522d1a621735ce0e3dde8d317846a2b88b..7b5f83250915cb95b5869720e802998ff7224129 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
@@ -2,7 +2,7 @@
 ---
 drac-7:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-7:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
index f42f4863f81a6b4f6f18b268fe4ac127d6980ec1..4ceef112c86db08a54069d6c5f9cf6e940f23a9b 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
@@ -2,7 +2,7 @@
 ---
 drac-8:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-8:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
index d1c9aa15ca4d1b3a44edbd7bee8867efb0989f1d..2bbe4d0ea1cedae03517e3b4b921fcc14f55dab3 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
@@ -2,7 +2,7 @@
 ---
 drac-9:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-9:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor: