From 5c077ed71bd58b76c078403bb81de582f407233f Mon Sep 17 00:00:00 2001
From: Mel Gorman <mgorman@techsingularity.net>
Date: Mon, 27 May 2019 14:46:29 +0100
Subject: [PATCH] configs: Tidy up configuration files and names

Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
---
 README                                        |   2 +-
 bin/generate-fs-configs                       | 282 +++++++++---------
 ...global-dhp__S-startup => config-S-startup} |   4 -
 ...bound => config-adrestia-periodic-unbound} |   3 -
 ...unbound => config-adrestia-single-unbound} |   4 -
 ...dium => config-db-pgbench-timed-ro-medium} |   3 -
 ...> config-db-pgbench-timed-ro-medium-tuned} |   3 -
 ...small => config-db-pgbench-timed-ro-small} |   3 -
 ...bench-timed-ro-small-full-hugetlbfs-tuned} |   3 -
 ...nfig-db-pgbench-timed-ro-small-full-tuned} |   3 -
 ...=> config-db-pgbench-timed-ro-small-tuned} |   3 -
 ...dium => config-db-pgbench-timed-rw-medium} |   3 -
 ...> config-db-pgbench-timed-rw-medium-tuned} |   3 -
 ...small => config-db-pgbench-timed-rw-small} |   3 -
 ...=> config-db-pgbench-timed-rw-small-tuned} |   3 -
 ...-medium => config-db-sqlite-insert-medium} |   3 -
 ...rt-small => config-db-sqlite-insert-small} |   3 -
 ...config-db-sysbench-mariadb-oltp-ro-medium} |   3 -
 ... config-db-sysbench-mariadb-oltp-ro-small} |   3 -
 ...config-db-sysbench-mariadb-oltp-rw-medium} |   3 -
 ... config-db-sysbench-mariadb-oltp-rw-small} |   3 -
 ...onfig-db-sysbench-postgres-oltp-ro-medium} |   4 -
 ...config-db-sysbench-postgres-oltp-ro-small} |   4 -
 ...onfig-db-sysbench-postgres-oltp-rw-medium} |   4 -
 ...config-db-sysbench-postgres-oltp-rw-small} |   4 -
 ...onal-ltp-cve => config-functional-ltp-cve} |   0
 ...al-ltp-lite => config-functional-ltp-lite} |   0
 ...al-pistress => config-functional-pistress} |   4 -
 ...s-auto => config-functional-xfstests-auto} |   0
 configs/config-global-dhp__hpcg-serial-long   |  31 --
 configs/config-global-dhp__hpcg-serial-short  |  31 --
 ...nfig-global-dhp__io-bonnie-dir-async-fixed |  38 ---
 ...nfig-global-dhp__io-bonnie-dir-fsync-fixed |  32 --
 ...fig-global-dhp__io-bonnie-file-async-fixed |  36 ---
 ...fig-global-dhp__io-bonnie-file-fsync-fixed |  30 --
 ...config-global-dhp__io-largeread-starvation |  60 ----
 .../config-global-dhp__io-randread-starvation |  59 ----
 configs/config-global-dhp__io-sync-starvation |  59 ----
 configs/config-global__thp-performance        |  50 ----
 ...-omp-infant => config-graph500-omp-infant} |   5 -
 ...-omp-kinder => config-graph500-omp-kinder} |   5 -
 ...aph500-omp-toy => config-graph500-omp-toy} |   5 -
 ...obal-dhp__hpcc-large => config-hpcc-large} |   5 -
 ...obal-dhp__hpcc-small => config-hpcc-small} |   5 -
 ...-gcc-mpi-long => config-hpcg-gcc-mpi-long} |   5 -
 ...cc-mpi-short => config-hpcg-gcc-mpi-short} |   5 -
 ...-gcc-omp-long => config-hpcg-gcc-omp-long} |   5 -
 ...-mpi-long => config-hpcg-gcc-omp-mpi-long} |   5 -
 ...pi-short => config-hpcg-gcc-omp-mpi-short} |   5 -
 ...cc-omp-short => config-hpcg-gcc-omp-short} |   5 -
 ...hp__http-phpbench => config-http-phpbench} |   9 -
 ...obal-dhp__http-siege => config-http-siege} |   3 -
 ...-dhp__io-blogbench => config-io-blogbench} |   3 -
 ...e-dir-async => config-io-bonnie-dir-async} |   3 -
 ...e-dir-fsync => config-io-bonnie-dir-fsync} |   3 -
 ...file-async => config-io-bonnie-file-async} |   3 -
 ...file-fsync => config-io-bonnie-file-fsync} |   3 -
 ...-dbench4-async => config-io-dbench4-async} |   3 -
 ...-dbench4-fsync => config-io-dbench4-fsync} |   3 -
 ...> config-io-filebench-oltp-directio-large} |   3 -
 ...> config-io-filebench-oltp-directio-small} |   3 -
 ...p-large => config-io-filebench-oltp-large} |   3 -
 ...p-small => config-io-filebench-oltp-small} |   3 -
 ...arge => config-io-filebench-varmail-large} |   3 -
 ...ium => config-io-filebench-varmail-medium} |   3 -
 ...mall => config-io-filebench-varmail-small} |   3 -
 ...rge => config-io-filebench-webproxy-large} |   3 -
 ...um => config-io-filebench-webproxy-medium} |   3 -
 ...all => config-io-filebench-webproxy-small} |   3 -
 ...ll => config-io-filebench-webserver-small} |   3 -
 ...=> config-io-fio-randread-async-randwrite} |   3 -
 ... => config-io-fio-randread-async-seqwrite} |   3 -
 ...ti => config-io-fio-randread-direct-multi} |   3 -
 ...=> config-io-fio-randread-sync-heavywrite} |   3 -
 ... => config-io-fio-randread-sync-randwrite} |   3 -
 ...__io-fio-scaling => config-io-fio-scaling} |   3 -
 ...=> config-io-fio-seqread-doublemem-32k-4t} |   4 -
 ... => config-io-fio-seqread-doublemem-4k-4t} |   4 -
 ...obal-dhp__io-fio-ssd => config-io-fio-ssd} |   3 -
 ...dwrite => config-io-fio-sync-maxrandwrite} |   3 -
 ...=> config-io-fio-sync-maxrandwrite-ftrace} |   3 -
 ...nfig-io-fio-sync-maxrandwrite-long-ftrace} |   3 -
 ...k-xfsrepair => config-io-fsmark-xfsrepair} |   3 -
 ...global-dhp__io-iozone => config-io-iozone} |   3 -
 ...hp__io-iozone-dio => config-io-iozone-dio} |   3 -
 ...async => config-io-iozone-doublemem-async} |   3 -
 ...fsync => config-io-iozone-doublemem-fsync} |   3 -
 ...hp__io-iozone-ram => config-io-iozone-ram} |   4 -
 ...ozone-ram-dio => config-io-iozone-ram-dio} |   4 -
 ...io-iozone-small => config-io-iozone-small} |   3 -
 ...al-dhp__io-metadata => config-io-metadata} |   3 -
 ...-large => config-io-paralleldd-read-large} |   4 -
 ... => config-io-paralleldd-read-large-multi} |   4 -
 ...-small => config-io-paralleldd-read-small} |   4 -
 ... => config-io-paralleldd-read-small-multi} |   4 -
 ...block-read => config-io-seeker-block-read} |   3 -
 ...ock-write => config-io-seeker-block-write} |   3 -
 ...r-file-read => config-io-seeker-file-read} |   3 -
 ...file-write => config-io-seeker-file-write} |   3 -
 ...g-global-dhp__io-xfsio => config-io-xfsio} |   0
 ...-dhp__io-xfsrepair => config-io-xfsrepair} |   3 -
 ...005-multi => config-jvm-specjbb2005-multi} |   4 -
 ...lti => config-jvm-specjbb2005-numad-multi} |   4 -
 ...5-single => config-jvm-specjbb2005-single} |   4 -
 ...015-multi => config-jvm-specjbb2015-multi} |   4 -
 ...b => config-jvm-specjbb2015-multi-nonumab} |   4 -
 ...5-single => config-jvm-specjbb2015-single} |   4 -
 ...al-dhp__jvm-specjvm => config-jvm-specjvm} |   4 -
 ...-small => config-memcached-mutilate-small} |   3 -
 configs/config-monitor                        |   5 -
 configs/config-monitor-dstate-stalls          |  27 --
 configs/config-monitor-interactive            |  26 --
 configs/config-monitor-stalls                 |   7 -
 configs/config-monitor-syscalls               |  27 --
 configs/config-monitor-vm-stalls              |   5 -
 ...s-mpi-full => config-nas-c-class-mpi-full} |   4 -
 ...s-mpi-half => config-nas-c-class-mpi-half} |   4 -
 ...quarter => config-nas-c-class-mpi-quarter} |   4 -
 ...mpi-third => config-nas-c-class-mpi-third} |   4 -
 ...othird => config-nas-c-class-mpi-twothird} |   4 -
 ...s-omp-full => config-nas-c-class-omp-full} |   5 -
 ...s-omp-half => config-nas-c-class-omp-half} |   5 -
 ...quarter => config-nas-c-class-omp-quarter} |   5 -
 ...omp-third => config-nas-c-class-omp-third} |   5 -
 ...othird => config-nas-c-class-omp-twothird} |   5 -
 ...-full => config-nas-d-class-mpi-bind-full} |   4 -
 ...-half => config-nas-d-class-mpi-bind-half} |   4 -
 ...er => config-nas-d-class-mpi-bind-quarter} |   4 -
 ...hird => config-nas-d-class-mpi-bind-third} |   4 -
 ...d => config-nas-d-class-mpi-bind-twothird} |   4 -
 ...s-mpi-full => config-nas-d-class-mpi-full} |   4 -
 ...s-mpi-half => config-nas-d-class-mpi-half} |   4 -
 ...quarter => config-nas-d-class-mpi-quarter} |   4 -
 ...mpi-third => config-nas-d-class-mpi-third} |   4 -
 ...othird => config-nas-d-class-mpi-twothird} |   4 -
 ...-full => config-nas-d-class-omp-bind-full} |   5 -
 ...-half => config-nas-d-class-omp-bind-half} |   5 -
 ...er => config-nas-d-class-omp-bind-quarter} |   5 -
 ...hird => config-nas-d-class-omp-bind-third} |   5 -
 ...d => config-nas-d-class-omp-bind-twothird} |   5 -
 ...s-omp-full => config-nas-d-class-omp-full} |   5 -
 ...s-omp-half => config-nas-d-class-omp-half} |   5 -
 ...quarter => config-nas-d-class-omp-quarter} |   5 -
 ...omp-third => config-nas-d-class-omp-third} |   5 -
 ...othird => config-nas-d-class-omp-twothird} |   5 -
 ...oss-ht => config-network-netperf-cross-ht} |   3 -
 ...node => config-network-netperf-cross-node} |   3 -
 ...et => config-network-netperf-cross-socket} |   3 -
 ...f-cstate => config-network-netperf-cstate} |   3 -
 ...ound => config-network-netperf-rr-unbound} |   4 -
 ...unbound => config-network-netperf-unbound} |   3 -
 ...nd => config-network-netperf-unix-unbound} |   3 -
 ...network-netpipe => config-network-netpipe} |   3 -
 ...ss-ht => config-network-sockperf-cross-ht} |   3 -
 ...t => config-network-sockperf-cross-socket} |   3 -
 ...-cstate => config-network-sockperf-cstate} |   3 -
 ...-pinned => config-network-sockperf-pinned} |   3 -
 ...=> config-network-sockperf-tcp-throughput} |   3 -
 ...fig-network-sockperf-tcp-throughput-small} |   3 -
 ...nbound => config-network-sockperf-unbound} |   3 -
 ...__network-tbench => config-network-tbench} |   3 -
 ...utonumabench => config-numa_autonumabench} |   4 -
 ...hp__numa_perfnuma => config-numa_perfnuma} |   4 -
 ...pagealloc-micro => config-pagealloc-micro} |   3 -
 ...rformance => config-pagealloc-performance} |   3 -
 ...ormance => config-pagereclaim-performance} |   3 -
 ...m-shrinker => config-pagereclaim-shrinker} |   3 -
 ...reads-full => config-parsec-pthreads-full} |   4 -
 ...reads-half => config-parsec-pthreads-half} |   4 -
 ...g-global-dhp__pgioperf => config-pgioperf} |   3 -
 ...hp__reaim-highsys => config-reaim-highsys} |   3 -
 ...m-io-alltests => config-reaim-io-alltests} |   3 -
 ...aim-io-compute => config-reaim-io-compute} |   3 -
 ...hp__reaim-io-disk => config-reaim-io-disk} |   3 -
 ...-disk-large => config-reaim-io-disk-large} |   3 -
 ...io-new_dbase => config-reaim-io-new_dbase} |   3 -
 ...arge => config-reaim-io-new_fserver-large} |   3 -
 ...reaim-io-shared => config-reaim-io-shared} |   2 -
 ...-dhp__reaim-stress => config-reaim-stress} |   3 -
 ...tensive => config-scheduler-forkintensive} |   3 -
 ...duler-unbound => config-scheduler-unbound} |   3 -
 ...__scimarkc-small => config-scimarkc-small} |   5 -
 ...g-global-dhp__sembench => config-sembench} |   5 -
 ...pipe => config-serverpair-network-netpipe} |   0
 ...etwork-rr => config-serverpair-network-rr} |   1 -
 ...ng => config-serverpair-network-streaming} |   1 -
 ...p__sockperf => config-serverpair-sockperf} |   1 -
 ...al-dhp__speccpu2006 => config-speccpu2006} |   3 -
 ... => config-speccpu2017-rate-parallel-full} |   4 -
 ... => config-speccpu2017-rate-parallel-half} |   4 -
 ... config-speccpu2017-rate-parallel-quarter} |   4 -
 ...cpu2017-speed => config-speccpu2017-speed} |   4 -
 ...=> config-speccpu2017-speed-parallel-full} |   4 -
 ...=> config-speccpu2017-speed-parallel-half} |   4 -
 ...config-speccpu2017-speed-parallel-quarter} |   4 -
 ...ss-cpuhotplug => config-stress-cpuhotplug} |   4 -
 ...-dhp__sysbench-cpu => config-sysbench-cpu} |   3 -
 ...sysbench-thread => config-sysbench-thread} |   3 -
 ...erformance => config-tlbflush-performance} |   3 -
 ...fig-global-dhp__trinity => config-trinity} |   5 -
 ...workload-ebizzy => config-workload-ebizzy} |   3 -
 ...bizzy-base => config-workload-ebizzy-base} |   3 -
 ...hort => config-workload-ebizzy-base-short} |   3 -
 ...zzy-short => config-workload-ebizzy-short} |   3 -
 ...inode => config-workload-fsmark-50m-inode} |   3 -
 ...config-workload-fsmark-50m-zerofile-inode} |   3 -
 ...kperf => config-workload-ipc-filelockperf} |   5 -
 ...le-long => config-workload-ipc-scale-long} |   4 -
 ...-short => config-workload-ipc-scale-short} |   4 -
 ...ad-microtput => config-workload-microtput} |   3 -
 ...dth => config-workload-mlc-peak-bandwidth} |   5 -
 ...g-workload-mlc-peak-bandwidth-oneht-tuned} |   5 -
 ... config-workload-mlc-peak-bandwidth-tuned} |   5 -
 ...h => config-workload_cyclictest-hackbench} |   3 -
 ...t-none => config-workload_cyclictest-none} |   3 -
 ...__workload_dedup => config-workload_dedup} |   4 -
 ...load_freqmine => config-workload_freqmine} |   4 -
 ..._futexbench => config-workload_futexbench} |   5 -
 ...ad_futexwait => config-workload_futexwait} |   5 -
 ...r_detect => config-workload_jitter_detect} |   3 -
 ..._johnripper => config-workload_johnripper} |   0
 ...ad_kerndevel => config-workload_kerndevel} |   3 -
 ...rkload_lat_ctx => config-workload_lat_ctx} |   3 -
 ...load_libmicro => config-workload_libmicro} |   3 -
 ...cro-file => config-workload_libmicro-file} |   3 -
 ...ocess => config-workload_libmicro-process} |   3 -
 ...ch => config-workload_libmicro-smallbatch} |   3 -
 ...-compress => config-workload_lkp-compress} |   4 -
 ..._mailserver => config-workload_mailserver} |   3 -
 ...load_perfpipe => config-workload_perfpipe} |   4 -
 ...ufreq => config-workload_perfpipe-cpufreq} |   4 -
 ...config-workload_perfpipe-cpufreq-cross-ht} |   4 -
 ...ig-workload_perfpipe-cpufreq-cross-socket} |   4 -
 ...s-ht => config-workload_perfpipe-cross-ht} |   4 -
 ... => config-workload_perfpipe-cross-socket} |   4 -
 ...erfsyscall => config-workload_perfsyscall} |   4 -
 ...eq => config-workload_perfsyscall-cpufreq} |   4 -
 ...onfig-workload_perfsyscall-cpufreq-pinned} |   4 -
 ...ned => config-workload_perfsyscall-pinned} |   4 -
 ...ge => config-workload_redis_memonly-large} |   3 -
 ...config-workload_redis_memonly-large-tuned} |   3 -
 ...m => config-workload_redis_memonly-medium} |   3 -
 ...onfig-workload_redis_memonly-medium-tuned} |   3 -
 ...ll => config-workload_redis_memonly-small} |   3 -
 ...config-workload_redis_memonly-small-tuned} |   3 -
 ...load_schbench => config-workload_schbench} |   3 -
 ...h-futex => config-workload_sembench-futex} |   5 -
 ...llscripts => config-workload_shellscripts} |   3 -
 ...oop-short => config-workload_simoop-short} |   4 -
 ...oop-sniff => config-workload_simoop-sniff} |   4 -
 ...e => config-workload_sparsetruncate-large} |   5 -
 ...l => config-workload_sparsetruncate-small} |   5 -
 ...ny => config-workload_sparsetruncate-tiny} |   5 -
 ...ad_stockfish => config-workload_stockfish} |   4 -
 ...m-omp-20 => config-workload_stream-omp-20} |   5 -
 ...p-cpus => config-workload_stream-omp-cpus} |   5 -
 ...p-llcs => config-workload_stream-omp-llcs} |   5 -
 ...nodes => config-workload_stream-omp-nodes} |   5 -
 ...> config-workload_stream-omp-nodes-spread} |   5 -
 ...m-single => config-workload_stream-single} |   5 -
 ...ind => config-workload_stream-single-bind} |   5 -
 ...ntext => config-workload_stressng-context} |   3 -
 ... config-workload_stressng-context-profile} |   3 -
 ...load_thotdata => config-workload_thotdata} |   5 -
 ...hpfioscale => config-workload_thpfioscale} |   0
 ...rag => config-workload_thpfioscale-defrag} |   0
 ... config-workload_thpfioscale-madvhugepage} |   0
 ...load_thpscale => config-workload_thpscale} |   4 -
 ... => config-workload_thpscale-madvhugepage} |   4 -
 ...ad_unixbench => config-workload_unixbench} |   5 -
 ...xbench-io => config-workload_unixbench-io} |   5 -
 ... => config-workload_unixbench-io-fsbuffer} |   5 -
 ...sk => config-workload_unixbench-io-fsdisk} |   5 -
 ...me => config-workload_unixbench-io-fstime} |   5 -
 ...workload_usemem => config-workload_usemem} |   4 -
 ...onfig-workload_usemem-stress-numa-compact} |   4 -
 ...sk => config-workload_usemem-swap-ramdisk} |   3 -
 ...le-io => config-workload_will-it-scale-io} |   4 -
 ...-sys => config-workload_will-it-scale-sys} |   4 -
 ...p-tlbflush => config-workload_wp-tlbflush} |   4 -
 280 files changed, 142 insertions(+), 1602 deletions(-)
 rename configs/{config-global-dhp__S-startup => config-S-startup} (96%)
 rename configs/{config-global-dhp__adrestia-periodic-unbound => config-adrestia-periodic-unbound} (98%)
 rename configs/{config-global-dhp__adrestia-single-unbound => config-adrestia-single-unbound} (97%)
 rename configs/{config-global-dhp__db-pgbench-timed-ro-medium => config-db-pgbench-timed-ro-medium} (98%)
 rename configs/{config-global-dhp__db-pgbench-timed-ro-medium-tuned => config-db-pgbench-timed-ro-medium-tuned} (98%)
 rename configs/{config-global-dhp__db-pgbench-timed-ro-small => config-db-pgbench-timed-ro-small} (98%)
 rename configs/{config-global-dhp__db-pgbench-timed-ro-small-full-hugetlbfs-tuned => config-db-pgbench-timed-ro-small-full-hugetlbfs-tuned} (98%)
 rename configs/{config-global-dhp__db-pgbench-timed-ro-small-full-tuned => config-db-pgbench-timed-ro-small-full-tuned} (98%)
 rename configs/{config-global-dhp__db-pgbench-timed-ro-small-tuned => config-db-pgbench-timed-ro-small-tuned} (98%)
 rename configs/{config-global-dhp__db-pgbench-timed-rw-medium => config-db-pgbench-timed-rw-medium} (98%)
 rename configs/{config-global-dhp__db-pgbench-timed-rw-medium-tuned => config-db-pgbench-timed-rw-medium-tuned} (98%)
 rename configs/{config-global-dhp__db-pgbench-timed-rw-small => config-db-pgbench-timed-rw-small} (98%)
 rename configs/{config-global-dhp__db-pgbench-timed-rw-small-tuned => config-db-pgbench-timed-rw-small-tuned} (98%)
 rename configs/{config-global-dhp__db-sqlite-insert-medium => config-db-sqlite-insert-medium} (97%)
 rename configs/{config-global-dhp__db-sqlite-insert-small => config-db-sqlite-insert-small} (97%)
 rename configs/{config-global-dhp__db-sysbench-mariadb-oltp-ro-medium => config-db-sysbench-mariadb-oltp-ro-medium} (98%)
 rename configs/{config-global-dhp__db-sysbench-mariadb-oltp-ro-small => config-db-sysbench-mariadb-oltp-ro-small} (98%)
 rename configs/{config-global-dhp__db-sysbench-mariadb-oltp-rw-medium => config-db-sysbench-mariadb-oltp-rw-medium} (98%)
 rename configs/{config-global-dhp__db-sysbench-mariadb-oltp-rw-small => config-db-sysbench-mariadb-oltp-rw-small} (98%)
 rename configs/{config-global-dhp__db-sysbench-postgres-oltp-ro-medium => config-db-sysbench-postgres-oltp-ro-medium} (97%)
 rename configs/{config-global-dhp__db-sysbench-postgres-oltp-ro-small => config-db-sysbench-postgres-oltp-ro-small} (97%)
 rename configs/{config-global-dhp__db-sysbench-postgres-oltp-rw-medium => config-db-sysbench-postgres-oltp-rw-medium} (97%)
 rename configs/{config-global-dhp__db-sysbench-postgres-oltp-rw-small => config-db-sysbench-postgres-oltp-rw-small} (97%)
 rename configs/{config-global-dhp__functional-ltp-cve => config-functional-ltp-cve} (100%)
 rename configs/{config-global-dhp__functional-ltp-lite => config-functional-ltp-lite} (100%)
 rename configs/{config-global-dhp__functional-pistress => config-functional-pistress} (93%)
 rename configs/{config-global-dhp__functional-xfstests-auto => config-functional-xfstests-auto} (100%)
 delete mode 100644 configs/config-global-dhp__hpcg-serial-long
 delete mode 100644 configs/config-global-dhp__hpcg-serial-short
 delete mode 100644 configs/config-global-dhp__io-bonnie-dir-async-fixed
 delete mode 100644 configs/config-global-dhp__io-bonnie-dir-fsync-fixed
 delete mode 100644 configs/config-global-dhp__io-bonnie-file-async-fixed
 delete mode 100644 configs/config-global-dhp__io-bonnie-file-fsync-fixed
 delete mode 100644 configs/config-global-dhp__io-largeread-starvation
 delete mode 100644 configs/config-global-dhp__io-randread-starvation
 delete mode 100644 configs/config-global-dhp__io-sync-starvation
 delete mode 100644 configs/config-global__thp-performance
 rename configs/{config-global-dhp__graph500-omp-infant => config-graph500-omp-infant} (92%)
 rename configs/{config-global-dhp__graph500-omp-kinder => config-graph500-omp-kinder} (92%)
 rename configs/{config-global-dhp__graph500-omp-toy => config-graph500-omp-toy} (91%)
 rename configs/{config-global-dhp__hpcc-large => config-hpcc-large} (92%)
 rename configs/{config-global-dhp__hpcc-small => config-hpcc-small} (92%)
 rename configs/{config-global-dhp__hpcg-gcc-mpi-long => config-hpcg-gcc-mpi-long} (92%)
 rename configs/{config-global-dhp__hpcg-gcc-mpi-short => config-hpcg-gcc-mpi-short} (92%)
 rename configs/{config-global-dhp__hpcg-gcc-omp-long => config-hpcg-gcc-omp-long} (92%)
 rename configs/{config-global-dhp__hpcg-gcc-omp-mpi-long => config-hpcg-gcc-omp-mpi-long} (92%)
 rename configs/{config-global-dhp__hpcg-gcc-omp-mpi-short => config-hpcg-gcc-omp-mpi-short} (92%)
 rename configs/{config-global-dhp__hpcg-gcc-omp-short => config-hpcg-gcc-omp-short} (92%)
 rename configs/{config-global-dhp__http-phpbench => config-http-phpbench} (81%)
 rename configs/{config-global-dhp__http-siege => config-http-siege} (98%)
 rename configs/{config-global-dhp__io-blogbench => config-io-blogbench} (97%)
 rename configs/{config-global-dhp__io-bonnie-dir-async => config-io-bonnie-dir-async} (97%)
 rename configs/{config-global-dhp__io-bonnie-dir-fsync => config-io-bonnie-dir-fsync} (97%)
 rename configs/{config-global-dhp__io-bonnie-file-async => config-io-bonnie-file-async} (97%)
 rename configs/{config-global-dhp__io-bonnie-file-fsync => config-io-bonnie-file-fsync} (97%)
 rename configs/{config-global-dhp__io-dbench4-async => config-io-dbench4-async} (98%)
 rename configs/{config-global-dhp__io-dbench4-fsync => config-io-dbench4-fsync} (98%)
 rename configs/{config-global-dhp__io-filebench-oltp-directio-large => config-io-filebench-oltp-directio-large} (98%)
 rename configs/{config-global-dhp__io-filebench-oltp-directio-small => config-io-filebench-oltp-directio-small} (98%)
 rename configs/{config-global-dhp__io-filebench-oltp-large => config-io-filebench-oltp-large} (98%)
 rename configs/{config-global-dhp__io-filebench-oltp-small => config-io-filebench-oltp-small} (98%)
 rename configs/{config-global-dhp__io-filebench-varmail-large => config-io-filebench-varmail-large} (98%)
 rename configs/{config-global-dhp__io-filebench-varmail-medium => config-io-filebench-varmail-medium} (98%)
 rename configs/{config-global-dhp__io-filebench-varmail-small => config-io-filebench-varmail-small} (98%)
 rename configs/{config-global-dhp__io-filebench-webproxy-large => config-io-filebench-webproxy-large} (98%)
 rename configs/{config-global-dhp__io-filebench-webproxy-medium => config-io-filebench-webproxy-medium} (98%)
 rename configs/{config-global-dhp__io-filebench-webproxy-small => config-io-filebench-webproxy-small} (98%)
 rename configs/{config-global-dhp__io-filebench-webserver-small => config-io-filebench-webserver-small} (98%)
 rename configs/{config-global-dhp__io-fio-randread-async-randwrite => config-io-fio-randread-async-randwrite} (98%)
 rename configs/{config-global-dhp__io-fio-randread-async-seqwrite => config-io-fio-randread-async-seqwrite} (98%)
 rename configs/{config-global-dhp__io-fio-randread-direct-multi => config-io-fio-randread-direct-multi} (97%)
 rename configs/{config-global-dhp__io-fio-randread-sync-heavywrite => config-io-fio-randread-sync-heavywrite} (98%)
 rename configs/{config-global-dhp__io-fio-randread-sync-randwrite => config-io-fio-randread-sync-randwrite} (98%)
 rename configs/{config-global-dhp__io-fio-scaling => config-io-fio-scaling} (97%)
 rename configs/{config-global-dhp__io-fio-seqread-doublemem-32k-4t => config-io-fio-seqread-doublemem-32k-4t} (97%)
 rename configs/{config-global-dhp__io-fio-seqread-doublemem-4k-4t => config-io-fio-seqread-doublemem-4k-4t} (97%)
 rename configs/{config-global-dhp__io-fio-ssd => config-io-fio-ssd} (97%)
 rename configs/{config-global-dhp__io-fio-sync-maxrandwrite => config-io-fio-sync-maxrandwrite} (98%)
 rename configs/{config-global-dhp__io-fio-sync-maxrandwrite-ftrace => config-io-fio-sync-maxrandwrite-ftrace} (98%)
 rename configs/{config-global-dhp__io-fio-sync-maxrandwrite-long-ftrace => config-io-fio-sync-maxrandwrite-long-ftrace} (98%)
 rename configs/{config-global-dhp__io-fsmark-xfsrepair => config-io-fsmark-xfsrepair} (97%)
 rename configs/{config-global-dhp__io-iozone => config-io-iozone} (97%)
 rename configs/{config-global-dhp__io-iozone-dio => config-io-iozone-dio} (97%)
 rename configs/{config-global-dhp__io-iozone-doublemem-async => config-io-iozone-doublemem-async} (97%)
 rename configs/{config-global-dhp__io-iozone-doublemem-fsync => config-io-iozone-doublemem-fsync} (97%)
 rename configs/{config-global-dhp__io-iozone-ram => config-io-iozone-ram} (98%)
 rename configs/{config-global-dhp__io-iozone-ram-dio => config-io-iozone-ram-dio} (98%)
 rename configs/{config-global-dhp__io-iozone-small => config-io-iozone-small} (98%)
 rename configs/{config-global-dhp__io-metadata => config-io-metadata} (97%)
 rename configs/{config-global-dhp__io-paralleldd-read-large => config-io-paralleldd-read-large} (95%)
 rename configs/{config-global-dhp__io-paralleldd-read-large-multi => config-io-paralleldd-read-large-multi} (95%)
 rename configs/{config-global-dhp__io-paralleldd-read-small => config-io-paralleldd-read-small} (95%)
 rename configs/{config-global-dhp__io-paralleldd-read-small-multi => config-io-paralleldd-read-small-multi} (95%)
 rename configs/{config-global-dhp__io-seeker-block-read => config-io-seeker-block-read} (98%)
 rename configs/{config-global-dhp__io-seeker-block-write => config-io-seeker-block-write} (98%)
 rename configs/{config-global-dhp__io-seeker-file-read => config-io-seeker-file-read} (98%)
 rename configs/{config-global-dhp__io-seeker-file-write => config-io-seeker-file-write} (98%)
 rename configs/{config-global-dhp__io-xfsio => config-io-xfsio} (100%)
 rename configs/{config-global-dhp__io-xfsrepair => config-io-xfsrepair} (98%)
 rename configs/{config-global-dhp__jvm-specjbb2005-multi => config-jvm-specjbb2005-multi} (94%)
 rename configs/{config-global-dhp__jvm-specjbb2005-numad-multi => config-jvm-specjbb2005-numad-multi} (94%)
 rename configs/{config-global-dhp__jvm-specjbb2005-single => config-jvm-specjbb2005-single} (94%)
 rename configs/{config-global-dhp__jvm-specjbb2015-multi => config-jvm-specjbb2015-multi} (96%)
 rename configs/{config-global-dhp__jvm-specjbb2015-multi-nonumab => config-jvm-specjbb2015-multi-nonumab} (96%)
 rename configs/{config-global-dhp__jvm-specjbb2015-single => config-jvm-specjbb2015-single} (94%)
 rename configs/{config-global-dhp__jvm-specjvm => config-jvm-specjvm} (91%)
 rename configs/{config-global-dhp__memcached-mutilate-small => config-memcached-mutilate-small} (97%)
 delete mode 100644 configs/config-monitor-dstate-stalls
 delete mode 100644 configs/config-monitor-interactive
 delete mode 100644 configs/config-monitor-syscalls
 rename configs/{config-global-dhp__nas-c-class-mpi-full => config-nas-c-class-mpi-full} (95%)
 rename configs/{config-global-dhp__nas-c-class-mpi-half => config-nas-c-class-mpi-half} (95%)
 rename configs/{config-global-dhp__nas-c-class-mpi-quarter => config-nas-c-class-mpi-quarter} (95%)
 rename configs/{config-global-dhp__nas-c-class-mpi-third => config-nas-c-class-mpi-third} (95%)
 rename configs/{config-global-dhp__nas-c-class-mpi-twothird => config-nas-c-class-mpi-twothird} (95%)
 rename configs/{config-global-dhp__nas-c-class-omp-full => config-nas-c-class-omp-full} (94%)
 rename configs/{config-global-dhp__nas-c-class-omp-half => config-nas-c-class-omp-half} (94%)
 rename configs/{config-global-dhp__nas-c-class-omp-quarter => config-nas-c-class-omp-quarter} (94%)
 rename configs/{config-global-dhp__nas-c-class-omp-third => config-nas-c-class-omp-third} (94%)
 rename configs/{config-global-dhp__nas-c-class-omp-twothird => config-nas-c-class-omp-twothird} (94%)
 rename configs/{config-global-dhp__nas-d-class-mpi-bind-full => config-nas-d-class-mpi-bind-full} (95%)
 rename configs/{config-global-dhp__nas-d-class-mpi-bind-half => config-nas-d-class-mpi-bind-half} (95%)
 rename configs/{config-global-dhp__nas-d-class-mpi-bind-quarter => config-nas-d-class-mpi-bind-quarter} (95%)
 rename configs/{config-global-dhp__nas-d-class-mpi-bind-third => config-nas-d-class-mpi-bind-third} (95%)
 rename configs/{config-global-dhp__nas-d-class-mpi-bind-twothird => config-nas-d-class-mpi-bind-twothird} (95%)
 rename configs/{config-global-dhp__nas-d-class-mpi-full => config-nas-d-class-mpi-full} (95%)
 rename configs/{config-global-dhp__nas-d-class-mpi-half => config-nas-d-class-mpi-half} (95%)
 rename configs/{config-global-dhp__nas-d-class-mpi-quarter => config-nas-d-class-mpi-quarter} (95%)
 rename configs/{config-global-dhp__nas-d-class-mpi-third => config-nas-d-class-mpi-third} (95%)
 rename configs/{config-global-dhp__nas-d-class-mpi-twothird => config-nas-d-class-mpi-twothird} (95%)
 rename configs/{config-global-dhp__nas-d-class-omp-bind-full => config-nas-d-class-omp-bind-full} (94%)
 rename configs/{config-global-dhp__nas-d-class-omp-bind-half => config-nas-d-class-omp-bind-half} (94%)
 rename configs/{config-global-dhp__nas-d-class-omp-bind-quarter => config-nas-d-class-omp-bind-quarter} (94%)
 rename configs/{config-global-dhp__nas-d-class-omp-bind-third => config-nas-d-class-omp-bind-third} (94%)
 rename configs/{config-global-dhp__nas-d-class-omp-bind-twothird => config-nas-d-class-omp-bind-twothird} (94%)
 rename configs/{config-global-dhp__nas-d-class-omp-full => config-nas-d-class-omp-full} (94%)
 rename configs/{config-global-dhp__nas-d-class-omp-half => config-nas-d-class-omp-half} (94%)
 rename configs/{config-global-dhp__nas-d-class-omp-quarter => config-nas-d-class-omp-quarter} (94%)
 rename configs/{config-global-dhp__nas-d-class-omp-third => config-nas-d-class-omp-third} (94%)
 rename configs/{config-global-dhp__nas-d-class-omp-twothird => config-nas-d-class-omp-twothird} (94%)
 rename configs/{config-global-dhp__network-netperf-cross-ht => config-network-netperf-cross-ht} (97%)
 rename configs/{config-global-dhp__network-netperf-cross-node => config-network-netperf-cross-node} (98%)
 rename configs/{config-global-dhp__network-netperf-cross-socket => config-network-netperf-cross-socket} (97%)
 rename configs/{config-global-dhp__network-netperf-cstate => config-network-netperf-cstate} (97%)
 rename configs/{config-global-dhp__network-netperf-rr-unbound => config-network-netperf-rr-unbound} (96%)
 rename configs/{config-global-dhp__network-netperf-unbound => config-network-netperf-unbound} (97%)
 rename configs/{config-global-dhp__network-netperf-unix-unbound => config-network-netperf-unix-unbound} (96%)
 rename configs/{config-global-dhp__network-netpipe => config-network-netpipe} (97%)
 rename configs/{config-global-dhp__network-sockperf-cross-ht => config-network-sockperf-cross-ht} (97%)
 rename configs/{config-global-dhp__network-sockperf-cross-socket => config-network-sockperf-cross-socket} (97%)
 rename configs/{config-global-dhp__network-sockperf-cstate => config-network-sockperf-cstate} (97%)
 rename configs/{config-global-dhp__network-sockperf-pinned => config-network-sockperf-pinned} (97%)
 rename configs/{config-global-dhp__network-sockperf-tcp-throughput => config-network-sockperf-tcp-throughput} (97%)
 rename configs/{config-global-dhp__network-sockperf-tcp-throughput-small => config-network-sockperf-tcp-throughput-small} (97%)
 rename configs/{config-global-dhp__network-sockperf-unbound => config-network-sockperf-unbound} (97%)
 rename configs/{config-global-dhp__network-tbench => config-network-tbench} (96%)
 rename configs/{config-global-dhp__numa_autonumabench => config-numa_autonumabench} (98%)
 rename configs/{config-global-dhp__numa_perfnuma => config-numa_perfnuma} (95%)
 rename configs/{config-global-dhp__pagealloc-micro => config-pagealloc-micro} (98%)
 rename configs/{config-global-dhp__pagealloc-performance => config-pagealloc-performance} (98%)
 rename configs/{config-global-dhp__pagereclaim-performance => config-pagereclaim-performance} (99%)
 rename configs/{config-global-dhp__pagereclaim-shrinker => config-pagereclaim-shrinker} (98%)
 rename configs/{config-global-dhp__parsec-pthreads-full => config-parsec-pthreads-full} (97%)
 rename configs/{config-global-dhp__parsec-pthreads-half => config-parsec-pthreads-half} (97%)
 rename configs/{config-global-dhp__pgioperf => config-pgioperf} (98%)
 rename configs/{config-global-dhp__reaim-highsys => config-reaim-highsys} (95%)
 rename configs/{config-global-dhp__reaim-io-alltests => config-reaim-io-alltests} (95%)
 rename configs/{config-global-dhp__reaim-io-compute => config-reaim-io-compute} (95%)
 rename configs/{config-global-dhp__reaim-io-disk => config-reaim-io-disk} (94%)
 rename configs/{config-global-dhp__reaim-io-disk-large => config-reaim-io-disk-large} (94%)
 rename configs/{config-global-dhp__reaim-io-new_dbase => config-reaim-io-new_dbase} (95%)
 rename configs/{config-global-dhp__reaim-io-new_fserver-large => config-reaim-io-new_fserver-large} (95%)
 rename configs/{config-global-dhp__reaim-io-shared => config-reaim-io-shared} (97%)
 rename configs/{config-global-dhp__reaim-stress => config-reaim-stress} (94%)
 rename configs/{config-global-dhp__scheduler-forkintensive => config-scheduler-forkintensive} (98%)
 rename configs/{config-global-dhp__scheduler-unbound => config-scheduler-unbound} (98%)
 rename configs/{config-global-dhp__scimarkc-small => config-scimarkc-small} (85%)
 rename configs/{config-global-dhp__sembench => config-sembench} (86%)
 rename configs/{config-serverpair-dhp__network-netpipe => config-serverpair-network-netpipe} (100%)
 rename configs/{config-serverpair-dhp__network-rr => config-serverpair-network-rr} (99%)
 rename configs/{config-serverpair-dhp__network-streaming => config-serverpair-network-streaming} (99%)
 rename configs/{config-serverpair-dhp__sockperf => config-serverpair-sockperf} (99%)
 rename configs/{config-global-dhp__speccpu2006 => config-speccpu2006} (97%)
 rename configs/{config-global-dhp__speccpu2017-rate-parallel-full => config-speccpu2017-rate-parallel-full} (97%)
 rename configs/{config-global-dhp__speccpu2017-rate-parallel-half => config-speccpu2017-rate-parallel-half} (97%)
 rename configs/{config-global-dhp__speccpu2017-rate-parallel-quarter => config-speccpu2017-rate-parallel-quarter} (97%)
 rename configs/{config-global-dhp__speccpu2017-speed => config-speccpu2017-speed} (96%)
 rename configs/{config-global-dhp__speccpu2017-speed-parallel-full => config-speccpu2017-speed-parallel-full} (96%)
 rename configs/{config-global-dhp__speccpu2017-speed-parallel-half => config-speccpu2017-speed-parallel-half} (97%)
 rename configs/{config-global-dhp__speccpu2017-speed-parallel-quarter => config-speccpu2017-speed-parallel-quarter} (97%)
 rename configs/{config-global-dhp__stress-cpuhotplug => config-stress-cpuhotplug} (95%)
 rename configs/{config-global-dhp__sysbench-cpu => config-sysbench-cpu} (97%)
 rename configs/{config-global-dhp__sysbench-thread => config-sysbench-thread} (97%)
 rename configs/{config-global-dhp__tlbflush-performance => config-tlbflush-performance} (98%)
 rename configs/{config-global-dhp__trinity => config-trinity} (93%)
 rename configs/{config-global-dhp__workload-ebizzy => config-workload-ebizzy} (97%)
 rename configs/{config-global-dhp__workload-ebizzy-base => config-workload-ebizzy-base} (97%)
 rename configs/{config-global-dhp__workload-ebizzy-base-short => config-workload-ebizzy-base-short} (97%)
 rename configs/{config-global-dhp__workload-ebizzy-short => config-workload-ebizzy-short} (97%)
 rename configs/{config-global-dhp__workload-fsmark-50m-inode => config-workload-fsmark-50m-inode} (98%)
 rename configs/{config-global-dhp__workload-fsmark-50m-zerofile-inode => config-workload-fsmark-50m-zerofile-inode} (98%)
 rename configs/{config-global-dhp__workload-ipc-filelockperf => config-workload-ipc-filelockperf} (94%)
 rename configs/{config-global-dhp__workload-ipc-scale-long => config-workload-ipc-scale-long} (96%)
 rename configs/{config-global-dhp__workload-ipc-scale-short => config-workload-ipc-scale-short} (96%)
 rename configs/{config-global-dhp__workload-microtput => config-workload-microtput} (97%)
 rename configs/{config-global-dhp__workload-mlc-peak-bandwidth => config-workload-mlc-peak-bandwidth} (91%)
 rename configs/{config-global-dhp__workload-mlc-peak-bandwidth-oneht-tuned => config-workload-mlc-peak-bandwidth-oneht-tuned} (92%)
 rename configs/{config-global-dhp__workload-mlc-peak-bandwidth-tuned => config-workload-mlc-peak-bandwidth-tuned} (91%)
 rename configs/{config-global-dhp__workload_cyclictest-hackbench => config-workload_cyclictest-hackbench} (94%)
 rename configs/{config-global-dhp__workload_cyclictest-none => config-workload_cyclictest-none} (94%)
 rename configs/{config-global-dhp__workload_dedup => config-workload_dedup} (95%)
 rename configs/{config-global-dhp__workload_freqmine => config-workload_freqmine} (94%)
 rename configs/{config-global-dhp__workload_futexbench => config-workload_futexbench} (92%)
 rename configs/{config-global-dhp__workload_futexwait => config-workload_futexwait} (92%)
 rename configs/{config-global-dhp__workload_jitter_detect => config-workload_jitter_detect} (93%)
 rename configs/{config-global-dhp__workload_johnripper => config-workload_johnripper} (100%)
 rename configs/{config-global-dhp__workload_kerndevel => config-workload_kerndevel} (98%)
 rename configs/{config-global-dhp__workload_lat_ctx => config-workload_lat_ctx} (99%)
 rename configs/{config-global-dhp__workload_libmicro => config-workload_libmicro} (96%)
 rename configs/{config-global-dhp__workload_libmicro-file => config-workload_libmicro-file} (96%)
 rename configs/{config-global-dhp__workload_libmicro-process => config-workload_libmicro-process} (96%)
 rename configs/{config-global-dhp__workload_libmicro-smallbatch => config-workload_libmicro-smallbatch} (96%)
 rename configs/{config-global-dhp__workload_lkp-compress => config-workload_lkp-compress} (94%)
 rename configs/{config-global-dhp__workload_mailserver => config-workload_mailserver} (98%)
 rename configs/{config-global-dhp__workload_perfpipe => config-workload_perfpipe} (92%)
 rename configs/{config-global-dhp__workload_perfpipe-cpufreq => config-workload_perfpipe-cpufreq} (92%)
 rename configs/{config-global-dhp__workload_perfpipe-cpufreq-cross-ht => config-workload_perfpipe-cpufreq-cross-ht} (93%)
 rename configs/{config-global-dhp__workload_perfpipe-cpufreq-cross-socket => config-workload_perfpipe-cpufreq-cross-socket} (93%)
 rename configs/{config-global-dhp__workload_perfpipe-cross-ht => config-workload_perfpipe-cross-ht} (92%)
 rename configs/{config-global-dhp__workload_perfpipe-cross-socket => config-workload_perfpipe-cross-socket} (92%)
 rename configs/{config-global-dhp__workload_perfsyscall => config-workload_perfsyscall} (92%)
 rename configs/{config-global-dhp__workload_perfsyscall-cpufreq => config-workload_perfsyscall-cpufreq} (92%)
 rename configs/{config-global-dhp__workload_perfsyscall-cpufreq-pinned => config-workload_perfsyscall-cpufreq-pinned} (93%)
 rename configs/{config-global-dhp__workload_perfsyscall-pinned => config-workload_perfsyscall-pinned} (92%)
 rename configs/{config-global-dhp__workload_redis_memonly-large => config-workload_redis_memonly-large} (98%)
 rename configs/{config-global-dhp__workload_redis_memonly-large-tuned => config-workload_redis_memonly-large-tuned} (98%)
 rename configs/{config-global-dhp__workload_redis_memonly-medium => config-workload_redis_memonly-medium} (98%)
 rename configs/{config-global-dhp__workload_redis_memonly-medium-tuned => config-workload_redis_memonly-medium-tuned} (98%)
 rename configs/{config-global-dhp__workload_redis_memonly-small => config-workload_redis_memonly-small} (98%)
 rename configs/{config-global-dhp__workload_redis_memonly-small-tuned => config-workload_redis_memonly-small-tuned} (97%)
 rename configs/{config-global-dhp__workload_schbench => config-workload_schbench} (97%)
 rename configs/{config-global-dhp__workload_sembench-futex => config-workload_sembench-futex} (92%)
 rename configs/{config-global-dhp__workload_shellscripts => config-workload_shellscripts} (97%)
 rename configs/{config-global-dhp__workload_simoop-short => config-workload_simoop-short} (96%)
 rename configs/{config-global-dhp__workload_simoop-sniff => config-workload_simoop-sniff} (96%)
 rename configs/{config-global-dhp__workload_sparsetruncate-large => config-workload_sparsetruncate-large} (93%)
 rename configs/{config-global-dhp__workload_sparsetruncate-small => config-workload_sparsetruncate-small} (93%)
 rename configs/{config-global-dhp__workload_sparsetruncate-tiny => config-workload_sparsetruncate-tiny} (92%)
 rename configs/{config-global-dhp__workload_stockfish => config-workload_stockfish} (96%)
 rename configs/{config-global-dhp__workload_stream-omp-20 => config-workload_stream-omp-20} (92%)
 rename configs/{config-global-dhp__workload_stream-omp-cpus => config-workload_stream-omp-cpus} (92%)
 rename configs/{config-global-dhp__workload_stream-omp-llcs => config-workload_stream-omp-llcs} (92%)
 rename configs/{config-global-dhp__workload_stream-omp-nodes => config-workload_stream-omp-nodes} (92%)
 rename configs/{config-global-dhp__workload_stream-omp-nodes-spread => config-workload_stream-omp-nodes-spread} (93%)
 rename configs/{config-global-dhp__workload_stream-single => config-workload_stream-single} (92%)
 rename configs/{config-global-dhp__workload_stream-single-bind => config-workload_stream-single-bind} (92%)
 rename configs/{config-global-dhp__workload_stressng-context => config-workload_stressng-context} (94%)
 rename configs/{config-global-dhp__workload_stressng-context-profile => config-workload_stressng-context-profile} (94%)
 rename configs/{config-global-dhp__workload_thotdata => config-workload_thotdata} (93%)
 rename configs/{config-global-dhp__workload_thpfioscale => config-workload_thpfioscale} (100%)
 rename configs/{config-global-dhp__workload_thpfioscale-defrag => config-workload_thpfioscale-defrag} (100%)
 rename configs/{config-global-dhp__workload_thpfioscale-madvhugepage => config-workload_thpfioscale-madvhugepage} (100%)
 rename configs/{config-global-dhp__workload_thpscale => config-workload_thpscale} (95%)
 rename configs/{config-global-dhp__workload_thpscale-madvhugepage => config-workload_thpscale-madvhugepage} (95%)
 rename configs/{config-global-dhp__workload_unixbench => config-workload_unixbench} (93%)
 rename configs/{config-global-dhp__workload_unixbench-io => config-workload_unixbench-io} (93%)
 rename configs/{config-global-dhp__workload_unixbench-io-fsbuffer => config-workload_unixbench-io-fsbuffer} (92%)
 rename configs/{config-global-dhp__workload_unixbench-io-fsdisk => config-workload_unixbench-io-fsdisk} (92%)
 rename configs/{config-global-dhp__workload_unixbench-io-fstime => config-workload_unixbench-io-fstime} (92%)
 rename configs/{config-global-dhp__workload_usemem => config-workload_usemem} (94%)
 rename configs/{config-global-dhp__workload_usemem-stress-numa-compact => config-workload_usemem-stress-numa-compact} (95%)
 rename configs/{config-global-dhp__workload_usemem-swap-ramdisk => config-workload_usemem-swap-ramdisk} (96%)
 rename configs/{config-global-dhp__workload_will-it-scale-io => config-workload_will-it-scale-io} (95%)
 rename configs/{config-global-dhp__workload_will-it-scale-sys => config-workload_will-it-scale-sys} (95%)
 rename configs/{config-global-dhp__wp-tlbflush => config-workload_wp-tlbflush} (96%)

diff --git a/README b/README
index 50b4558eb..da2d3b762 100644
--- a/README
+++ b/README
@@ -39,7 +39,7 @@ should be located, grep for MIRROR_LOCATION= in shellpacks/.
 A basic invocation of the suite is
 
 <pre>
-$ cp configs/config-global-dhp__pagealloc-performance config
+$ cp configs/config-pagealloc-performance config
 $ ./run-mmtests.sh --no-monitor 3.0-nomonitor
 $ ./run-mmtests.sh --run-monitor 3.0-runmonitor
 </pre>
diff --git a/bin/generate-fs-configs b/bin/generate-fs-configs
index bad481b2c..072806b88 100755
--- a/bin/generate-fs-configs
+++ b/bin/generate-fs-configs
@@ -5,154 +5,154 @@ export SCRIPTDIR=`echo $0 | sed -e "s/$SCRIPT//"`/..
 cd $SCRIPTDIR/configs || exit
 
 NOATIME_FSCONFIGS="
-config-global-dhp__db-pgbench-timed-ro-medium
-config-global-dhp__db-pgbench-timed-ro-small
-config-global-dhp__db-pgbench-timed-rw-medium
-config-global-dhp__db-pgbench-timed-rw-small
-config-global-dhp__db-pgbench-timed-ro-medium-tuned
-config-global-dhp__db-pgbench-timed-ro-small-tuned
-config-global-dhp__db-pgbench-timed-rw-medium-tuned
-config-global-dhp__db-pgbench-timed-rw-small-tuned
-config-global-dhp__db-pgbench-timed-ro-small-full-tuned
-config-global-dhp__db-pgbench-timed-ro-small-full-hugetlbfs-tuned
-config-global-dhp__db-sysbench-mariadb-oltp-ro-medium
-config-global-dhp__db-sysbench-mariadb-oltp-ro-small
-config-global-dhp__db-sysbench-mariadb-oltp-rw-medium
-config-global-dhp__db-sysbench-mariadb-oltp-rw-small
-config-global-dhp__db-sysbench-postgres-oltp-ro-medium
-config-global-dhp__db-sysbench-postgres-oltp-ro-small
-config-global-dhp__db-sysbench-postgres-oltp-rw-medium
-config-global-dhp__db-sysbench-postgres-oltp-rw-small
-config-global-dhp__pgioperf
-config-global-dhp__workload_usemem
+config-db-pgbench-timed-ro-medium
+config-db-pgbench-timed-ro-small
+config-db-pgbench-timed-rw-medium
+config-db-pgbench-timed-rw-small
+config-db-pgbench-timed-ro-medium-tuned
+config-db-pgbench-timed-ro-small-tuned
+config-db-pgbench-timed-rw-medium-tuned
+config-db-pgbench-timed-rw-small-tuned
+config-db-pgbench-timed-ro-small-full-tuned
+config-db-pgbench-timed-ro-small-full-hugetlbfs-tuned
+config-db-sysbench-mariadb-oltp-ro-medium
+config-db-sysbench-mariadb-oltp-ro-small
+config-db-sysbench-mariadb-oltp-rw-medium
+config-db-sysbench-mariadb-oltp-rw-small
+config-db-sysbench-postgres-oltp-ro-medium
+config-db-sysbench-postgres-oltp-ro-small
+config-db-sysbench-postgres-oltp-rw-medium
+config-db-sysbench-postgres-oltp-rw-small
+config-pgioperf
+config-workload_usemem
 "
 
 RAMCONFIGS="
-config-global-dhp__io-iozone-ram
-config-global-dhp__io-iozone-ram-dio
+config-io-iozone-ram
+config-io-iozone-ram-dio
 "
 
 DEADLINE_FSCONFIGS="
-config-global-dhp__io-fio-randread-async-randwrite
-config-global-dhp__io-fio-randread-async-seqwrite
-config-global-dhp__io-fio-randread-sync-heavywrite
-config-global-dhp__io-fio-randread-sync-randwrite
-config-global-dhp__io-bonnie-file-async
-config-global-dhp__io-bonnie-dir-async
-config-global-dhp__io-bonnie-file-fsync
-config-global-dhp__io-bonnie-dir-fsync
+config-io-fio-randread-async-randwrite
+config-io-fio-randread-async-seqwrite
+config-io-fio-randread-sync-heavywrite
+config-io-fio-randread-sync-randwrite
+config-io-bonnie-file-async
+config-io-bonnie-dir-async
+config-io-bonnie-file-fsync
+config-io-bonnie-dir-fsync
 "
 
 FSCONFIGS="
-config-global-dhp__io-metadata
-config-global-dhp__io-dbench4-async
-config-global-dhp__io-dbench4-fsync
-config-global-dhp__io-fio-randread-direct-multi
-config-global-dhp__io-fsmark-xfsrepair
-config-global-dhp__pagereclaim-performance
-config-global-dhp__pagereclaim-shrinker
-config-global-dhp__workload-fsmark-50m-inode
-config-global-dhp__workload-fsmark-50m-zerofile-inode
-config-global-dhp__io-xfsrepair
-config-global-dhp__io-compress
-config-global-dhp__nas-c-class-mpi-full
-config-global-dhp__nas-c-class-mpi-half
-config-global-dhp__nas-c-class-mpi-third
-config-global-dhp__nas-c-class-mpi-quarter
-config-global-dhp__nas-d-class-mpi-bind-full
-config-global-dhp__nas-d-class-mpi-bind-half
-config-global-dhp__nas-d-class-mpi-bind-third
-config-global-dhp__nas-d-class-mpi-bind-quarter
-config-global-dhp__nas-d-class-mpi-full
-config-global-dhp__nas-d-class-mpi-half
-config-global-dhp__nas-d-class-mpi-third
-config-global-dhp__nas-d-class-mpi-quarter
-config-global-dhp__workload_mailserver
-config-global-dhp__workload_kerndevel
-config-global-dhp__workload_dedup
-config-global-dhp__workload_shellscripts
-config-global-dhp__workload_sparsetruncate-tiny
-config-global-dhp__workload_sparsetruncate-small
-config-global-dhp__workload_sparsetruncate-large
-config-global-dhp__workload_thpfioscale
-config-global-dhp__workload_thpfioscale-defrag
-config-global-dhp__workload_thpfioscale-madvhugepage
-config-global-dhp__reaim-io-alltests
-config-global-dhp__reaim-io-compute
-config-global-dhp__reaim-io-disk
-config-global-dhp__reaim-io-disk-large
-config-global-dhp__reaim-io-new_dbase
-config-global-dhp__reaim-io-new_fserver
-config-global-dhp__reaim-io-new_fserver-large
-config-global-dhp__reaim-io-shared
-config-global-dhp__reaim-highsys
-config-global-dhp__reaim-stress
-config-global-dhp__stress-highalloc-performance
-config-global-dhp__io-bonnie-file-async
-config-global-dhp__io-bonnie-dir-async
-config-global-dhp__io-bonnie-file-fsync
-config-global-dhp__io-bonnie-dir-fsync
-config-global-dhp__io-bonnie-file-async-fixed
-config-global-dhp__io-bonnie-dir-async-fixed
-config-global-dhp__io-bonnie-file-fsync-fixed
-config-global-dhp__io-bonnie-dir-fsync-fixed
-config-global-dhp__io-iozone
-config-global-dhp__io-iozone-small
-config-global-dhp__io-iozone-dio
-config-global-dhp__io-seeker-file-read
-config-global-dhp__io-seeker-file-write
-config-global-dhp__io-filebench-varmail-small
-config-global-dhp__io-filebench-varmail-medium
-config-global-dhp__io-filebench-varmail-large
-config-global-dhp__io-filebench-oltp-small
-config-global-dhp__io-filebench-oltp-large
-config-global-dhp__io-filebench-oltp-directio-small
-config-global-dhp__io-filebench-oltp-directio-large
-config-global-dhp__io-filebench-webserver-small
-config-global-dhp__io-filebench-webproxy-small
-config-global-dhp__io-filebench-webproxy-medium
-config-global-dhp__io-filebench-webproxy-large
-config-global-dhp__workload_thpscale
-config-global-dhp__workload_thpscale-madvhugepage
-config-global-dhp__workload_will-it-scale-io
-config-global-dhp__io-iozone-doublemem-async
-config-global-dhp__io-iozone-doublemem-fsync
-config-global-dhp__db-sqlite-insert-small
-config-global-dhp__db-sqlite-insert-medium
-config-global-dhp__io-paralleldd-read-small
-config-global-dhp__io-paralleldd-read-large
-config-global-dhp__io-paralleldd-read-small-multi
-config-global-dhp__io-paralleldd-read-large-multi
-config-global-dhp__io-fio-randread-async-randwrite
-config-global-dhp__io-fio-randread-async-seqwrite
-config-global-dhp__io-fio-randread-sync-heavywrite
-config-global-dhp__io-fio-randread-sync-randwrite
-config-global-dhp__io-fio-seqread-doublemem-4k-4t
-config-global-dhp__io-fio-seqread-doublemem-32k-4t
-config-global-dhp__io-fio-sync-maxrandwrite
-config-global-dhp__io-fio-sync-maxrandwrite-ftrace
-config-global-dhp__io-fio-sync-maxrandwrite-long-ftrace
-config-global-dhp__io-blogbench
-config-global-dhp__workload_libmicro-file
-config-global-dhp__io-xfsio
-config-global-dhp__io-xfsio-profile-normal
-config-global-dhp__workload_unixbench-io-fsbuffer
-config-global-dhp__workload_unixbench-io-fsdisk
-config-global-dhp__workload_unixbench-io-fstime
-config-global-dhp__workload_simoop-short
-config-global-dhp__speccpu2017-speed
-config-global-dhp__speccpu2017-speed-parallel-quarter
-config-global-dhp__speccpu2017-speed-parallel-half
-config-global-dhp__speccpu2017-speed-parallel-full
-config-global-dhp__speccpu2017-rate-parallel-quarter
-config-global-dhp__speccpu2017-rate-parallel-half
-config-global-dhp__speccpu2017-rate-parallel-full
-config-global-dhp__S-startup
-config-global-dhp__parsec-pthreads-half
-config-global-dhp__parsec-pthreads-full
-config-global-dhp__functional-ltp-cve
-config-global-dhp__functional-ltp-lite
-config-global-dhp__functional-xfstests-auto
+config-io-metadata
+config-io-dbench4-async
+config-io-dbench4-fsync
+config-io-fio-randread-direct-multi
+config-io-fsmark-xfsrepair
+config-pagereclaim-performance
+config-pagereclaim-shrinker
+config-workload-fsmark-50m-inode
+config-workload-fsmark-50m-zerofile-inode
+config-io-xfsrepair
+config-io-compress
+config-nas-c-class-mpi-full
+config-nas-c-class-mpi-half
+config-nas-c-class-mpi-third
+config-nas-c-class-mpi-quarter
+config-nas-d-class-mpi-bind-full
+config-nas-d-class-mpi-bind-half
+config-nas-d-class-mpi-bind-third
+config-nas-d-class-mpi-bind-quarter
+config-nas-d-class-mpi-full
+config-nas-d-class-mpi-half
+config-nas-d-class-mpi-third
+config-nas-d-class-mpi-quarter
+config-workload_mailserver
+config-workload_kerndevel
+config-workload_dedup
+config-workload_shellscripts
+config-workload_sparsetruncate-tiny
+config-workload_sparsetruncate-small
+config-workload_sparsetruncate-large
+config-workload_thpfioscale
+config-workload_thpfioscale-defrag
+config-workload_thpfioscale-madvhugepage
+config-reaim-io-alltests
+config-reaim-io-compute
+config-reaim-io-disk
+config-reaim-io-disk-large
+config-reaim-io-new_dbase
+config-reaim-io-new_fserver
+config-reaim-io-new_fserver-large
+config-reaim-io-shared
+config-reaim-highsys
+config-reaim-stress
+config-stress-highalloc-performance
+config-io-bonnie-file-async
+config-io-bonnie-dir-async
+config-io-bonnie-file-fsync
+config-io-bonnie-dir-fsync
+config-io-bonnie-file-async-fixed
+config-io-bonnie-dir-async-fixed
+config-io-bonnie-file-fsync-fixed
+config-io-bonnie-dir-fsync-fixed
+config-io-iozone
+config-io-iozone-small
+config-io-iozone-dio
+config-io-seeker-file-read
+config-io-seeker-file-write
+config-io-filebench-varmail-small
+config-io-filebench-varmail-medium
+config-io-filebench-varmail-large
+config-io-filebench-oltp-small
+config-io-filebench-oltp-large
+config-io-filebench-oltp-directio-small
+config-io-filebench-oltp-directio-large
+config-io-filebench-webserver-small
+config-io-filebench-webproxy-small
+config-io-filebench-webproxy-medium
+config-io-filebench-webproxy-large
+config-workload_thpscale
+config-workload_thpscale-madvhugepage
+config-workload_will-it-scale-io
+config-io-iozone-doublemem-async
+config-io-iozone-doublemem-fsync
+config-db-sqlite-insert-small
+config-db-sqlite-insert-medium
+config-io-paralleldd-read-small
+config-io-paralleldd-read-large
+config-io-paralleldd-read-small-multi
+config-io-paralleldd-read-large-multi
+config-io-fio-randread-async-randwrite
+config-io-fio-randread-async-seqwrite
+config-io-fio-randread-sync-heavywrite
+config-io-fio-randread-sync-randwrite
+config-io-fio-seqread-doublemem-4k-4t
+config-io-fio-seqread-doublemem-32k-4t
+config-io-fio-sync-maxrandwrite
+config-io-fio-sync-maxrandwrite-ftrace
+config-io-fio-sync-maxrandwrite-long-ftrace
+config-io-blogbench
+config-workload_libmicro-file
+config-io-xfsio
+config-io-xfsio-profile-normal
+config-workload_unixbench-io-fsbuffer
+config-workload_unixbench-io-fsdisk
+config-workload_unixbench-io-fstime
+config-workload_simoop-short
+config-speccpu2017-speed
+config-speccpu2017-speed-parallel-quarter
+config-speccpu2017-speed-parallel-half
+config-speccpu2017-speed-parallel-full
+config-speccpu2017-rate-parallel-quarter
+config-speccpu2017-rate-parallel-half
+config-speccpu2017-rate-parallel-full
+config-S-startup
+config-parsec-pthreads-half
+config-parsec-pthreads-full
+config-functional-ltp-cve
+config-functional-ltp-lite
+config-functional-xfstests-auto
 "
 
 rm -f *-ext3 *-ext4 *-btrfs *-btrfs-nocow *-xfs *-raid0 *-raid1 *-raid5
@@ -367,8 +367,8 @@ for CONFIG in $LIMITMEM_CONFIGS; do
 done
 
 TMPFS_CONFIGS="
-config-global-dhp__io-paralleldd-read-small
-config-global-dhp__pagereclaim-performance
+config-io-paralleldd-read-small
+config-pagereclaim-performance
 "
 
 for CONFIG in $TMPFS_CONFIGS; do
diff --git a/configs/config-global-dhp__S-startup b/configs/config-S-startup
similarity index 96%
rename from configs/config-global-dhp__S-startup
rename to configs/config-S-startup
index 5d4797aed..ebe3a24a8 100644
--- a/configs/config-global-dhp__S-startup
+++ b/configs/config-S-startup
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="S-startup"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__adrestia-periodic-unbound b/configs/config-adrestia-periodic-unbound
similarity index 98%
rename from configs/config-global-dhp__adrestia-periodic-unbound
rename to configs/config-adrestia-periodic-unbound
index 502f9d5fc..df06f5da4 100644
--- a/configs/config-global-dhp__adrestia-periodic-unbound
+++ b/configs/config-adrestia-periodic-unbound
@@ -15,9 +15,6 @@
 # MM Test Parameters
 export MMTESTS="adrestia-wakeup-periodic"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__adrestia-single-unbound b/configs/config-adrestia-single-unbound
similarity index 97%
rename from configs/config-global-dhp__adrestia-single-unbound
rename to configs/config-adrestia-single-unbound
index f56d83d41..2dc644145 100644
--- a/configs/config-global-dhp__adrestia-single-unbound
+++ b/configs/config-adrestia-single-unbound
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="adrestia-wakeup-single"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-pgbench-timed-ro-medium b/configs/config-db-pgbench-timed-ro-medium
similarity index 98%
rename from configs/config-global-dhp__db-pgbench-timed-ro-medium
rename to configs/config-db-pgbench-timed-ro-medium
index 18ed9faaf..e14fc798c 100644
--- a/configs/config-global-dhp__db-pgbench-timed-ro-medium
+++ b/configs/config-db-pgbench-timed-ro-medium
@@ -9,9 +9,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-pgbench-timed-ro-medium-tuned b/configs/config-db-pgbench-timed-ro-medium-tuned
similarity index 98%
rename from configs/config-global-dhp__db-pgbench-timed-ro-medium-tuned
rename to configs/config-db-pgbench-timed-ro-medium-tuned
index 0e278d736..2f623b0b1 100644
--- a/configs/config-global-dhp__db-pgbench-timed-ro-medium-tuned
+++ b/configs/config-db-pgbench-timed-ro-medium-tuned
@@ -9,9 +9,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-pgbench-timed-ro-small b/configs/config-db-pgbench-timed-ro-small
similarity index 98%
rename from configs/config-global-dhp__db-pgbench-timed-ro-small
rename to configs/config-db-pgbench-timed-ro-small
index 0090bb1a8..a51197d29 100644
--- a/configs/config-global-dhp__db-pgbench-timed-ro-small
+++ b/configs/config-db-pgbench-timed-ro-small
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-pgbench-timed-ro-small-full-hugetlbfs-tuned b/configs/config-db-pgbench-timed-ro-small-full-hugetlbfs-tuned
similarity index 98%
rename from configs/config-global-dhp__db-pgbench-timed-ro-small-full-hugetlbfs-tuned
rename to configs/config-db-pgbench-timed-ro-small-full-hugetlbfs-tuned
index 30c94fb8a..62b11977a 100644
--- a/configs/config-global-dhp__db-pgbench-timed-ro-small-full-hugetlbfs-tuned
+++ b/configs/config-db-pgbench-timed-ro-small-full-hugetlbfs-tuned
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-pgbench-timed-ro-small-full-tuned b/configs/config-db-pgbench-timed-ro-small-full-tuned
similarity index 98%
rename from configs/config-global-dhp__db-pgbench-timed-ro-small-full-tuned
rename to configs/config-db-pgbench-timed-ro-small-full-tuned
index 57120b3df..648d8dafa 100644
--- a/configs/config-global-dhp__db-pgbench-timed-ro-small-full-tuned
+++ b/configs/config-db-pgbench-timed-ro-small-full-tuned
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-pgbench-timed-ro-small-tuned b/configs/config-db-pgbench-timed-ro-small-tuned
similarity index 98%
rename from configs/config-global-dhp__db-pgbench-timed-ro-small-tuned
rename to configs/config-db-pgbench-timed-ro-small-tuned
index aa09bc2bd..0263f78a6 100644
--- a/configs/config-global-dhp__db-pgbench-timed-ro-small-tuned
+++ b/configs/config-db-pgbench-timed-ro-small-tuned
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-pgbench-timed-rw-medium b/configs/config-db-pgbench-timed-rw-medium
similarity index 98%
rename from configs/config-global-dhp__db-pgbench-timed-rw-medium
rename to configs/config-db-pgbench-timed-rw-medium
index 642bd38e5..a1bb2dd28 100644
--- a/configs/config-global-dhp__db-pgbench-timed-rw-medium
+++ b/configs/config-db-pgbench-timed-rw-medium
@@ -10,9 +10,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-pgbench-timed-rw-medium-tuned b/configs/config-db-pgbench-timed-rw-medium-tuned
similarity index 98%
rename from configs/config-global-dhp__db-pgbench-timed-rw-medium-tuned
rename to configs/config-db-pgbench-timed-rw-medium-tuned
index 345e2a5b6..75936589e 100644
--- a/configs/config-global-dhp__db-pgbench-timed-rw-medium-tuned
+++ b/configs/config-db-pgbench-timed-rw-medium-tuned
@@ -10,9 +10,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-pgbench-timed-rw-small b/configs/config-db-pgbench-timed-rw-small
similarity index 98%
rename from configs/config-global-dhp__db-pgbench-timed-rw-small
rename to configs/config-db-pgbench-timed-rw-small
index 5b0e1f756..558a2bc6e 100644
--- a/configs/config-global-dhp__db-pgbench-timed-rw-small
+++ b/configs/config-db-pgbench-timed-rw-small
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-pgbench-timed-rw-small-tuned b/configs/config-db-pgbench-timed-rw-small-tuned
similarity index 98%
rename from configs/config-global-dhp__db-pgbench-timed-rw-small-tuned
rename to configs/config-db-pgbench-timed-rw-small-tuned
index 5c0d5ee01..c5dc691bb 100644
--- a/configs/config-global-dhp__db-pgbench-timed-rw-small-tuned
+++ b/configs/config-db-pgbench-timed-rw-small-tuned
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-sqlite-insert-medium b/configs/config-db-sqlite-insert-medium
similarity index 97%
rename from configs/config-global-dhp__db-sqlite-insert-medium
rename to configs/config-db-sqlite-insert-medium
index ce36f90cf..84acc23b5 100644
--- a/configs/config-global-dhp__db-sqlite-insert-medium
+++ b/configs/config-db-sqlite-insert-medium
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="sqlite"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-sqlite-insert-small b/configs/config-db-sqlite-insert-small
similarity index 97%
rename from configs/config-global-dhp__db-sqlite-insert-small
rename to configs/config-db-sqlite-insert-small
index c6527a337..824090e06 100644
--- a/configs/config-global-dhp__db-sqlite-insert-small
+++ b/configs/config-db-sqlite-insert-small
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="sqlite"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-sysbench-mariadb-oltp-ro-medium b/configs/config-db-sysbench-mariadb-oltp-ro-medium
similarity index 98%
rename from configs/config-global-dhp__db-sysbench-mariadb-oltp-ro-medium
rename to configs/config-db-sysbench-mariadb-oltp-ro-medium
index cccbf784c..6942b1d84 100644
--- a/configs/config-global-dhp__db-sysbench-mariadb-oltp-ro-medium
+++ b/configs/config-db-sysbench-mariadb-oltp-ro-medium
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="sysbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-sysbench-mariadb-oltp-ro-small b/configs/config-db-sysbench-mariadb-oltp-ro-small
similarity index 98%
rename from configs/config-global-dhp__db-sysbench-mariadb-oltp-ro-small
rename to configs/config-db-sysbench-mariadb-oltp-ro-small
index 73c53701b..8e27ed8d9 100644
--- a/configs/config-global-dhp__db-sysbench-mariadb-oltp-ro-small
+++ b/configs/config-db-sysbench-mariadb-oltp-ro-small
@@ -9,9 +9,6 @@
 # MM Test Parameters
 export MMTESTS="sysbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-sysbench-mariadb-oltp-rw-medium b/configs/config-db-sysbench-mariadb-oltp-rw-medium
similarity index 98%
rename from configs/config-global-dhp__db-sysbench-mariadb-oltp-rw-medium
rename to configs/config-db-sysbench-mariadb-oltp-rw-medium
index c14ce134a..d4fa70120 100644
--- a/configs/config-global-dhp__db-sysbench-mariadb-oltp-rw-medium
+++ b/configs/config-db-sysbench-mariadb-oltp-rw-medium
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="sysbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-sysbench-mariadb-oltp-rw-small b/configs/config-db-sysbench-mariadb-oltp-rw-small
similarity index 98%
rename from configs/config-global-dhp__db-sysbench-mariadb-oltp-rw-small
rename to configs/config-db-sysbench-mariadb-oltp-rw-small
index fb1556845..0e26cf806 100644
--- a/configs/config-global-dhp__db-sysbench-mariadb-oltp-rw-small
+++ b/configs/config-db-sysbench-mariadb-oltp-rw-small
@@ -9,9 +9,6 @@
 # MM Test Parameters
 export MMTESTS="sysbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-sysbench-postgres-oltp-ro-medium b/configs/config-db-sysbench-postgres-oltp-ro-medium
similarity index 97%
rename from configs/config-global-dhp__db-sysbench-postgres-oltp-ro-medium
rename to configs/config-db-sysbench-postgres-oltp-ro-medium
index 0858117e9..59fd15967 100644
--- a/configs/config-global-dhp__db-sysbench-postgres-oltp-ro-medium
+++ b/configs/config-db-sysbench-postgres-oltp-ro-medium
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="sysbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-sysbench-postgres-oltp-ro-small b/configs/config-db-sysbench-postgres-oltp-ro-small
similarity index 97%
rename from configs/config-global-dhp__db-sysbench-postgres-oltp-ro-small
rename to configs/config-db-sysbench-postgres-oltp-ro-small
index 3dff6d0a1..52bc2c00a 100644
--- a/configs/config-global-dhp__db-sysbench-postgres-oltp-ro-small
+++ b/configs/config-db-sysbench-postgres-oltp-ro-small
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="sysbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-sysbench-postgres-oltp-rw-medium b/configs/config-db-sysbench-postgres-oltp-rw-medium
similarity index 97%
rename from configs/config-global-dhp__db-sysbench-postgres-oltp-rw-medium
rename to configs/config-db-sysbench-postgres-oltp-rw-medium
index 337797081..730956b00 100644
--- a/configs/config-global-dhp__db-sysbench-postgres-oltp-rw-medium
+++ b/configs/config-db-sysbench-postgres-oltp-rw-medium
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="sysbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__db-sysbench-postgres-oltp-rw-small b/configs/config-db-sysbench-postgres-oltp-rw-small
similarity index 97%
rename from configs/config-global-dhp__db-sysbench-postgres-oltp-rw-small
rename to configs/config-db-sysbench-postgres-oltp-rw-small
index 7dfa20565..9444afc87 100644
--- a/configs/config-global-dhp__db-sysbench-postgres-oltp-rw-small
+++ b/configs/config-db-sysbench-postgres-oltp-rw-small
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="sysbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__functional-ltp-cve b/configs/config-functional-ltp-cve
similarity index 100%
rename from configs/config-global-dhp__functional-ltp-cve
rename to configs/config-functional-ltp-cve
diff --git a/configs/config-global-dhp__functional-ltp-lite b/configs/config-functional-ltp-lite
similarity index 100%
rename from configs/config-global-dhp__functional-ltp-lite
rename to configs/config-functional-ltp-lite
diff --git a/configs/config-global-dhp__functional-pistress b/configs/config-functional-pistress
similarity index 93%
rename from configs/config-global-dhp__functional-pistress
rename to configs/config-functional-pistress
index 2ac6f06a8..7efa81fc9 100644
--- a/configs/config-global-dhp__functional-pistress
+++ b/configs/config-functional-pistress
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="pistress"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
 
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
diff --git a/configs/config-global-dhp__functional-xfstests-auto b/configs/config-functional-xfstests-auto
similarity index 100%
rename from configs/config-global-dhp__functional-xfstests-auto
rename to configs/config-functional-xfstests-auto
diff --git a/configs/config-global-dhp__hpcg-serial-long b/configs/config-global-dhp__hpcg-serial-long
deleted file mode 100644
index b713364b5..000000000
--- a/configs/config-global-dhp__hpcg-serial-long
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# MM Test Parameters
-export MMTESTS="hpcg-serial"
-
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=xfs
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=inode64,delaylog,logbsize=262144,nobarrier
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS=
-export MONITORS_PLAIN=
-export MONITORS_GZIP="proc-vmstat top mpstat"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=10
-
-# HPC Challenge
-export HPCG_MPI_PATH=/usr/lib64/mpi/gcc/openmpi/bin
-export HPCG_DURATION=1800
-export HPCG_ITERATIONS=3
diff --git a/configs/config-global-dhp__hpcg-serial-short b/configs/config-global-dhp__hpcg-serial-short
deleted file mode 100644
index 94b699bc0..000000000
--- a/configs/config-global-dhp__hpcg-serial-short
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# MM Test Parameters
-export MMTESTS="hpcg-serial"
-
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=xfs
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=inode64,delaylog,logbsize=262144,nobarrier
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS=
-export MONITORS_PLAIN=
-export MONITORS_GZIP="proc-vmstat top mpstat"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=10
-
-# HPC Challenge
-export HPCG_MPI_PATH=/usr/lib64/mpi/gcc/openmpi/bin
-export HPCG_DURATION=60
-export HPCG_ITERATIONS=3
diff --git a/configs/config-global-dhp__io-bonnie-dir-async-fixed b/configs/config-global-dhp__io-bonnie-dir-async-fixed
deleted file mode 100644
index bc701dd60..000000000
--- a/configs/config-global-dhp__io-bonnie-dir-async-fixed
+++ /dev/null
@@ -1,38 +0,0 @@
-### The bonnie IO benchmark generates a number of basic IO patterns simulating
-### the operations of a busy file server. The dataset size is 1G with 1024
-### files and the IO is asynchronous. Note that the fixed dataset size is
-### smaller than most servers memory meaning that the benchmark may run
-### entirely in memory. Some aspects of the test may be so short-lived that
-### the results are inconclusive.
-
-# MM Test Parameters
-export MMTESTS="bonnie"
-
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=xfs
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=inode64,delaylog,logbsize=262144,nobarrier
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS=
-export MONITORS_PLAIN=
-export MONITORS_GZIP="proc-vmstat top"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=10
-
-# bonnie
-export BONNIE_NR_FILES=20480
-export BONNIE_DIRECTORY_SIZE=$((1048576*1024/BONNIE_NR_FILES))
-export BONNIE_NR_DIRECTORIES=20
-export BONNIE_ITERATIONS=5
-export BONNIE_FSYNC=no
diff --git a/configs/config-global-dhp__io-bonnie-dir-fsync-fixed b/configs/config-global-dhp__io-bonnie-dir-fsync-fixed
deleted file mode 100644
index 1e5004080..000000000
--- a/configs/config-global-dhp__io-bonnie-dir-fsync-fixed
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# MM Test Parameters
-export MMTESTS="bonnie"
-
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=xfs
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=inode64,delaylog,logbsize=262144,nobarrier
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS=
-export MONITORS_PLAIN=
-export MONITORS_GZIP="proc-vmstat top"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=10
-
-# bonnie
-export BONNIE_NR_FILES=15360
-export BONNIE_DIRECTORY_SIZE=$((1048576*1024/BONNIE_NR_FILES))
-export BONNIE_NR_DIRECTORIES=15
-export BONNIE_ITERATIONS=5
-export BONNIE_FSYNC=yes
diff --git a/configs/config-global-dhp__io-bonnie-file-async-fixed b/configs/config-global-dhp__io-bonnie-file-async-fixed
deleted file mode 100644
index 1a9ef3ea3..000000000
--- a/configs/config-global-dhp__io-bonnie-file-async-fixed
+++ /dev/null
@@ -1,36 +0,0 @@
-### The bonnie IO benchmark generates a number of basic IO patterns simulating
-### the operations of a busy file server. The dataset size is 1G with 1024
-### files and the IO is asynchronous. Note that the fixed dataset size is
-### smaller than most servers memory meaning that the benchmark may run
-### entirely in memory. Some aspects of the test may be so short-lived that
-### the results are inconclusive.
-
-# MM Test Parameters
-export MMTESTS="bonnie"
-
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=xfs
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=inode64,delaylog,logbsize=262144,nobarrier
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS=
-export MONITORS_PLAIN=
-export MONITORS_GZIP="proc-vmstat top"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=10
-
-# bonnie
-export BONNIE_DATASET_SIZE=$((1048576*1024))
-export BONNIE_ITERATIONS=3
-export BONNIE_FSYNC=no
diff --git a/configs/config-global-dhp__io-bonnie-file-fsync-fixed b/configs/config-global-dhp__io-bonnie-file-fsync-fixed
deleted file mode 100644
index a8737ccb6..000000000
--- a/configs/config-global-dhp__io-bonnie-file-fsync-fixed
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# MM Test Parameters
-export MMTESTS="bonnie"
-
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=xfs
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=inode64,delaylog,logbsize=262144,nobarrier
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS=
-export MONITORS_PLAIN=
-export MONITORS_GZIP="proc-vmstat top"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=10
-
-# bonnie
-export BONNIE_DATASET_SIZE=$((1048576*1024))
-export BONNIE_ITERATIONS=3
-export BONNIE_FSYNC=yes
diff --git a/configs/config-global-dhp__io-largeread-starvation b/configs/config-global-dhp__io-largeread-starvation
deleted file mode 100644
index e74b078c6..000000000
--- a/configs/config-global-dhp__io-largeread-starvation
+++ /dev/null
@@ -1,60 +0,0 @@
-### This configuration runs a number of basic workloads and in parallel
-### there are large files being read. The objective is to measure how
-### a few different workloads are affected by or how they starve parallel
-### reads. Poor results in these areas tend to manifest as poor
-### interactivity experiences
-###
-### gitcheckout checks out different branches of the kernel tree multple
-### times as it has been observed that large checkouts has stalled the
-### system at various times in the past
-###
-### stutter simulates a simple workload. One part uses a lot of anonymous
-### memory, a second measures mmap latency and a third copies a large file.
-### The primary metric is checking for mmap latency.
-
-# MM Test Parameters
-export MMTESTS="gitcheckout stutter"
-
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=ext3
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=""
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS="read-latency"
-export MONITORS_PLAIN=
-export MONITORS_GZIP="proc-vmstat top"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=10
-export MONITOR_READ_LATENCY_RANDOM=no
-export MONITOR_READ_LATENCY_READSIZE_MB=32
-
-# Large copy and untar
-export LARGECOPY_SRCTAR=$WEBROOT/large-tar-file-1.tar.bz2
-export LARGECOPY_TARGETSIZE_MB=$((MEMTOTAL_BYTES*2/1048576))
-export LARGECOPY_THREADS=1
-
-# GIMP simple test
-
-# Git checkout
-export GITCHECKOUT_SOURCETAR=$WEBROOT/gitcheckout/linux-2.6.tar.gz
-export GITCHECKOUT_SOURCE=$SSHROOT/linux-2.6
-export GITCHECKOUT_COMMITS=v2.6.14,v3.2,v2.6.16,v3.4,v2.6.18
-export GITCHECKOUT_ITERATIONS=15
-export GITCHECKOUT_CACHE=hot
-
-# stutter
-export STUTTER_MEMFAULT_SIZE=$((MEMTOTAL_BYTES*3/4))
-export STUTTER_MEMFAULT_TMPFS=no
-export STUTTER_FILESIZE=$(($MEMTOTAL_BYTES*2))
-export STUTTER_BLOCKSIZE=$((2*1048576))
diff --git a/configs/config-global-dhp__io-randread-starvation b/configs/config-global-dhp__io-randread-starvation
deleted file mode 100644
index 99ab3e116..000000000
--- a/configs/config-global-dhp__io-randread-starvation
+++ /dev/null
@@ -1,59 +0,0 @@
-### This configuration runs a number of basic workloads and in parallel
-### there a large file being randomly accessed. The objective is to measure
-### how a few different workloads are affected by IO or how they starve
-### parallel reads. Poor results in these areas tend to manifest as a poor
-### interactivity experience.
-###
-### gitcheckout checks out different branches of the kernel tree multple
-### times as it has been observed that large checkouts has stalled the
-### system at various times in the past
-###
-### stutter simualtes a simple workload. One part uses a lot of anonymous
-### memory, a second measures mmap latency and a third copies a large file.
-### The primary metric is checking for mmap latency.
-
-# MM Test Parameters
-export MMTESTS="gitcheckout stutter"
-
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=ext3
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=""
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS="read-latency"
-export MONITORS_PLAIN=
-export MONITORS_GZIP="proc-vmstat top"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=10
-export MONITOR_READ_LATENCY_RANDOM=yes
-
-# Large copy and untar
-export LARGECOPY_SRCTAR=$WEBROOT/large-tar-file-1.tar.bz2
-export LARGECOPY_TARGETSIZE_MB=$((MEMTOTAL_BYTES*2/1048576))
-export LARGECOPY_THREADS=1
-
-# GIMP simple test
-
-# Git checkout
-export GITCHECKOUT_SOURCETAR=$WEBROOT/gitcheckout/linux-2.6.tar.gz
-export GITCHECKOUT_SOURCE=$SSHROOT/linux-2.6
-export GITCHECKOUT_COMMITS=v2.6.14,v3.2,v2.6.16,v3.4,v2.6.18
-export GITCHECKOUT_ITERATIONS=15
-export GITCHECKOUT_CACHE=hot
-
-# stutter
-export STUTTER_MEMFAULT_SIZE=$((MEMTOTAL_BYTES*3/4))
-export STUTTER_MEMFAULT_TMPFS=no
-export STUTTER_FILESIZE=$(($MEMTOTAL_BYTES*2))
-export STUTTER_BLOCKSIZE=$((2*1048576))
diff --git a/configs/config-global-dhp__io-sync-starvation b/configs/config-global-dhp__io-sync-starvation
deleted file mode 100644
index 07b61f7ec..000000000
--- a/configs/config-global-dhp__io-sync-starvation
+++ /dev/null
@@ -1,59 +0,0 @@
-### This configuration runs a number of basic workloads and in parallel
-### there are large files being read. The objective is to measure how
-### a few different workloads are affected by or how they starve parallel
-### reads. Poor results in these areas tend to manifest as poor
-### interactivity experiences
-###
-### gitcheckout checks out different branches of the kernel tree multple
-### times as it has been observed that large checkouts has stalled the
-### system at various times in the past
-###
-### stutter simulates a simple workload. One part uses a lot of anonymous
-### memory, a second measures mmap latency and a third copies a large file.
-### The primary metric is checking for mmap latency.
-
-# MM Test Parameters
-export MMTESTS="gitcheckout stutter"
-
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=ext3
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=""
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS="sync-latency"
-export MONITORS_PLAIN=
-export MONITORS_GZIP="proc-vmstat top"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=10
-export MONITOR_SYNC_LATENCY_SYNCPAUSE_MS=10000
-
-# Large copy and untar
-export LARGECOPY_SRCTAR=$WEBROOT/large-tar-file-1.tar.bz2
-export LARGECOPY_TARGETSIZE_MB=$((MEMTOTAL_BYTES*2/1048576))
-export LARGECOPY_THREADS=1
-
-# GIMP simple test
-
-# Git checkout
-export GITCHECKOUT_SOURCETAR=$WEBROOT/gitcheckout/linux-2.6.tar.gz
-export GITCHECKOUT_SOURCE=$SSHROOT/linux-2.6
-export GITCHECKOUT_COMMITS=v2.6.14,v3.2,v2.6.16,v3.4,v2.6.18
-export GITCHECKOUT_ITERATIONS=15
-export GITCHECKOUT_CACHE=hot
-
-# stutter
-export STUTTER_MEMFAULT_SIZE=$((MEMTOTAL_BYTES*3/4))
-export STUTTER_MEMFAULT_TMPFS=no
-export STUTTER_FILESIZE=$(($MEMTOTAL_BYTES*2))
-export STUTTER_BLOCKSIZE=$((2*1048576))
diff --git a/configs/config-global__thp-performance b/configs/config-global__thp-performance
deleted file mode 100644
index ad7d9d8fe..000000000
--- a/configs/config-global__thp-performance
+++ /dev/null
@@ -1,50 +0,0 @@
-
-# MM Test Parameters
-export MMTESTS="speccpu specomp specjvm"
-
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=ext3
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS="size=$((MEMTOTAL_BYTES))"
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS=
-export MONITORS_PLAIN=
-export MONITORS_GZIP=
-export MONITORS_WITH_LATENCY=
-export MONITOR_UPDATE_FREQUENCY=10
-
-# SPECcpu
-export SPECCPU_LICENSE_ACCEPTED=no
-export SPECCPU_DEFAULT_SIZE=ref
-export SPECCPU_DEFAULT_ITER=3
-export SPECCPU_PAGESIZES="base huge-all transhuge"
-
-# SPECjvm
-export SPECJVM_JRE=/opt/java/jre/bin
-export SPECJVM_DEFAULT_ITERATION_TIME=300
-export SPECJVM_DEFAULT_WARMUP_TIME=120
-export SPECJVM_DEFAULT_TERATIONS=1
-export SPECJVM_MAXHEAP=-Xmx756m
-export SPECJVM_PAGESIZES="base huge transhuge"
-export SPECJVM_HUGESWITCH=-Xlp
-if [[ `uname -m` =~ i.86 ]]; then
-	# Sun JRE which works better on x86 uses this switch
-	export SPECJVM_HUGESWITCH=-XX:+UseLargePages
-fi
-
-# SPEComp
-export SPECOMP_LICENSE_ACCEPTED=no
-export SPECOMP_DEFAULT_SIZE=ref
-export SPECOMP_DEFAULT_ITER=3
-export SPECOMP_PAGESIZES="base huge-all transhuge"
diff --git a/configs/config-global-dhp__graph500-omp-infant b/configs/config-graph500-omp-infant
similarity index 92%
rename from configs/config-global-dhp__graph500-omp-infant
rename to configs/config-graph500-omp-infant
index 9d545dbe8..f3427644d 100644
--- a/configs/config-global-dhp__graph500-omp-infant
+++ b/configs/config-graph500-omp-infant
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="graph500-omp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__graph500-omp-kinder b/configs/config-graph500-omp-kinder
similarity index 92%
rename from configs/config-global-dhp__graph500-omp-kinder
rename to configs/config-graph500-omp-kinder
index d43f0eddb..b30623353 100644
--- a/configs/config-global-dhp__graph500-omp-kinder
+++ b/configs/config-graph500-omp-kinder
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="graph500-omp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__graph500-omp-toy b/configs/config-graph500-omp-toy
similarity index 91%
rename from configs/config-global-dhp__graph500-omp-toy
rename to configs/config-graph500-omp-toy
index 5e6922b5d..7464f7089 100644
--- a/configs/config-global-dhp__graph500-omp-toy
+++ b/configs/config-graph500-omp-toy
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="graph500-omp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__hpcc-large b/configs/config-hpcc-large
similarity index 92%
rename from configs/config-global-dhp__hpcc-large
rename to configs/config-hpcc-large
index 2190066c5..c0a341983 100644
--- a/configs/config-global-dhp__hpcc-large
+++ b/configs/config-hpcc-large
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="hpcc"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__hpcc-small b/configs/config-hpcc-small
similarity index 92%
rename from configs/config-global-dhp__hpcc-small
rename to configs/config-hpcc-small
index 7362e4cb4..0314f9850 100644
--- a/configs/config-global-dhp__hpcc-small
+++ b/configs/config-hpcc-small
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="hpcc"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__hpcg-gcc-mpi-long b/configs/config-hpcg-gcc-mpi-long
similarity index 92%
rename from configs/config-global-dhp__hpcg-gcc-mpi-long
rename to configs/config-hpcg-gcc-mpi-long
index 9fe817cb3..6588f9988 100644
--- a/configs/config-global-dhp__hpcg-gcc-mpi-long
+++ b/configs/config-hpcg-gcc-mpi-long
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="hpcg-gcc-mpi"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__hpcg-gcc-mpi-short b/configs/config-hpcg-gcc-mpi-short
similarity index 92%
rename from configs/config-global-dhp__hpcg-gcc-mpi-short
rename to configs/config-hpcg-gcc-mpi-short
index 0e8ba6bed..68a4b6815 100644
--- a/configs/config-global-dhp__hpcg-gcc-mpi-short
+++ b/configs/config-hpcg-gcc-mpi-short
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="hpcg-gcc-mpi"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__hpcg-gcc-omp-long b/configs/config-hpcg-gcc-omp-long
similarity index 92%
rename from configs/config-global-dhp__hpcg-gcc-omp-long
rename to configs/config-hpcg-gcc-omp-long
index aef086850..c331011fb 100644
--- a/configs/config-global-dhp__hpcg-gcc-omp-long
+++ b/configs/config-hpcg-gcc-omp-long
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="hpcg-gcc-omp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__hpcg-gcc-omp-mpi-long b/configs/config-hpcg-gcc-omp-mpi-long
similarity index 92%
rename from configs/config-global-dhp__hpcg-gcc-omp-mpi-long
rename to configs/config-hpcg-gcc-omp-mpi-long
index a117fcca2..96b7e535d 100644
--- a/configs/config-global-dhp__hpcg-gcc-omp-mpi-long
+++ b/configs/config-hpcg-gcc-omp-mpi-long
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="hpcg-gcc-omp-mpi"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__hpcg-gcc-omp-mpi-short b/configs/config-hpcg-gcc-omp-mpi-short
similarity index 92%
rename from configs/config-global-dhp__hpcg-gcc-omp-mpi-short
rename to configs/config-hpcg-gcc-omp-mpi-short
index 76c0a2da0..6b0af2b7d 100644
--- a/configs/config-global-dhp__hpcg-gcc-omp-mpi-short
+++ b/configs/config-hpcg-gcc-omp-mpi-short
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="hpcg-gcc-omp-mpi"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__hpcg-gcc-omp-short b/configs/config-hpcg-gcc-omp-short
similarity index 92%
rename from configs/config-global-dhp__hpcg-gcc-omp-short
rename to configs/config-hpcg-gcc-omp-short
index c091d886b..25de926bf 100644
--- a/configs/config-global-dhp__hpcg-gcc-omp-short
+++ b/configs/config-hpcg-gcc-omp-short
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="hpcg-gcc-omp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__http-phpbench b/configs/config-http-phpbench
similarity index 81%
rename from configs/config-global-dhp__http-phpbench
rename to configs/config-http-phpbench
index 7bc868e52..ce42bfc5d 100644
--- a/configs/config-global-dhp__http-phpbench
+++ b/configs/config-http-phpbench
@@ -4,15 +4,6 @@
 # MM Test Parameters
 export MMTESTS="phpbench"
 
-
-# Machine configuration
-
-# Log disk to setup (optional)
-#export LOGDISK_PARTITION=/dev/ram0
-#export LOGDISK_FILESYSTEM=ext3
-#export LOGDISK_MKFS_PARAM=""
-#export LOGDISK_MOUNT_ARGS=""
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__http-siege b/configs/config-http-siege
similarity index 98%
rename from configs/config-global-dhp__http-siege
rename to configs/config-http-siege
index 2ce3aa577..726aa3cc3 100644
--- a/configs/config-global-dhp__http-siege
+++ b/configs/config-http-siege
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="siege"
 
-
-# Machine configuration
-
 # Log disk to setup (optional)
 #export LOGDISK_PARTITION=/dev/ram0
 #export LOGDISK_FILESYSTEM=ext3
diff --git a/configs/config-global-dhp__io-blogbench b/configs/config-io-blogbench
similarity index 97%
rename from configs/config-global-dhp__io-blogbench
rename to configs/config-io-blogbench
index 138edbc98..56a93b2ec 100644
--- a/configs/config-global-dhp__io-blogbench
+++ b/configs/config-io-blogbench
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="blogbench"
 
-
-# Machine configuration
-
 # Log disk to setup (optional)
 #export LOGDISK_PARTITION=/dev/ram0
 #export LOGDISK_FILESYSTEM=ext3
diff --git a/configs/config-global-dhp__io-bonnie-dir-async b/configs/config-io-bonnie-dir-async
similarity index 97%
rename from configs/config-global-dhp__io-bonnie-dir-async
rename to configs/config-io-bonnie-dir-async
index acb5d5ea3..34bb55b62 100644
--- a/configs/config-global-dhp__io-bonnie-dir-async
+++ b/configs/config-io-bonnie-dir-async
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="bonnie"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-bonnie-dir-fsync b/configs/config-io-bonnie-dir-fsync
similarity index 97%
rename from configs/config-global-dhp__io-bonnie-dir-fsync
rename to configs/config-io-bonnie-dir-fsync
index e9769c1ac..1f2350219 100644
--- a/configs/config-global-dhp__io-bonnie-dir-fsync
+++ b/configs/config-io-bonnie-dir-fsync
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="bonnie"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-bonnie-file-async b/configs/config-io-bonnie-file-async
similarity index 97%
rename from configs/config-global-dhp__io-bonnie-file-async
rename to configs/config-io-bonnie-file-async
index c41053451..0de1f1d46 100644
--- a/configs/config-global-dhp__io-bonnie-file-async
+++ b/configs/config-io-bonnie-file-async
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="bonnie"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-bonnie-file-fsync b/configs/config-io-bonnie-file-fsync
similarity index 97%
rename from configs/config-global-dhp__io-bonnie-file-fsync
rename to configs/config-io-bonnie-file-fsync
index 5d534876e..6be0e45a2 100644
--- a/configs/config-global-dhp__io-bonnie-file-fsync
+++ b/configs/config-io-bonnie-file-fsync
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="bonnie"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-dbench4-async b/configs/config-io-dbench4-async
similarity index 98%
rename from configs/config-global-dhp__io-dbench4-async
rename to configs/config-io-dbench4-async
index b5818cc0d..0e2cc43dd 100644
--- a/configs/config-global-dhp__io-dbench4-async
+++ b/configs/config-io-dbench4-async
@@ -18,9 +18,6 @@
 # MM Test Parameters
 export MMTESTS="dbench4"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-dbench4-fsync b/configs/config-io-dbench4-fsync
similarity index 98%
rename from configs/config-global-dhp__io-dbench4-fsync
rename to configs/config-io-dbench4-fsync
index 31c86ca21..54ce17d39 100644
--- a/configs/config-global-dhp__io-dbench4-fsync
+++ b/configs/config-io-dbench4-fsync
@@ -19,9 +19,6 @@
 # MM Test Parameters
 export MMTESTS="dbench4"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-oltp-directio-large b/configs/config-io-filebench-oltp-directio-large
similarity index 98%
rename from configs/config-global-dhp__io-filebench-oltp-directio-large
rename to configs/config-io-filebench-oltp-directio-large
index eac4f1497..1335c5ea1 100644
--- a/configs/config-global-dhp__io-filebench-oltp-directio-large
+++ b/configs/config-io-filebench-oltp-directio-large
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-oltp-directio-small b/configs/config-io-filebench-oltp-directio-small
similarity index 98%
rename from configs/config-global-dhp__io-filebench-oltp-directio-small
rename to configs/config-io-filebench-oltp-directio-small
index 5e61e0e9a..39140f818 100644
--- a/configs/config-global-dhp__io-filebench-oltp-directio-small
+++ b/configs/config-io-filebench-oltp-directio-small
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-oltp-large b/configs/config-io-filebench-oltp-large
similarity index 98%
rename from configs/config-global-dhp__io-filebench-oltp-large
rename to configs/config-io-filebench-oltp-large
index c27d65b59..323cca6a3 100644
--- a/configs/config-global-dhp__io-filebench-oltp-large
+++ b/configs/config-io-filebench-oltp-large
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-oltp-small b/configs/config-io-filebench-oltp-small
similarity index 98%
rename from configs/config-global-dhp__io-filebench-oltp-small
rename to configs/config-io-filebench-oltp-small
index 0675563f0..739f643fe 100644
--- a/configs/config-global-dhp__io-filebench-oltp-small
+++ b/configs/config-io-filebench-oltp-small
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-varmail-large b/configs/config-io-filebench-varmail-large
similarity index 98%
rename from configs/config-global-dhp__io-filebench-varmail-large
rename to configs/config-io-filebench-varmail-large
index 67c816397..5637c4ee1 100644
--- a/configs/config-global-dhp__io-filebench-varmail-large
+++ b/configs/config-io-filebench-varmail-large
@@ -15,9 +15,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-varmail-medium b/configs/config-io-filebench-varmail-medium
similarity index 98%
rename from configs/config-global-dhp__io-filebench-varmail-medium
rename to configs/config-io-filebench-varmail-medium
index c49aa1bf5..a6d1cf2dd 100644
--- a/configs/config-global-dhp__io-filebench-varmail-medium
+++ b/configs/config-io-filebench-varmail-medium
@@ -15,9 +15,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-varmail-small b/configs/config-io-filebench-varmail-small
similarity index 98%
rename from configs/config-global-dhp__io-filebench-varmail-small
rename to configs/config-io-filebench-varmail-small
index ceec0753e..eda56daca 100644
--- a/configs/config-global-dhp__io-filebench-varmail-small
+++ b/configs/config-io-filebench-varmail-small
@@ -15,9 +15,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-webproxy-large b/configs/config-io-filebench-webproxy-large
similarity index 98%
rename from configs/config-global-dhp__io-filebench-webproxy-large
rename to configs/config-io-filebench-webproxy-large
index 0ecd72809..766028c67 100644
--- a/configs/config-global-dhp__io-filebench-webproxy-large
+++ b/configs/config-io-filebench-webproxy-large
@@ -14,9 +14,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-webproxy-medium b/configs/config-io-filebench-webproxy-medium
similarity index 98%
rename from configs/config-global-dhp__io-filebench-webproxy-medium
rename to configs/config-io-filebench-webproxy-medium
index 0b9bf54a3..125ab68e4 100644
--- a/configs/config-global-dhp__io-filebench-webproxy-medium
+++ b/configs/config-io-filebench-webproxy-medium
@@ -14,9 +14,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-webproxy-small b/configs/config-io-filebench-webproxy-small
similarity index 98%
rename from configs/config-global-dhp__io-filebench-webproxy-small
rename to configs/config-io-filebench-webproxy-small
index 4d5032195..c8b3e6e2b 100644
--- a/configs/config-global-dhp__io-filebench-webproxy-small
+++ b/configs/config-io-filebench-webproxy-small
@@ -14,9 +14,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-filebench-webserver-small b/configs/config-io-filebench-webserver-small
similarity index 98%
rename from configs/config-global-dhp__io-filebench-webserver-small
rename to configs/config-io-filebench-webserver-small
index f29fbc959..07b6128d5 100644
--- a/configs/config-global-dhp__io-filebench-webserver-small
+++ b/configs/config-io-filebench-webserver-small
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="filebench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-randread-async-randwrite b/configs/config-io-fio-randread-async-randwrite
similarity index 98%
rename from configs/config-global-dhp__io-fio-randread-async-randwrite
rename to configs/config-io-fio-randread-async-randwrite
index af6a601fa..518cd6ac7 100644
--- a/configs/config-global-dhp__io-fio-randread-async-randwrite
+++ b/configs/config-io-fio-randread-async-randwrite
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-randread-async-seqwrite b/configs/config-io-fio-randread-async-seqwrite
similarity index 98%
rename from configs/config-global-dhp__io-fio-randread-async-seqwrite
rename to configs/config-io-fio-randread-async-seqwrite
index 3651437ca..8df6ace2e 100644
--- a/configs/config-global-dhp__io-fio-randread-async-seqwrite
+++ b/configs/config-io-fio-randread-async-seqwrite
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-randread-direct-multi b/configs/config-io-fio-randread-direct-multi
similarity index 97%
rename from configs/config-global-dhp__io-fio-randread-direct-multi
rename to configs/config-io-fio-randread-direct-multi
index 1cc929a0a..81df4682c 100644
--- a/configs/config-global-dhp__io-fio-randread-direct-multi
+++ b/configs/config-io-fio-randread-direct-multi
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-randread-sync-heavywrite b/configs/config-io-fio-randread-sync-heavywrite
similarity index 98%
rename from configs/config-global-dhp__io-fio-randread-sync-heavywrite
rename to configs/config-io-fio-randread-sync-heavywrite
index e9b1c4f08..13dc5f552 100644
--- a/configs/config-global-dhp__io-fio-randread-sync-heavywrite
+++ b/configs/config-io-fio-randread-sync-heavywrite
@@ -14,9 +14,6 @@
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-randread-sync-randwrite b/configs/config-io-fio-randread-sync-randwrite
similarity index 98%
rename from configs/config-global-dhp__io-fio-randread-sync-randwrite
rename to configs/config-io-fio-randread-sync-randwrite
index 5e06064e4..bf5b55cd0 100644
--- a/configs/config-global-dhp__io-fio-randread-sync-randwrite
+++ b/configs/config-io-fio-randread-sync-randwrite
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-scaling b/configs/config-io-fio-scaling
similarity index 97%
rename from configs/config-global-dhp__io-fio-scaling
rename to configs/config-io-fio-scaling
index 77000d383..a310c0861 100644
--- a/configs/config-global-dhp__io-fio-scaling
+++ b/configs/config-io-fio-scaling
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-seqread-doublemem-32k-4t b/configs/config-io-fio-seqread-doublemem-32k-4t
similarity index 97%
rename from configs/config-global-dhp__io-fio-seqread-doublemem-32k-4t
rename to configs/config-io-fio-seqread-doublemem-32k-4t
index 316185872..43a08321c 100644
--- a/configs/config-global-dhp__io-fio-seqread-doublemem-32k-4t
+++ b/configs/config-io-fio-seqread-doublemem-32k-4t
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-seqread-doublemem-4k-4t b/configs/config-io-fio-seqread-doublemem-4k-4t
similarity index 97%
rename from configs/config-global-dhp__io-fio-seqread-doublemem-4k-4t
rename to configs/config-io-fio-seqread-doublemem-4k-4t
index 8a41ec794..fc509506f 100644
--- a/configs/config-global-dhp__io-fio-seqread-doublemem-4k-4t
+++ b/configs/config-io-fio-seqread-doublemem-4k-4t
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-ssd b/configs/config-io-fio-ssd
similarity index 97%
rename from configs/config-global-dhp__io-fio-ssd
rename to configs/config-io-fio-ssd
index f59d52c6f..ee01537dd 100644
--- a/configs/config-global-dhp__io-fio-ssd
+++ b/configs/config-io-fio-ssd
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-sync-maxrandwrite b/configs/config-io-fio-sync-maxrandwrite
similarity index 98%
rename from configs/config-global-dhp__io-fio-sync-maxrandwrite
rename to configs/config-io-fio-sync-maxrandwrite
index 49bfb2c55..4234de9f6 100644
--- a/configs/config-global-dhp__io-fio-sync-maxrandwrite
+++ b/configs/config-io-fio-sync-maxrandwrite
@@ -1,9 +1,6 @@
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-sync-maxrandwrite-ftrace b/configs/config-io-fio-sync-maxrandwrite-ftrace
similarity index 98%
rename from configs/config-global-dhp__io-fio-sync-maxrandwrite-ftrace
rename to configs/config-io-fio-sync-maxrandwrite-ftrace
index a633c3429..9e0ed8920 100644
--- a/configs/config-global-dhp__io-fio-sync-maxrandwrite-ftrace
+++ b/configs/config-io-fio-sync-maxrandwrite-ftrace
@@ -1,9 +1,6 @@
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fio-sync-maxrandwrite-long-ftrace b/configs/config-io-fio-sync-maxrandwrite-long-ftrace
similarity index 98%
rename from configs/config-global-dhp__io-fio-sync-maxrandwrite-long-ftrace
rename to configs/config-io-fio-sync-maxrandwrite-long-ftrace
index 80246b33b..650e89a4a 100644
--- a/configs/config-global-dhp__io-fio-sync-maxrandwrite-long-ftrace
+++ b/configs/config-io-fio-sync-maxrandwrite-long-ftrace
@@ -1,9 +1,6 @@
 # MM Test Parameters
 export MMTESTS="fio"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-fsmark-xfsrepair b/configs/config-io-fsmark-xfsrepair
similarity index 97%
rename from configs/config-global-dhp__io-fsmark-xfsrepair
rename to configs/config-io-fsmark-xfsrepair
index a782fc4fb..a1eeb2192 100644
--- a/configs/config-global-dhp__io-fsmark-xfsrepair
+++ b/configs/config-io-fsmark-xfsrepair
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="fsmark-threaded"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-iozone b/configs/config-io-iozone
similarity index 97%
rename from configs/config-global-dhp__io-iozone
rename to configs/config-io-iozone
index 21d8841b8..ae69237b1 100644
--- a/configs/config-global-dhp__io-iozone
+++ b/configs/config-io-iozone
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="iozone"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-iozone-dio b/configs/config-io-iozone-dio
similarity index 97%
rename from configs/config-global-dhp__io-iozone-dio
rename to configs/config-io-iozone-dio
index 181a94add..15dca267d 100644
--- a/configs/config-global-dhp__io-iozone-dio
+++ b/configs/config-io-iozone-dio
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="iozone"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-iozone-doublemem-async b/configs/config-io-iozone-doublemem-async
similarity index 97%
rename from configs/config-global-dhp__io-iozone-doublemem-async
rename to configs/config-io-iozone-doublemem-async
index 3a0a865e9..0264e6a18 100644
--- a/configs/config-global-dhp__io-iozone-doublemem-async
+++ b/configs/config-io-iozone-doublemem-async
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="iozone"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-iozone-doublemem-fsync b/configs/config-io-iozone-doublemem-fsync
similarity index 97%
rename from configs/config-global-dhp__io-iozone-doublemem-fsync
rename to configs/config-io-iozone-doublemem-fsync
index 17a079cf7..27856e481 100644
--- a/configs/config-global-dhp__io-iozone-doublemem-fsync
+++ b/configs/config-io-iozone-doublemem-fsync
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="iozone"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-iozone-ram b/configs/config-io-iozone-ram
similarity index 98%
rename from configs/config-global-dhp__io-iozone-ram
rename to configs/config-io-iozone-ram
index 4ddb476d5..10d86c97f 100644
--- a/configs/config-global-dhp__io-iozone-ram
+++ b/configs/config-io-iozone-ram
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="iozone"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
@@ -31,7 +28,6 @@ export MMTESTS="iozone"
 export TESTDISK_RD_PREALLOC=yes
 export TESTDISK_RD_SIZE=$((MEMTOTAL_BYTES/3))
 
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__io-iozone-ram-dio b/configs/config-io-iozone-ram-dio
similarity index 98%
rename from configs/config-global-dhp__io-iozone-ram-dio
rename to configs/config-io-iozone-ram-dio
index 8c47d20f2..2c0503070 100644
--- a/configs/config-global-dhp__io-iozone-ram-dio
+++ b/configs/config-io-iozone-ram-dio
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="iozone"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
@@ -31,7 +28,6 @@ export MMTESTS="iozone"
 export TESTDISK_RD_PREALLOC=yes
 export TESTDISK_RD_SIZE=$((MEMTOTAL_BYTES/3))
 
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__io-iozone-small b/configs/config-io-iozone-small
similarity index 98%
rename from configs/config-global-dhp__io-iozone-small
rename to configs/config-io-iozone-small
index 8ef303a9e..f5b43097b 100644
--- a/configs/config-global-dhp__io-iozone-small
+++ b/configs/config-io-iozone-small
@@ -11,9 +11,6 @@ get_numa_details	# Sets MMTESTS_NODE_SIZE MMTESTS_NODE_ID_BY_SIZE
 # MM Test Parameters
 export MMTESTS="iozone"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-metadata b/configs/config-io-metadata
similarity index 97%
rename from configs/config-global-dhp__io-metadata
rename to configs/config-io-metadata
index 6e3368b7f..ec18b82b8 100644
--- a/configs/config-global-dhp__io-metadata
+++ b/configs/config-io-metadata
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="fsmark-threaded"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-paralleldd-read-large b/configs/config-io-paralleldd-read-large
similarity index 95%
rename from configs/config-global-dhp__io-paralleldd-read-large
rename to configs/config-io-paralleldd-read-large
index 5a45ee935..360ed06e1 100644
--- a/configs/config-global-dhp__io-paralleldd-read-large
+++ b/configs/config-io-paralleldd-read-large
@@ -5,10 +5,6 @@
 
 # MM Test Parameters
 export MMTESTS="paralleldd"
-export SKIP_WARMUP=yes
-
-
-# Machine configuration
 
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
diff --git a/configs/config-global-dhp__io-paralleldd-read-large-multi b/configs/config-io-paralleldd-read-large-multi
similarity index 95%
rename from configs/config-global-dhp__io-paralleldd-read-large-multi
rename to configs/config-io-paralleldd-read-large-multi
index 99f695d2b..39e964581 100644
--- a/configs/config-global-dhp__io-paralleldd-read-large-multi
+++ b/configs/config-io-paralleldd-read-large-multi
@@ -5,10 +5,6 @@
 
 # MM Test Parameters
 export MMTESTS="paralleldd"
-export SKIP_WARMUP=yes
-
-
-# Machine configuration
 
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
diff --git a/configs/config-global-dhp__io-paralleldd-read-small b/configs/config-io-paralleldd-read-small
similarity index 95%
rename from configs/config-global-dhp__io-paralleldd-read-small
rename to configs/config-io-paralleldd-read-small
index fa25bc826..82d2ac25b 100644
--- a/configs/config-global-dhp__io-paralleldd-read-small
+++ b/configs/config-io-paralleldd-read-small
@@ -5,10 +5,6 @@
 
 # MM Test Parameters
 export MMTESTS="paralleldd"
-export SKIP_WARMUP=yes
-
-
-# Machine configuration
 
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
diff --git a/configs/config-global-dhp__io-paralleldd-read-small-multi b/configs/config-io-paralleldd-read-small-multi
similarity index 95%
rename from configs/config-global-dhp__io-paralleldd-read-small-multi
rename to configs/config-io-paralleldd-read-small-multi
index 9ea1cdf6a..0afe7ca3c 100644
--- a/configs/config-global-dhp__io-paralleldd-read-small-multi
+++ b/configs/config-io-paralleldd-read-small-multi
@@ -5,10 +5,6 @@
 
 # MM Test Parameters
 export MMTESTS="paralleldd"
-export SKIP_WARMUP=yes
-
-
-# Machine configuration
 
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
diff --git a/configs/config-global-dhp__io-seeker-block-read b/configs/config-io-seeker-block-read
similarity index 98%
rename from configs/config-global-dhp__io-seeker-block-read
rename to configs/config-io-seeker-block-read
index c6e3fc6e9..36d030828 100644
--- a/configs/config-global-dhp__io-seeker-block-read
+++ b/configs/config-io-seeker-block-read
@@ -14,9 +14,6 @@
 # MM Test Parameters
 export MMTESTS="seeker"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-seeker-block-write b/configs/config-io-seeker-block-write
similarity index 98%
rename from configs/config-global-dhp__io-seeker-block-write
rename to configs/config-io-seeker-block-write
index 07fda7f3b..cc4cfd96a 100644
--- a/configs/config-global-dhp__io-seeker-block-write
+++ b/configs/config-io-seeker-block-write
@@ -14,9 +14,6 @@
 # MM Test Parameters
 export MMTESTS="seeker"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-seeker-file-read b/configs/config-io-seeker-file-read
similarity index 98%
rename from configs/config-global-dhp__io-seeker-file-read
rename to configs/config-io-seeker-file-read
index 9f20fc6f9..a435472d5 100644
--- a/configs/config-global-dhp__io-seeker-file-read
+++ b/configs/config-io-seeker-file-read
@@ -14,9 +14,6 @@
 # MM Test Parameters
 export MMTESTS="seeker"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-seeker-file-write b/configs/config-io-seeker-file-write
similarity index 98%
rename from configs/config-global-dhp__io-seeker-file-write
rename to configs/config-io-seeker-file-write
index 2a4f6d5b8..cfba02fcd 100644
--- a/configs/config-global-dhp__io-seeker-file-write
+++ b/configs/config-io-seeker-file-write
@@ -14,9 +14,6 @@
 # MM Test Parameters
 export MMTESTS="seeker"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__io-xfsio b/configs/config-io-xfsio
similarity index 100%
rename from configs/config-global-dhp__io-xfsio
rename to configs/config-io-xfsio
diff --git a/configs/config-global-dhp__io-xfsrepair b/configs/config-io-xfsrepair
similarity index 98%
rename from configs/config-global-dhp__io-xfsrepair
rename to configs/config-io-xfsrepair
index cd4556ffc..2b81c42c7 100644
--- a/configs/config-global-dhp__io-xfsrepair
+++ b/configs/config-io-xfsrepair
@@ -10,9 +10,6 @@
 # MM Test Parameters
 export MMTESTS="xfsrepair"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__jvm-specjbb2005-multi b/configs/config-jvm-specjbb2005-multi
similarity index 94%
rename from configs/config-global-dhp__jvm-specjbb2005-multi
rename to configs/config-jvm-specjbb2005-multi
index ba851da4a..b47ef2f8b 100644
--- a/configs/config-global-dhp__jvm-specjbb2005-multi
+++ b/configs/config-jvm-specjbb2005-multi
@@ -4,10 +4,6 @@
 # MM Test Parameters
 export MMTESTS="specjbb"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__jvm-specjbb2005-numad-multi b/configs/config-jvm-specjbb2005-numad-multi
similarity index 94%
rename from configs/config-global-dhp__jvm-specjbb2005-numad-multi
rename to configs/config-jvm-specjbb2005-numad-multi
index 3656c91c8..36b468f21 100644
--- a/configs/config-global-dhp__jvm-specjbb2005-numad-multi
+++ b/configs/config-jvm-specjbb2005-numad-multi
@@ -4,10 +4,6 @@
 # MM Test Parameters
 export MMTESTS="specjbb"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__jvm-specjbb2005-single b/configs/config-jvm-specjbb2005-single
similarity index 94%
rename from configs/config-global-dhp__jvm-specjbb2005-single
rename to configs/config-jvm-specjbb2005-single
index 9f2a89474..86716918d 100644
--- a/configs/config-global-dhp__jvm-specjbb2005-single
+++ b/configs/config-jvm-specjbb2005-single
@@ -4,10 +4,6 @@
 # MM Test Parameters
 export MMTESTS="specjbb"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__jvm-specjbb2015-multi b/configs/config-jvm-specjbb2015-multi
similarity index 96%
rename from configs/config-global-dhp__jvm-specjbb2015-multi
rename to configs/config-jvm-specjbb2015-multi
index 29f326950..8ca4f9c91 100644
--- a/configs/config-global-dhp__jvm-specjbb2015-multi
+++ b/configs/config-jvm-specjbb2015-multi
@@ -4,10 +4,6 @@
 # MM Test Parameters
 export MMTESTS="specjbb2015"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__jvm-specjbb2015-multi-nonumab b/configs/config-jvm-specjbb2015-multi-nonumab
similarity index 96%
rename from configs/config-global-dhp__jvm-specjbb2015-multi-nonumab
rename to configs/config-jvm-specjbb2015-multi-nonumab
index 594f5ff6e..701db68d8 100644
--- a/configs/config-global-dhp__jvm-specjbb2015-multi-nonumab
+++ b/configs/config-jvm-specjbb2015-multi-nonumab
@@ -4,10 +4,6 @@
 # MM Test Parameters
 export MMTESTS="specjbb2015"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__jvm-specjbb2015-single b/configs/config-jvm-specjbb2015-single
similarity index 94%
rename from configs/config-global-dhp__jvm-specjbb2015-single
rename to configs/config-jvm-specjbb2015-single
index 972df1765..30b89f068 100644
--- a/configs/config-global-dhp__jvm-specjbb2015-single
+++ b/configs/config-jvm-specjbb2015-single
@@ -4,10 +4,6 @@
 # MM Test Parameters
 export MMTESTS="specjbb2015"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__jvm-specjvm b/configs/config-jvm-specjvm
similarity index 91%
rename from configs/config-global-dhp__jvm-specjvm
rename to configs/config-jvm-specjvm
index b6ddd0688..45811b6b8 100644
--- a/configs/config-global-dhp__jvm-specjvm
+++ b/configs/config-jvm-specjvm
@@ -4,10 +4,6 @@
 # MM Test Parameters
 export MMTESTS="specjvm"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__memcached-mutilate-small b/configs/config-memcached-mutilate-small
similarity index 97%
rename from configs/config-global-dhp__memcached-mutilate-small
rename to configs/config-memcached-mutilate-small
index c53a94900..6d20cd9a3 100644
--- a/configs/config-global-dhp__memcached-mutilate-small
+++ b/configs/config-memcached-mutilate-small
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="mutilate"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-monitor b/configs/config-monitor
index 2ead1a4d3..dd3560951 100644
--- a/configs/config-monitor
+++ b/configs/config-monitor
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="monitor"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-monitor-dstate-stalls b/configs/config-monitor-dstate-stalls
deleted file mode 100644
index e9e8d6afb..000000000
--- a/configs/config-monitor-dstate-stalls
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# MM Test Parameters
-export MMTESTS="monitor"
-
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=xfs
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=inode64,delaylog,logbsize=262144,nobarrier
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS=
-export MONITORS_PLAIN="dstate"
-export MONITORS_GZIP="proc-vmstat top proc-latency_stats"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=2
-export MONITOR_FTRACE_EVENTS=
diff --git a/configs/config-monitor-interactive b/configs/config-monitor-interactive
deleted file mode 100644
index 6b7fcf32d..000000000
--- a/configs/config-monitor-interactive
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# MM Test Parameters
-export MMTESTS="monitor"
-
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=xfs
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=inode64,delaylog,logbsize=262144,nobarrier
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS=
-export MONITORS_PLAIN=
-export MONITORS_GZIP="proc-vmstat top dstate proc-latency_stats"
-export MONITORS_WITH_LATENCY="vmstat iostat"
-export MONITOR_UPDATE_FREQUENCY=2
diff --git a/configs/config-monitor-stalls b/configs/config-monitor-stalls
index 09b7eefc2..c85384973 100644
--- a/configs/config-monitor-stalls
+++ b/configs/config-monitor-stalls
@@ -1,13 +1,6 @@
-MEMTOTAL_BYTES=`free -b | grep Mem: | awk '{print $2}'`
-NUMCPUS=$(grep -c '^processor' /proc/cpuinfo)
-
 # MM Test Parameters
 export MMTESTS="monitor"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-monitor-syscalls b/configs/config-monitor-syscalls
deleted file mode 100644
index 7c19eca9c..000000000
--- a/configs/config-monitor-syscalls
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# MM Test Parameters
-export MMTESTS="monitor"
-
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
-# Test disk to setup (optional)
-#export TESTDISK_RAID_DEVICES=
-#export TESTDISK_RAID_MD_DEVICE=/dev/md0
-#export TESTDISK_RAID_OFFSET=63
-#export TESTDISK_RAID_SIZE=250019532
-#export TESTDISK_RAID_TYPE=raid0
-#export TESTDISK_PARTITION=/dev/sda6
-#export TESTDISK_FILESYSTEM=xfs
-#export TESTDISK_MKFS_PARAM="-f -d agcount=8"
-#export TESTDISK_MOUNT_ARGS=inode64,delaylog,logbsize=262144,nobarrier
-
-# List of monitors
-export RUN_MONITOR=yes
-export MONITORS_ALWAYS=
-export MONITORS_PLAIN="syscalls"
-export MONITORS_GZIP=
-export MONITORS_WITH_LATENCY=
-export MONITOR_UPDATE_FREQUENCY=5
-export MONITOR_FTRACE_EVENTS=
diff --git a/configs/config-monitor-vm-stalls b/configs/config-monitor-vm-stalls
index e8737ed8a..134539abe 100644
--- a/configs/config-monitor-vm-stalls
+++ b/configs/config-monitor-vm-stalls
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="monitor"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-c-class-mpi-full b/configs/config-nas-c-class-mpi-full
similarity index 95%
rename from configs/config-global-dhp__nas-c-class-mpi-full
rename to configs/config-nas-c-class-mpi-full
index c68091b6a..ac71f25b5 100644
--- a/configs/config-global-dhp__nas-c-class-mpi-full
+++ b/configs/config-nas-c-class-mpi-full
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-ft nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-c-class-mpi-half b/configs/config-nas-c-class-mpi-half
similarity index 95%
rename from configs/config-global-dhp__nas-c-class-mpi-half
rename to configs/config-nas-c-class-mpi-half
index 9a68bd089..0dd1be52f 100644
--- a/configs/config-global-dhp__nas-c-class-mpi-half
+++ b/configs/config-nas-c-class-mpi-half
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-ft nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-c-class-mpi-quarter b/configs/config-nas-c-class-mpi-quarter
similarity index 95%
rename from configs/config-global-dhp__nas-c-class-mpi-quarter
rename to configs/config-nas-c-class-mpi-quarter
index 3b5622b64..fec5d1f38 100644
--- a/configs/config-global-dhp__nas-c-class-mpi-quarter
+++ b/configs/config-nas-c-class-mpi-quarter
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-ft nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-c-class-mpi-third b/configs/config-nas-c-class-mpi-third
similarity index 95%
rename from configs/config-global-dhp__nas-c-class-mpi-third
rename to configs/config-nas-c-class-mpi-third
index 753a1955e..2d221011b 100644
--- a/configs/config-global-dhp__nas-c-class-mpi-third
+++ b/configs/config-nas-c-class-mpi-third
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-ft nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-c-class-mpi-twothird b/configs/config-nas-c-class-mpi-twothird
similarity index 95%
rename from configs/config-global-dhp__nas-c-class-mpi-twothird
rename to configs/config-nas-c-class-mpi-twothird
index ac1da00e3..030642312 100644
--- a/configs/config-global-dhp__nas-c-class-mpi-twothird
+++ b/configs/config-nas-c-class-mpi-twothird
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-ft nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-c-class-omp-full b/configs/config-nas-c-class-omp-full
similarity index 94%
rename from configs/config-global-dhp__nas-c-class-omp-full
rename to configs/config-nas-c-class-omp-full
index 3cc2b46a6..6d08a666d 100644
--- a/configs/config-global-dhp__nas-c-class-omp-full
+++ b/configs/config-nas-c-class-omp-full
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-ep nas-omp-ft nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-c-class-omp-half b/configs/config-nas-c-class-omp-half
similarity index 94%
rename from configs/config-global-dhp__nas-c-class-omp-half
rename to configs/config-nas-c-class-omp-half
index cd1395c14..1a4c877ea 100644
--- a/configs/config-global-dhp__nas-c-class-omp-half
+++ b/configs/config-nas-c-class-omp-half
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-ep nas-omp-ft nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-c-class-omp-quarter b/configs/config-nas-c-class-omp-quarter
similarity index 94%
rename from configs/config-global-dhp__nas-c-class-omp-quarter
rename to configs/config-nas-c-class-omp-quarter
index fa9b91466..06185d6a0 100644
--- a/configs/config-global-dhp__nas-c-class-omp-quarter
+++ b/configs/config-nas-c-class-omp-quarter
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-ep nas-omp-ft nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-c-class-omp-third b/configs/config-nas-c-class-omp-third
similarity index 94%
rename from configs/config-global-dhp__nas-c-class-omp-third
rename to configs/config-nas-c-class-omp-third
index 42e123492..e2bb15cfd 100644
--- a/configs/config-global-dhp__nas-c-class-omp-third
+++ b/configs/config-nas-c-class-omp-third
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-ep nas-omp-ft nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-c-class-omp-twothird b/configs/config-nas-c-class-omp-twothird
similarity index 94%
rename from configs/config-global-dhp__nas-c-class-omp-twothird
rename to configs/config-nas-c-class-omp-twothird
index 1016da91e..895565610 100644
--- a/configs/config-global-dhp__nas-c-class-omp-twothird
+++ b/configs/config-nas-c-class-omp-twothird
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-ep nas-omp-ft nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-mpi-bind-full b/configs/config-nas-d-class-mpi-bind-full
similarity index 95%
rename from configs/config-global-dhp__nas-d-class-mpi-bind-full
rename to configs/config-nas-d-class-mpi-bind-full
index e95ec081c..79dc97559 100644
--- a/configs/config-global-dhp__nas-d-class-mpi-bind-full
+++ b/configs/config-nas-d-class-mpi-bind-full
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-mpi-bind-half b/configs/config-nas-d-class-mpi-bind-half
similarity index 95%
rename from configs/config-global-dhp__nas-d-class-mpi-bind-half
rename to configs/config-nas-d-class-mpi-bind-half
index b54a93a8f..04d7ef3a1 100644
--- a/configs/config-global-dhp__nas-d-class-mpi-bind-half
+++ b/configs/config-nas-d-class-mpi-bind-half
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-mpi-bind-quarter b/configs/config-nas-d-class-mpi-bind-quarter
similarity index 95%
rename from configs/config-global-dhp__nas-d-class-mpi-bind-quarter
rename to configs/config-nas-d-class-mpi-bind-quarter
index 4af1155ce..6feaef43f 100644
--- a/configs/config-global-dhp__nas-d-class-mpi-bind-quarter
+++ b/configs/config-nas-d-class-mpi-bind-quarter
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-mpi-bind-third b/configs/config-nas-d-class-mpi-bind-third
similarity index 95%
rename from configs/config-global-dhp__nas-d-class-mpi-bind-third
rename to configs/config-nas-d-class-mpi-bind-third
index e3914186c..3423a5f59 100644
--- a/configs/config-global-dhp__nas-d-class-mpi-bind-third
+++ b/configs/config-nas-d-class-mpi-bind-third
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-mpi-bind-twothird b/configs/config-nas-d-class-mpi-bind-twothird
similarity index 95%
rename from configs/config-global-dhp__nas-d-class-mpi-bind-twothird
rename to configs/config-nas-d-class-mpi-bind-twothird
index bf77c3ad4..857b9bb0a 100644
--- a/configs/config-global-dhp__nas-d-class-mpi-bind-twothird
+++ b/configs/config-nas-d-class-mpi-bind-twothird
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-mpi-full b/configs/config-nas-d-class-mpi-full
similarity index 95%
rename from configs/config-global-dhp__nas-d-class-mpi-full
rename to configs/config-nas-d-class-mpi-full
index 8d72aedbf..9431a7add 100644
--- a/configs/config-global-dhp__nas-d-class-mpi-full
+++ b/configs/config-nas-d-class-mpi-full
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-mpi-half b/configs/config-nas-d-class-mpi-half
similarity index 95%
rename from configs/config-global-dhp__nas-d-class-mpi-half
rename to configs/config-nas-d-class-mpi-half
index 47b83820e..2f48953c9 100644
--- a/configs/config-global-dhp__nas-d-class-mpi-half
+++ b/configs/config-nas-d-class-mpi-half
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-mpi-quarter b/configs/config-nas-d-class-mpi-quarter
similarity index 95%
rename from configs/config-global-dhp__nas-d-class-mpi-quarter
rename to configs/config-nas-d-class-mpi-quarter
index f27f42436..98a52f428 100644
--- a/configs/config-global-dhp__nas-d-class-mpi-quarter
+++ b/configs/config-nas-d-class-mpi-quarter
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-mpi-third b/configs/config-nas-d-class-mpi-third
similarity index 95%
rename from configs/config-global-dhp__nas-d-class-mpi-third
rename to configs/config-nas-d-class-mpi-third
index 711da7212..451404b1b 100644
--- a/configs/config-global-dhp__nas-d-class-mpi-third
+++ b/configs/config-nas-d-class-mpi-third
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-mpi-twothird b/configs/config-nas-d-class-mpi-twothird
similarity index 95%
rename from configs/config-global-dhp__nas-d-class-mpi-twothird
rename to configs/config-nas-d-class-mpi-twothird
index 0448d68c6..d28c035b4 100644
--- a/configs/config-global-dhp__nas-d-class-mpi-twothird
+++ b/configs/config-nas-d-class-mpi-twothird
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="nas-mpi-bt nas-mpi-cg nas-mpi-ep nas-mpi-is nas-mpi-lu nas-mpi-mg nas-mpi-sp"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-omp-bind-full b/configs/config-nas-d-class-omp-bind-full
similarity index 94%
rename from configs/config-global-dhp__nas-d-class-omp-bind-full
rename to configs/config-nas-d-class-omp-bind-full
index 7bd9066a7..667ae68fb 100644
--- a/configs/config-global-dhp__nas-d-class-omp-bind-full
+++ b/configs/config-nas-d-class-omp-bind-full
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-dc nas-omp-ep nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-omp-bind-half b/configs/config-nas-d-class-omp-bind-half
similarity index 94%
rename from configs/config-global-dhp__nas-d-class-omp-bind-half
rename to configs/config-nas-d-class-omp-bind-half
index 9b734b402..629a75f41 100644
--- a/configs/config-global-dhp__nas-d-class-omp-bind-half
+++ b/configs/config-nas-d-class-omp-bind-half
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-dc nas-omp-ep nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-omp-bind-quarter b/configs/config-nas-d-class-omp-bind-quarter
similarity index 94%
rename from configs/config-global-dhp__nas-d-class-omp-bind-quarter
rename to configs/config-nas-d-class-omp-bind-quarter
index 973f7dddc..73ef050b6 100644
--- a/configs/config-global-dhp__nas-d-class-omp-bind-quarter
+++ b/configs/config-nas-d-class-omp-bind-quarter
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-dc nas-omp-ep nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-omp-bind-third b/configs/config-nas-d-class-omp-bind-third
similarity index 94%
rename from configs/config-global-dhp__nas-d-class-omp-bind-third
rename to configs/config-nas-d-class-omp-bind-third
index ed5908a83..87657639d 100644
--- a/configs/config-global-dhp__nas-d-class-omp-bind-third
+++ b/configs/config-nas-d-class-omp-bind-third
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-dc nas-omp-ep nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-omp-bind-twothird b/configs/config-nas-d-class-omp-bind-twothird
similarity index 94%
rename from configs/config-global-dhp__nas-d-class-omp-bind-twothird
rename to configs/config-nas-d-class-omp-bind-twothird
index 490aa18ef..4ff666280 100644
--- a/configs/config-global-dhp__nas-d-class-omp-bind-twothird
+++ b/configs/config-nas-d-class-omp-bind-twothird
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-dc nas-omp-ep nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-omp-full b/configs/config-nas-d-class-omp-full
similarity index 94%
rename from configs/config-global-dhp__nas-d-class-omp-full
rename to configs/config-nas-d-class-omp-full
index 6a00987ea..842a161af 100644
--- a/configs/config-global-dhp__nas-d-class-omp-full
+++ b/configs/config-nas-d-class-omp-full
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-dc nas-omp-ep nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-omp-half b/configs/config-nas-d-class-omp-half
similarity index 94%
rename from configs/config-global-dhp__nas-d-class-omp-half
rename to configs/config-nas-d-class-omp-half
index 68593aa6d..0c7b9ed06 100644
--- a/configs/config-global-dhp__nas-d-class-omp-half
+++ b/configs/config-nas-d-class-omp-half
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-dc nas-omp-ep nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-omp-quarter b/configs/config-nas-d-class-omp-quarter
similarity index 94%
rename from configs/config-global-dhp__nas-d-class-omp-quarter
rename to configs/config-nas-d-class-omp-quarter
index b83e74172..7d4d1fc5a 100644
--- a/configs/config-global-dhp__nas-d-class-omp-quarter
+++ b/configs/config-nas-d-class-omp-quarter
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-dc nas-omp-ep nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-omp-third b/configs/config-nas-d-class-omp-third
similarity index 94%
rename from configs/config-global-dhp__nas-d-class-omp-third
rename to configs/config-nas-d-class-omp-third
index 02d434ba8..18410687b 100644
--- a/configs/config-global-dhp__nas-d-class-omp-third
+++ b/configs/config-nas-d-class-omp-third
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-dc nas-omp-ep nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__nas-d-class-omp-twothird b/configs/config-nas-d-class-omp-twothird
similarity index 94%
rename from configs/config-global-dhp__nas-d-class-omp-twothird
rename to configs/config-nas-d-class-omp-twothird
index 598f04ebc..96df3324d 100644
--- a/configs/config-global-dhp__nas-d-class-omp-twothird
+++ b/configs/config-nas-d-class-omp-twothird
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="nas-omp-bt nas-omp-cg nas-omp-dc nas-omp-ep nas-omp-is nas-omp-lu nas-omp-mg nas-omp-sp nas-omp-ua"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-netperf-cross-ht b/configs/config-network-netperf-cross-ht
similarity index 97%
rename from configs/config-global-dhp__network-netperf-cross-ht
rename to configs/config-network-netperf-cross-ht
index 515911f4e..1247202d1 100644
--- a/configs/config-global-dhp__network-netperf-cross-ht
+++ b/configs/config-network-netperf-cross-ht
@@ -10,9 +10,6 @@
 # MM Test Parameters
 export MMTESTS="netperf-udp netperf-tcp"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-netperf-cross-node b/configs/config-network-netperf-cross-node
similarity index 98%
rename from configs/config-global-dhp__network-netperf-cross-node
rename to configs/config-network-netperf-cross-node
index 3ffc344ac..55374099b 100644
--- a/configs/config-global-dhp__network-netperf-cross-node
+++ b/configs/config-network-netperf-cross-node
@@ -12,9 +12,6 @@ get_numa_details
 # MM Test Parameters
 export MMTESTS="netperf-udp netperf-tcp"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-netperf-cross-socket b/configs/config-network-netperf-cross-socket
similarity index 97%
rename from configs/config-global-dhp__network-netperf-cross-socket
rename to configs/config-network-netperf-cross-socket
index 0963b4112..9c7e41e41 100644
--- a/configs/config-global-dhp__network-netperf-cross-socket
+++ b/configs/config-network-netperf-cross-socket
@@ -10,9 +10,6 @@
 # MM Test Parameters
 export MMTESTS="netperf-udp netperf-tcp"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-netperf-cstate b/configs/config-network-netperf-cstate
similarity index 97%
rename from configs/config-global-dhp__network-netperf-cstate
rename to configs/config-network-netperf-cstate
index c99fd8965..a63f0c023 100644
--- a/configs/config-global-dhp__network-netperf-cstate
+++ b/configs/config-network-netperf-cstate
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="netperf-udp netperf-tcp"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-netperf-rr-unbound b/configs/config-network-netperf-rr-unbound
similarity index 96%
rename from configs/config-global-dhp__network-netperf-rr-unbound
rename to configs/config-network-netperf-rr-unbound
index 91a23e3e1..bfa806008 100644
--- a/configs/config-global-dhp__network-netperf-rr-unbound
+++ b/configs/config-network-netperf-rr-unbound
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="netperf-udp-rr netperf-tcp-rr"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-netperf-unbound b/configs/config-network-netperf-unbound
similarity index 97%
rename from configs/config-global-dhp__network-netperf-unbound
rename to configs/config-network-netperf-unbound
index d5fe176cc..65f4294e1 100644
--- a/configs/config-global-dhp__network-netperf-unbound
+++ b/configs/config-network-netperf-unbound
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="netperf-udp netperf-tcp"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-netperf-unix-unbound b/configs/config-network-netperf-unix-unbound
similarity index 96%
rename from configs/config-global-dhp__network-netperf-unix-unbound
rename to configs/config-network-netperf-unix-unbound
index b9702ce65..3f9cba209 100644
--- a/configs/config-global-dhp__network-netperf-unix-unbound
+++ b/configs/config-network-netperf-unix-unbound
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="netperf-unix"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-netpipe b/configs/config-network-netpipe
similarity index 97%
rename from configs/config-global-dhp__network-netpipe
rename to configs/config-network-netpipe
index ce702ca18..9dc77a170 100644
--- a/configs/config-global-dhp__network-netpipe
+++ b/configs/config-network-netpipe
@@ -10,9 +10,6 @@
 # MM Test Parameters
 export MMTESTS="netpipe"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-sockperf-cross-ht b/configs/config-network-sockperf-cross-ht
similarity index 97%
rename from configs/config-global-dhp__network-sockperf-cross-ht
rename to configs/config-network-sockperf-cross-ht
index 327db9790..9e7d3b0e5 100644
--- a/configs/config-global-dhp__network-sockperf-cross-ht
+++ b/configs/config-network-sockperf-cross-ht
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="sockperf-tcp-throughput sockperf-tcp-under-load sockperf-udp-throughput sockperf-udp-under-load"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-sockperf-cross-socket b/configs/config-network-sockperf-cross-socket
similarity index 97%
rename from configs/config-global-dhp__network-sockperf-cross-socket
rename to configs/config-network-sockperf-cross-socket
index e983443d9..8eee7e296 100644
--- a/configs/config-global-dhp__network-sockperf-cross-socket
+++ b/configs/config-network-sockperf-cross-socket
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="sockperf-tcp-throughput sockperf-tcp-under-load sockperf-udp-throughput sockperf-udp-under-load"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-sockperf-cstate b/configs/config-network-sockperf-cstate
similarity index 97%
rename from configs/config-global-dhp__network-sockperf-cstate
rename to configs/config-network-sockperf-cstate
index d7bfbeb2e..78074e4fb 100644
--- a/configs/config-global-dhp__network-sockperf-cstate
+++ b/configs/config-network-sockperf-cstate
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="sockperf-tcp-throughput sockperf-tcp-under-load sockperf-udp-throughput sockperf-udp-under-load"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-sockperf-pinned b/configs/config-network-sockperf-pinned
similarity index 97%
rename from configs/config-global-dhp__network-sockperf-pinned
rename to configs/config-network-sockperf-pinned
index 87c2e7b0e..8c6a6815a 100644
--- a/configs/config-global-dhp__network-sockperf-pinned
+++ b/configs/config-network-sockperf-pinned
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="sockperf-tcp-throughput sockperf-tcp-under-load sockperf-udp-throughput sockperf-udp-under-load"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-sockperf-tcp-throughput b/configs/config-network-sockperf-tcp-throughput
similarity index 97%
rename from configs/config-global-dhp__network-sockperf-tcp-throughput
rename to configs/config-network-sockperf-tcp-throughput
index b142f05af..7a41a7937 100644
--- a/configs/config-global-dhp__network-sockperf-tcp-throughput
+++ b/configs/config-network-sockperf-tcp-throughput
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="sockperf-tcp-throughput"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-sockperf-tcp-throughput-small b/configs/config-network-sockperf-tcp-throughput-small
similarity index 97%
rename from configs/config-global-dhp__network-sockperf-tcp-throughput-small
rename to configs/config-network-sockperf-tcp-throughput-small
index 6ad294e6d..15d5a6d7f 100644
--- a/configs/config-global-dhp__network-sockperf-tcp-throughput-small
+++ b/configs/config-network-sockperf-tcp-throughput-small
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="sockperf-tcp-throughput"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-sockperf-unbound b/configs/config-network-sockperf-unbound
similarity index 97%
rename from configs/config-global-dhp__network-sockperf-unbound
rename to configs/config-network-sockperf-unbound
index 6b2eb5ace..4c078fd86 100644
--- a/configs/config-global-dhp__network-sockperf-unbound
+++ b/configs/config-network-sockperf-unbound
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="sockperf-tcp-throughput sockperf-tcp-under-load sockperf-udp-throughput sockperf-udp-under-load"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__network-tbench b/configs/config-network-tbench
similarity index 96%
rename from configs/config-global-dhp__network-tbench
rename to configs/config-network-tbench
index d8192bae5..4dd260f39 100644
--- a/configs/config-global-dhp__network-tbench
+++ b/configs/config-network-tbench
@@ -3,9 +3,6 @@
 # MM Test Parameters
 export MMTESTS="tbench4"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__numa_autonumabench b/configs/config-numa_autonumabench
similarity index 98%
rename from configs/config-global-dhp__numa_autonumabench
rename to configs/config-numa_autonumabench
index a83a6f127..b1cb18ac5 100644
--- a/configs/config-global-dhp__numa_autonumabench
+++ b/configs/config-numa_autonumabench
@@ -65,10 +65,6 @@
 # MM Test Parameters
 export MMTESTS="autonumabench"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__numa_perfnuma b/configs/config-numa_perfnuma
similarity index 95%
rename from configs/config-global-dhp__numa_perfnuma
rename to configs/config-numa_perfnuma
index 63286233d..ddd07c62e 100644
--- a/configs/config-global-dhp__numa_perfnuma
+++ b/configs/config-numa_perfnuma
@@ -6,10 +6,6 @@ get_numa_details
 # MM Test Parameters
 export MMTESTS="perfnuma"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__pagealloc-micro b/configs/config-pagealloc-micro
similarity index 98%
rename from configs/config-global-dhp__pagealloc-micro
rename to configs/config-pagealloc-micro
index 4aa322521..6593be541 100644
--- a/configs/config-global-dhp__pagealloc-micro
+++ b/configs/config-pagealloc-micro
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="pagealloc"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__pagealloc-performance b/configs/config-pagealloc-performance
similarity index 98%
rename from configs/config-global-dhp__pagealloc-performance
rename to configs/config-pagealloc-performance
index 928eaa966..9ee96d6f6 100644
--- a/configs/config-global-dhp__pagealloc-performance
+++ b/configs/config-pagealloc-performance
@@ -14,9 +14,6 @@
 # MM Test Parameters
 export MMTESTS="aim9 pft"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__pagereclaim-performance b/configs/config-pagereclaim-performance
similarity index 99%
rename from configs/config-global-dhp__pagereclaim-performance
rename to configs/config-pagereclaim-performance
index 59799a756..b677da65f 100644
--- a/configs/config-global-dhp__pagereclaim-performance
+++ b/configs/config-pagereclaim-performance
@@ -23,9 +23,6 @@ else
 	export MMTESTS="lmbench stutter"
 fi
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__pagereclaim-shrinker b/configs/config-pagereclaim-shrinker
similarity index 98%
rename from configs/config-global-dhp__pagereclaim-shrinker
rename to configs/config-pagereclaim-shrinker
index a6da766b8..153fe6c11 100644
--- a/configs/config-global-dhp__pagereclaim-shrinker
+++ b/configs/config-pagereclaim-shrinker
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="fsmark-threaded"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__parsec-pthreads-full b/configs/config-parsec-pthreads-full
similarity index 97%
rename from configs/config-global-dhp__parsec-pthreads-full
rename to configs/config-parsec-pthreads-full
index 14deff7b0..c94eee13b 100644
--- a/configs/config-global-dhp__parsec-pthreads-full
+++ b/configs/config-parsec-pthreads-full
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="parsecbuild parsec-blackscholes parsec-bodytrack parsec-canneal parsec-facesim parsec-fluidanimate parsec-netstreamcluster parsec-streamcluster parsec-x264"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__parsec-pthreads-half b/configs/config-parsec-pthreads-half
similarity index 97%
rename from configs/config-global-dhp__parsec-pthreads-half
rename to configs/config-parsec-pthreads-half
index f72a0d2ee..44f04f70c 100644
--- a/configs/config-global-dhp__parsec-pthreads-half
+++ b/configs/config-parsec-pthreads-half
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="parsecbuild parsec-blackscholes parsec-bodytrack parsec-canneal parsec-facesim parsec-fluidanimate parsec-netstreamcluster parsec-streamcluster parsec-x264"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__pgioperf b/configs/config-pgioperf
similarity index 98%
rename from configs/config-global-dhp__pgioperf
rename to configs/config-pgioperf
index bcae0df8b..a66c2b7c3 100644
--- a/configs/config-global-dhp__pgioperf
+++ b/configs/config-pgioperf
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="pgioperfinit pgioperfbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__reaim-highsys b/configs/config-reaim-highsys
similarity index 95%
rename from configs/config-global-dhp__reaim-highsys
rename to configs/config-reaim-highsys
index 623c1dce8..83176253f 100644
--- a/configs/config-global-dhp__reaim-highsys
+++ b/configs/config-reaim-highsys
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="reaim"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__reaim-io-alltests b/configs/config-reaim-io-alltests
similarity index 95%
rename from configs/config-global-dhp__reaim-io-alltests
rename to configs/config-reaim-io-alltests
index b05fe60d7..66459c7be 100644
--- a/configs/config-global-dhp__reaim-io-alltests
+++ b/configs/config-reaim-io-alltests
@@ -6,9 +6,6 @@
 # MM Test Parameters
 export MMTESTS="reaim"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__reaim-io-compute b/configs/config-reaim-io-compute
similarity index 95%
rename from configs/config-global-dhp__reaim-io-compute
rename to configs/config-reaim-io-compute
index 177fb7dc1..06518a35e 100644
--- a/configs/config-global-dhp__reaim-io-compute
+++ b/configs/config-reaim-io-compute
@@ -6,9 +6,6 @@
 # MM Test Parameters
 export MMTESTS="reaim"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__reaim-io-disk b/configs/config-reaim-io-disk
similarity index 94%
rename from configs/config-global-dhp__reaim-io-disk
rename to configs/config-reaim-io-disk
index 6bb674b41..3cfa528ae 100644
--- a/configs/config-global-dhp__reaim-io-disk
+++ b/configs/config-reaim-io-disk
@@ -6,9 +6,6 @@
 # MM Test Parameters
 export MMTESTS="reaim"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__reaim-io-disk-large b/configs/config-reaim-io-disk-large
similarity index 94%
rename from configs/config-global-dhp__reaim-io-disk-large
rename to configs/config-reaim-io-disk-large
index 6e8a253e4..d8a281e8d 100644
--- a/configs/config-global-dhp__reaim-io-disk-large
+++ b/configs/config-reaim-io-disk-large
@@ -6,9 +6,6 @@
 # MM Test Parameters
 export MMTESTS="reaim"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__reaim-io-new_dbase b/configs/config-reaim-io-new_dbase
similarity index 95%
rename from configs/config-global-dhp__reaim-io-new_dbase
rename to configs/config-reaim-io-new_dbase
index 6757ff1c8..a228310f4 100644
--- a/configs/config-global-dhp__reaim-io-new_dbase
+++ b/configs/config-reaim-io-new_dbase
@@ -6,9 +6,6 @@
 # MM Test Parameters
 export MMTESTS="reaim"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__reaim-io-new_fserver-large b/configs/config-reaim-io-new_fserver-large
similarity index 95%
rename from configs/config-global-dhp__reaim-io-new_fserver-large
rename to configs/config-reaim-io-new_fserver-large
index f8caf5213..223779f46 100644
--- a/configs/config-global-dhp__reaim-io-new_fserver-large
+++ b/configs/config-reaim-io-new_fserver-large
@@ -6,9 +6,6 @@
 # MM Test Parameters
 export MMTESTS="reaim"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__reaim-io-shared b/configs/config-reaim-io-shared
similarity index 97%
rename from configs/config-global-dhp__reaim-io-shared
rename to configs/config-reaim-io-shared
index d76b6a9ae..285441fd3 100644
--- a/configs/config-global-dhp__reaim-io-shared
+++ b/configs/config-reaim-io-shared
@@ -6,8 +6,6 @@
 # MM Test Parameters
 export MMTESTS="reaim"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
 # Machine configuration
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
diff --git a/configs/config-global-dhp__reaim-stress b/configs/config-reaim-stress
similarity index 94%
rename from configs/config-global-dhp__reaim-stress
rename to configs/config-reaim-stress
index fcc724219..1b61fb965 100644
--- a/configs/config-global-dhp__reaim-stress
+++ b/configs/config-reaim-stress
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="reaim"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__scheduler-forkintensive b/configs/config-scheduler-forkintensive
similarity index 98%
rename from configs/config-global-dhp__scheduler-forkintensive
rename to configs/config-scheduler-forkintensive
index 5924f443d..495c70d35 100644
--- a/configs/config-global-dhp__scheduler-forkintensive
+++ b/configs/config-scheduler-forkintensive
@@ -6,9 +6,6 @@
 # MM Test Parameters
 export MMTESTS="hackbench-process-pipes hackbench-process-sockets hackbench-thread-pipes hackbench-thread-sockets"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__scheduler-unbound b/configs/config-scheduler-unbound
similarity index 98%
rename from configs/config-global-dhp__scheduler-unbound
rename to configs/config-scheduler-unbound
index 7fce31793..f2888caa8 100644
--- a/configs/config-global-dhp__scheduler-unbound
+++ b/configs/config-scheduler-unbound
@@ -17,9 +17,6 @@
 # MM Test Parameters
 export MMTESTS="hackbench-process-pipes hackbench-process-sockets hackbench-thread-pipes hackbench-thread-sockets perfpipe"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__scimarkc-small b/configs/config-scimarkc-small
similarity index 85%
rename from configs/config-global-dhp__scimarkc-small
rename to configs/config-scimarkc-small
index 325d9ad3f..c311413eb 100644
--- a/configs/config-global-dhp__scimarkc-small
+++ b/configs/config-scimarkc-small
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="scimarkc"
 
-export OPROFILE_REPORT_CALLGRAPH=
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__sembench b/configs/config-sembench
similarity index 86%
rename from configs/config-global-dhp__sembench
rename to configs/config-sembench
index e16fc21bf..94653954e 100644
--- a/configs/config-global-dhp__sembench
+++ b/configs/config-sembench
@@ -1,12 +1,7 @@
-
 # MM Test Parameters
 export MMTESTS="sembench-sem sembench-nanosleep sembench-futex"
 export SKIP_WARMUP=yes
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-serverpair-dhp__network-netpipe b/configs/config-serverpair-network-netpipe
similarity index 100%
rename from configs/config-serverpair-dhp__network-netpipe
rename to configs/config-serverpair-network-netpipe
diff --git a/configs/config-serverpair-dhp__network-rr b/configs/config-serverpair-network-rr
similarity index 99%
rename from configs/config-serverpair-dhp__network-rr
rename to configs/config-serverpair-network-rr
index 963245577..083808297 100644
--- a/configs/config-serverpair-dhp__network-rr
+++ b/configs/config-serverpair-network-rr
@@ -4,7 +4,6 @@
 # MM Test Parameters
 export MMTESTS="netperf-udp-rr netperf-tcp-rr"
 
-
 # Machine configuration
 export REMOTE_SERVER_USER=root
 export REMOTE_SERVER_HOST=unknownhost
diff --git a/configs/config-serverpair-dhp__network-streaming b/configs/config-serverpair-network-streaming
similarity index 99%
rename from configs/config-serverpair-dhp__network-streaming
rename to configs/config-serverpair-network-streaming
index 09794cdf4..defb5679b 100644
--- a/configs/config-serverpair-dhp__network-streaming
+++ b/configs/config-serverpair-network-streaming
@@ -5,7 +5,6 @@
 # MM Test Parameters
 export MMTESTS="netperf-udp netperf-tcp tbench4"
 
-
 # Machine configuration
 export REMOTE_SERVER_USER=root
 export REMOTE_SERVER_HOST=unknownhost
diff --git a/configs/config-serverpair-dhp__sockperf b/configs/config-serverpair-sockperf
similarity index 99%
rename from configs/config-serverpair-dhp__sockperf
rename to configs/config-serverpair-sockperf
index a11f64335..ca1ecb2a6 100644
--- a/configs/config-serverpair-dhp__sockperf
+++ b/configs/config-serverpair-sockperf
@@ -4,7 +4,6 @@
 # MM Test Parameters
 export MMTESTS="sockperf-tcp-throughput sockperf-tcp-under-load sockperf-udp-throughput sockperf-udp-under-load"
 
-
 # Machine configuration
 export REMOTE_SERVER_USER=root
 export REMOTE_SERVER_HOST=unknownhost
diff --git a/configs/config-global-dhp__speccpu2006 b/configs/config-speccpu2006
similarity index 97%
rename from configs/config-global-dhp__speccpu2006
rename to configs/config-speccpu2006
index 3fb6d67ff..0213a5637 100644
--- a/configs/config-global-dhp__speccpu2006
+++ b/configs/config-speccpu2006
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="speccpu"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__speccpu2017-rate-parallel-full b/configs/config-speccpu2017-rate-parallel-full
similarity index 97%
rename from configs/config-global-dhp__speccpu2017-rate-parallel-full
rename to configs/config-speccpu2017-rate-parallel-full
index 5ac3b4faf..dd8657006 100644
--- a/configs/config-global-dhp__speccpu2017-rate-parallel-full
+++ b/configs/config-speccpu2017-rate-parallel-full
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="speccpu2017-rate-build speccpu2017-rate"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__speccpu2017-rate-parallel-half b/configs/config-speccpu2017-rate-parallel-half
similarity index 97%
rename from configs/config-global-dhp__speccpu2017-rate-parallel-half
rename to configs/config-speccpu2017-rate-parallel-half
index bc6d859fe..26e6728a2 100644
--- a/configs/config-global-dhp__speccpu2017-rate-parallel-half
+++ b/configs/config-speccpu2017-rate-parallel-half
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="speccpu2017-rate-build speccpu2017-rate"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__speccpu2017-rate-parallel-quarter b/configs/config-speccpu2017-rate-parallel-quarter
similarity index 97%
rename from configs/config-global-dhp__speccpu2017-rate-parallel-quarter
rename to configs/config-speccpu2017-rate-parallel-quarter
index f850cf698..ed5e6a357 100644
--- a/configs/config-global-dhp__speccpu2017-rate-parallel-quarter
+++ b/configs/config-speccpu2017-rate-parallel-quarter
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="speccpu2017-rate-build speccpu2017-rate"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__speccpu2017-speed b/configs/config-speccpu2017-speed
similarity index 96%
rename from configs/config-global-dhp__speccpu2017-speed
rename to configs/config-speccpu2017-speed
index 4e18a2cb1..ba45e6592 100644
--- a/configs/config-global-dhp__speccpu2017-speed
+++ b/configs/config-speccpu2017-speed
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="speccpu2017-speed-build speccpu2017-speed"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__speccpu2017-speed-parallel-full b/configs/config-speccpu2017-speed-parallel-full
similarity index 96%
rename from configs/config-global-dhp__speccpu2017-speed-parallel-full
rename to configs/config-speccpu2017-speed-parallel-full
index c1e9db511..b74ad2ffd 100644
--- a/configs/config-global-dhp__speccpu2017-speed-parallel-full
+++ b/configs/config-speccpu2017-speed-parallel-full
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="speccpu2017-speed-build speccpu2017-speed"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__speccpu2017-speed-parallel-half b/configs/config-speccpu2017-speed-parallel-half
similarity index 97%
rename from configs/config-global-dhp__speccpu2017-speed-parallel-half
rename to configs/config-speccpu2017-speed-parallel-half
index 49d5f483f..d5cea46f4 100644
--- a/configs/config-global-dhp__speccpu2017-speed-parallel-half
+++ b/configs/config-speccpu2017-speed-parallel-half
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="speccpu2017-speed-build speccpu2017-speed"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__speccpu2017-speed-parallel-quarter b/configs/config-speccpu2017-speed-parallel-quarter
similarity index 97%
rename from configs/config-global-dhp__speccpu2017-speed-parallel-quarter
rename to configs/config-speccpu2017-speed-parallel-quarter
index b84c76645..49bd081b4 100644
--- a/configs/config-global-dhp__speccpu2017-speed-parallel-quarter
+++ b/configs/config-speccpu2017-speed-parallel-quarter
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="speccpu2017-speed-build speccpu2017-speed"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__stress-cpuhotplug b/configs/config-stress-cpuhotplug
similarity index 95%
rename from configs/config-global-dhp__stress-cpuhotplug
rename to configs/config-stress-cpuhotplug
index 0fb4e0299..901047932 100644
--- a/configs/config-global-dhp__stress-cpuhotplug
+++ b/configs/config-stress-cpuhotplug
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="lhcs"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__sysbench-cpu b/configs/config-sysbench-cpu
similarity index 97%
rename from configs/config-global-dhp__sysbench-cpu
rename to configs/config-sysbench-cpu
index 5ccebdf04..3d13fb735 100644
--- a/configs/config-global-dhp__sysbench-cpu
+++ b/configs/config-sysbench-cpu
@@ -6,9 +6,6 @@
 # MM Test Parameters
 export MMTESTS="sysbenchcpu"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__sysbench-thread b/configs/config-sysbench-thread
similarity index 97%
rename from configs/config-global-dhp__sysbench-thread
rename to configs/config-sysbench-thread
index 9189ff93b..861f9af65 100644
--- a/configs/config-global-dhp__sysbench-thread
+++ b/configs/config-sysbench-thread
@@ -6,9 +6,6 @@
 # MM Test Parameters
 export MMTESTS="sysbenchthread"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__tlbflush-performance b/configs/config-tlbflush-performance
similarity index 98%
rename from configs/config-global-dhp__tlbflush-performance
rename to configs/config-tlbflush-performance
index 0b79df578..3e2e57548 100644
--- a/configs/config-global-dhp__tlbflush-performance
+++ b/configs/config-tlbflush-performance
@@ -10,9 +10,6 @@
 # MM Test Parameters
 export MMTESTS="pft ebizzy tlbflush"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__trinity b/configs/config-trinity
similarity index 93%
rename from configs/config-global-dhp__trinity
rename to configs/config-trinity
index 1bb9375cc..6575afce4 100644
--- a/configs/config-global-dhp__trinity
+++ b/configs/config-trinity
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="trinity"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-ebizzy b/configs/config-workload-ebizzy
similarity index 97%
rename from configs/config-global-dhp__workload-ebizzy
rename to configs/config-workload-ebizzy
index a00b205ec..8a9f5d01f 100644
--- a/configs/config-global-dhp__workload-ebizzy
+++ b/configs/config-workload-ebizzy
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="ebizzy"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-ebizzy-base b/configs/config-workload-ebizzy-base
similarity index 97%
rename from configs/config-global-dhp__workload-ebizzy-base
rename to configs/config-workload-ebizzy-base
index 661f14d9d..756559120 100644
--- a/configs/config-global-dhp__workload-ebizzy-base
+++ b/configs/config-workload-ebizzy-base
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="ebizzy"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-ebizzy-base-short b/configs/config-workload-ebizzy-base-short
similarity index 97%
rename from configs/config-global-dhp__workload-ebizzy-base-short
rename to configs/config-workload-ebizzy-base-short
index daa823fbc..ac6311e8c 100644
--- a/configs/config-global-dhp__workload-ebizzy-base-short
+++ b/configs/config-workload-ebizzy-base-short
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="ebizzy"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-ebizzy-short b/configs/config-workload-ebizzy-short
similarity index 97%
rename from configs/config-global-dhp__workload-ebizzy-short
rename to configs/config-workload-ebizzy-short
index 57d61d899..db383a403 100644
--- a/configs/config-global-dhp__workload-ebizzy-short
+++ b/configs/config-workload-ebizzy-short
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="ebizzy"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-fsmark-50m-inode b/configs/config-workload-fsmark-50m-inode
similarity index 98%
rename from configs/config-global-dhp__workload-fsmark-50m-inode
rename to configs/config-workload-fsmark-50m-inode
index 9abe059ca..f28372dd4 100644
--- a/configs/config-global-dhp__workload-fsmark-50m-inode
+++ b/configs/config-workload-fsmark-50m-inode
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="fsmark-threaded"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-fsmark-50m-zerofile-inode b/configs/config-workload-fsmark-50m-zerofile-inode
similarity index 98%
rename from configs/config-global-dhp__workload-fsmark-50m-zerofile-inode
rename to configs/config-workload-fsmark-50m-zerofile-inode
index 2761b350e..3afc50e09 100644
--- a/configs/config-global-dhp__workload-fsmark-50m-zerofile-inode
+++ b/configs/config-workload-fsmark-50m-zerofile-inode
@@ -7,9 +7,6 @@
 # MM Test Parameters
 export MMTESTS="fsmark-threaded"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-ipc-filelockperf b/configs/config-workload-ipc-filelockperf
similarity index 94%
rename from configs/config-global-dhp__workload-ipc-filelockperf
rename to configs/config-workload-ipc-filelockperf
index 5b6aae8e1..6129d3cd2 100644
--- a/configs/config-global-dhp__workload-ipc-filelockperf
+++ b/configs/config-workload-ipc-filelockperf
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="filelockperf-flock filelockperf-posix filelockperf-lease"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-ipc-scale-long b/configs/config-workload-ipc-scale-long
similarity index 96%
rename from configs/config-global-dhp__workload-ipc-scale-long
rename to configs/config-workload-ipc-scale-long
index 2ae1fe365..13681099f 100644
--- a/configs/config-global-dhp__workload-ipc-scale-long
+++ b/configs/config-workload-ipc-scale-long
@@ -4,10 +4,6 @@
 # MM Test Parameters
 export MMTESTS="ipcscale-sysvsempp"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-ipc-scale-short b/configs/config-workload-ipc-scale-short
similarity index 96%
rename from configs/config-global-dhp__workload-ipc-scale-short
rename to configs/config-workload-ipc-scale-short
index a2a9bb4b2..f337e576a 100644
--- a/configs/config-global-dhp__workload-ipc-scale-short
+++ b/configs/config-workload-ipc-scale-short
@@ -4,10 +4,6 @@
 # MM Test Parameters
 export MMTESTS="ipcscale-waitforzero ipcscale-posixsempp"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-microtput b/configs/config-workload-microtput
similarity index 97%
rename from configs/config-global-dhp__workload-microtput
rename to configs/config-workload-microtput
index 1a3714a17..9553fe139 100644
--- a/configs/config-global-dhp__workload-microtput
+++ b/configs/config-workload-microtput
@@ -2,9 +2,6 @@
 # MM Test Parameters
 export MMTESTS="microtput"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-mlc-peak-bandwidth b/configs/config-workload-mlc-peak-bandwidth
similarity index 91%
rename from configs/config-global-dhp__workload-mlc-peak-bandwidth
rename to configs/config-workload-mlc-peak-bandwidth
index a7a2e7b0c..677a3bd27 100644
--- a/configs/config-global-dhp__workload-mlc-peak-bandwidth
+++ b/configs/config-workload-mlc-peak-bandwidth
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="mlc"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-mlc-peak-bandwidth-oneht-tuned b/configs/config-workload-mlc-peak-bandwidth-oneht-tuned
similarity index 92%
rename from configs/config-global-dhp__workload-mlc-peak-bandwidth-oneht-tuned
rename to configs/config-workload-mlc-peak-bandwidth-oneht-tuned
index 5c6a78495..217bbc310 100644
--- a/configs/config-global-dhp__workload-mlc-peak-bandwidth-oneht-tuned
+++ b/configs/config-workload-mlc-peak-bandwidth-oneht-tuned
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="mlc"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload-mlc-peak-bandwidth-tuned b/configs/config-workload-mlc-peak-bandwidth-tuned
similarity index 91%
rename from configs/config-global-dhp__workload-mlc-peak-bandwidth-tuned
rename to configs/config-workload-mlc-peak-bandwidth-tuned
index 93cc41b38..6cde5a705 100644
--- a/configs/config-global-dhp__workload-mlc-peak-bandwidth-tuned
+++ b/configs/config-workload-mlc-peak-bandwidth-tuned
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="mlc"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_cyclictest-hackbench b/configs/config-workload_cyclictest-hackbench
similarity index 94%
rename from configs/config-global-dhp__workload_cyclictest-hackbench
rename to configs/config-workload_cyclictest-hackbench
index 3273ff96c..a9b72c9ec 100644
--- a/configs/config-global-dhp__workload_cyclictest-hackbench
+++ b/configs/config-workload_cyclictest-hackbench
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="cyclictest-pinned"
 
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__workload_cyclictest-none b/configs/config-workload_cyclictest-none
similarity index 94%
rename from configs/config-global-dhp__workload_cyclictest-none
rename to configs/config-workload_cyclictest-none
index e786666d7..bab0bff34 100644
--- a/configs/config-global-dhp__workload_cyclictest-none
+++ b/configs/config-workload_cyclictest-none
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="cyclictest-pinned cyclictest-unbound"
 
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__workload_dedup b/configs/config-workload_dedup
similarity index 95%
rename from configs/config-global-dhp__workload_dedup
rename to configs/config-workload_dedup
index 8e51b6cfe..6011461e0 100644
--- a/configs/config-global-dhp__workload_dedup
+++ b/configs/config-workload_dedup
@@ -8,10 +8,6 @@
 # MM Test Parameters
 export MMTESTS="dedup"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_freqmine b/configs/config-workload_freqmine
similarity index 94%
rename from configs/config-global-dhp__workload_freqmine
rename to configs/config-workload_freqmine
index 0642e6291..8caf10bbe 100644
--- a/configs/config-global-dhp__workload_freqmine
+++ b/configs/config-workload_freqmine
@@ -6,10 +6,6 @@
 # MM Test Parameters
 export MMTESTS="freqmine-small freqmine-medium freqmine-large"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_futexbench b/configs/config-workload_futexbench
similarity index 92%
rename from configs/config-global-dhp__workload_futexbench
rename to configs/config-workload_futexbench
index c00c8a1f7..8dc50c87c 100644
--- a/configs/config-global-dhp__workload_futexbench
+++ b/configs/config-workload_futexbench
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="futexbench-hash futexbench-requeue futexbench-wake"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_futexwait b/configs/config-workload_futexwait
similarity index 92%
rename from configs/config-global-dhp__workload_futexwait
rename to configs/config-workload_futexwait
index de9a9be16..83837c5a1 100644
--- a/configs/config-global-dhp__workload_futexwait
+++ b/configs/config-workload_futexwait
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="futexwait"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_jitter_detect b/configs/config-workload_jitter_detect
similarity index 93%
rename from configs/config-global-dhp__workload_jitter_detect
rename to configs/config-workload_jitter_detect
index 78f9d3faa..a9ea44ee0 100644
--- a/configs/config-global-dhp__workload_jitter_detect
+++ b/configs/config-workload_jitter_detect
@@ -5,9 +5,6 @@
 # MM Test Parameters
 export MMTESTS="sysjitter"
 
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__workload_johnripper b/configs/config-workload_johnripper
similarity index 100%
rename from configs/config-global-dhp__workload_johnripper
rename to configs/config-workload_johnripper
diff --git a/configs/config-global-dhp__workload_kerndevel b/configs/config-workload_kerndevel
similarity index 98%
rename from configs/config-global-dhp__workload_kerndevel
rename to configs/config-workload_kerndevel
index 91b19b648..e8cd2c791 100644
--- a/configs/config-global-dhp__workload_kerndevel
+++ b/configs/config-workload_kerndevel
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="kernbench gitcheckout"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_lat_ctx b/configs/config-workload_lat_ctx
similarity index 99%
rename from configs/config-global-dhp__workload_lat_ctx
rename to configs/config-workload_lat_ctx
index 209ffa291..d651f93b1 100644
--- a/configs/config-global-dhp__workload_lat_ctx
+++ b/configs/config-workload_lat_ctx
@@ -62,9 +62,6 @@
 # MM Test Parameters
 export MMTESTS="lmbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_libmicro b/configs/config-workload_libmicro
similarity index 96%
rename from configs/config-global-dhp__workload_libmicro
rename to configs/config-workload_libmicro
index 587165890..9165f11c2 100644
--- a/configs/config-global-dhp__workload_libmicro
+++ b/configs/config-workload_libmicro
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="libmicro-regular libmicro-memory libmicro-contextswitch libmicro-socket"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_libmicro-file b/configs/config-workload_libmicro-file
similarity index 96%
rename from configs/config-global-dhp__workload_libmicro-file
rename to configs/config-workload_libmicro-file
index ce8c767ea..be587fe41 100644
--- a/configs/config-global-dhp__workload_libmicro-file
+++ b/configs/config-workload_libmicro-file
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="libmicro-file"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_libmicro-process b/configs/config-workload_libmicro-process
similarity index 96%
rename from configs/config-global-dhp__workload_libmicro-process
rename to configs/config-workload_libmicro-process
index b20579332..4971b5828 100644
--- a/configs/config-global-dhp__workload_libmicro-process
+++ b/configs/config-workload_libmicro-process
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="libmicro-process"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_libmicro-smallbatch b/configs/config-workload_libmicro-smallbatch
similarity index 96%
rename from configs/config-global-dhp__workload_libmicro-smallbatch
rename to configs/config-workload_libmicro-smallbatch
index e3d699e4d..b571ec18f 100644
--- a/configs/config-global-dhp__workload_libmicro-smallbatch
+++ b/configs/config-workload_libmicro-smallbatch
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="libmicro-smallbatches"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_lkp-compress b/configs/config-workload_lkp-compress
similarity index 94%
rename from configs/config-global-dhp__workload_lkp-compress
rename to configs/config-workload_lkp-compress
index c30453ea0..150aed4d4 100644
--- a/configs/config-global-dhp__workload_lkp-compress
+++ b/configs/config-workload_lkp-compress
@@ -5,10 +5,6 @@
 # MM Test Parameters (no particular order)
 export MMTESTS="lkp-pigz lkp-pbzip2 lkp-pixz lkp-plzip"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_mailserver b/configs/config-workload_mailserver
similarity index 98%
rename from configs/config-global-dhp__workload_mailserver
rename to configs/config-workload_mailserver
index f577cde5c..23fa04faf 100644
--- a/configs/config-global-dhp__workload_mailserver
+++ b/configs/config-workload_mailserver
@@ -13,9 +13,6 @@
 # MM Test Parameters
 export MMTESTS="postmark ffsb"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_perfpipe b/configs/config-workload_perfpipe
similarity index 92%
rename from configs/config-global-dhp__workload_perfpipe
rename to configs/config-workload_perfpipe
index ed3f06d5a..0143af0cf 100644
--- a/configs/config-global-dhp__workload_perfpipe
+++ b/configs/config-workload_perfpipe
@@ -1,10 +1,6 @@
 # MM Test Parameters
 export MMTESTS="perfpipe"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_perfpipe-cpufreq b/configs/config-workload_perfpipe-cpufreq
similarity index 92%
rename from configs/config-global-dhp__workload_perfpipe-cpufreq
rename to configs/config-workload_perfpipe-cpufreq
index 6e491166d..c405ee868 100644
--- a/configs/config-global-dhp__workload_perfpipe-cpufreq
+++ b/configs/config-workload_perfpipe-cpufreq
@@ -1,10 +1,6 @@
 # MM Test Parameters
 export MMTESTS="perfpipe"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_perfpipe-cpufreq-cross-ht b/configs/config-workload_perfpipe-cpufreq-cross-ht
similarity index 93%
rename from configs/config-global-dhp__workload_perfpipe-cpufreq-cross-ht
rename to configs/config-workload_perfpipe-cpufreq-cross-ht
index ef525e34c..69ea24b34 100644
--- a/configs/config-global-dhp__workload_perfpipe-cpufreq-cross-ht
+++ b/configs/config-workload_perfpipe-cpufreq-cross-ht
@@ -1,10 +1,6 @@
 # MM Test Parameters
 export MMTESTS="perfpipe"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_perfpipe-cpufreq-cross-socket b/configs/config-workload_perfpipe-cpufreq-cross-socket
similarity index 93%
rename from configs/config-global-dhp__workload_perfpipe-cpufreq-cross-socket
rename to configs/config-workload_perfpipe-cpufreq-cross-socket
index d18b8d225..28fac5117 100644
--- a/configs/config-global-dhp__workload_perfpipe-cpufreq-cross-socket
+++ b/configs/config-workload_perfpipe-cpufreq-cross-socket
@@ -1,10 +1,6 @@
 # MM Test Parameters
 export MMTESTS="perfpipe"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_perfpipe-cross-ht b/configs/config-workload_perfpipe-cross-ht
similarity index 92%
rename from configs/config-global-dhp__workload_perfpipe-cross-ht
rename to configs/config-workload_perfpipe-cross-ht
index a2d23f8b4..6e79fc8ef 100644
--- a/configs/config-global-dhp__workload_perfpipe-cross-ht
+++ b/configs/config-workload_perfpipe-cross-ht
@@ -1,10 +1,6 @@
 # MM Test Parameters
 export MMTESTS="perfpipe"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_perfpipe-cross-socket b/configs/config-workload_perfpipe-cross-socket
similarity index 92%
rename from configs/config-global-dhp__workload_perfpipe-cross-socket
rename to configs/config-workload_perfpipe-cross-socket
index 16f4db419..4a2f15dc3 100644
--- a/configs/config-global-dhp__workload_perfpipe-cross-socket
+++ b/configs/config-workload_perfpipe-cross-socket
@@ -1,10 +1,6 @@
 # MM Test Parameters
 export MMTESTS="perfpipe"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_perfsyscall b/configs/config-workload_perfsyscall
similarity index 92%
rename from configs/config-global-dhp__workload_perfsyscall
rename to configs/config-workload_perfsyscall
index 5eeaa4eee..1ba447c2f 100644
--- a/configs/config-global-dhp__workload_perfsyscall
+++ b/configs/config-workload_perfsyscall
@@ -1,10 +1,6 @@
 # MM Test Parameters
 export MMTESTS="perfsyscall"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_perfsyscall-cpufreq b/configs/config-workload_perfsyscall-cpufreq
similarity index 92%
rename from configs/config-global-dhp__workload_perfsyscall-cpufreq
rename to configs/config-workload_perfsyscall-cpufreq
index 969230280..a4dacf9bc 100644
--- a/configs/config-global-dhp__workload_perfsyscall-cpufreq
+++ b/configs/config-workload_perfsyscall-cpufreq
@@ -1,10 +1,6 @@
 # MM Test Parameters
 export MMTESTS="perfsyscall"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_perfsyscall-cpufreq-pinned b/configs/config-workload_perfsyscall-cpufreq-pinned
similarity index 93%
rename from configs/config-global-dhp__workload_perfsyscall-cpufreq-pinned
rename to configs/config-workload_perfsyscall-cpufreq-pinned
index 44e54992a..8174d51da 100644
--- a/configs/config-global-dhp__workload_perfsyscall-cpufreq-pinned
+++ b/configs/config-workload_perfsyscall-cpufreq-pinned
@@ -1,10 +1,6 @@
 # MM Test Parameters
 export MMTESTS="perfsyscall"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_perfsyscall-pinned b/configs/config-workload_perfsyscall-pinned
similarity index 92%
rename from configs/config-global-dhp__workload_perfsyscall-pinned
rename to configs/config-workload_perfsyscall-pinned
index 041661ac6..3395271a2 100644
--- a/configs/config-global-dhp__workload_perfsyscall-pinned
+++ b/configs/config-workload_perfsyscall-pinned
@@ -1,10 +1,6 @@
 # MM Test Parameters
 export MMTESTS="perfsyscall"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_redis_memonly-large b/configs/config-workload_redis_memonly-large
similarity index 98%
rename from configs/config-global-dhp__workload_redis_memonly-large
rename to configs/config-workload_redis_memonly-large
index c3d257b22..9392421b2 100644
--- a/configs/config-global-dhp__workload_redis_memonly-large
+++ b/configs/config-workload_redis_memonly-large
@@ -9,9 +9,6 @@
 # MM Test Parameters
 export MMTESTS="redis"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_redis_memonly-large-tuned b/configs/config-workload_redis_memonly-large-tuned
similarity index 98%
rename from configs/config-global-dhp__workload_redis_memonly-large-tuned
rename to configs/config-workload_redis_memonly-large-tuned
index 5bfd3c934..5004d062d 100644
--- a/configs/config-global-dhp__workload_redis_memonly-large-tuned
+++ b/configs/config-workload_redis_memonly-large-tuned
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="redis"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_redis_memonly-medium b/configs/config-workload_redis_memonly-medium
similarity index 98%
rename from configs/config-global-dhp__workload_redis_memonly-medium
rename to configs/config-workload_redis_memonly-medium
index caef300fe..724fd18b3 100644
--- a/configs/config-global-dhp__workload_redis_memonly-medium
+++ b/configs/config-workload_redis_memonly-medium
@@ -9,9 +9,6 @@
 # MM Test Parameters
 export MMTESTS="redis"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_redis_memonly-medium-tuned b/configs/config-workload_redis_memonly-medium-tuned
similarity index 98%
rename from configs/config-global-dhp__workload_redis_memonly-medium-tuned
rename to configs/config-workload_redis_memonly-medium-tuned
index eb09f25b6..d254a16bc 100644
--- a/configs/config-global-dhp__workload_redis_memonly-medium-tuned
+++ b/configs/config-workload_redis_memonly-medium-tuned
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="redis"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_redis_memonly-small b/configs/config-workload_redis_memonly-small
similarity index 98%
rename from configs/config-global-dhp__workload_redis_memonly-small
rename to configs/config-workload_redis_memonly-small
index e19aa329d..f5bd705ad 100644
--- a/configs/config-global-dhp__workload_redis_memonly-small
+++ b/configs/config-workload_redis_memonly-small
@@ -9,9 +9,6 @@
 # MM Test Parameters
 export MMTESTS="redis"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_redis_memonly-small-tuned b/configs/config-workload_redis_memonly-small-tuned
similarity index 97%
rename from configs/config-global-dhp__workload_redis_memonly-small-tuned
rename to configs/config-workload_redis_memonly-small-tuned
index f5723ebbf..5ee72a6a6 100644
--- a/configs/config-global-dhp__workload_redis_memonly-small-tuned
+++ b/configs/config-workload_redis_memonly-small-tuned
@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="redis"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_schbench b/configs/config-workload_schbench
similarity index 97%
rename from configs/config-global-dhp__workload_schbench
rename to configs/config-workload_schbench
index 6165f755e..4d3ad9ded 100644
--- a/configs/config-global-dhp__workload_schbench
+++ b/configs/config-workload_schbench
@@ -14,9 +14,6 @@
 # MM Test Parameters
 export MMTESTS="schbench"
 
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__workload_sembench-futex b/configs/config-workload_sembench-futex
similarity index 92%
rename from configs/config-global-dhp__workload_sembench-futex
rename to configs/config-workload_sembench-futex
index 25547b6a8..7b15a60a6 100644
--- a/configs/config-global-dhp__workload_sembench-futex
+++ b/configs/config-workload_sembench-futex
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="sembench-futex"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_shellscripts b/configs/config-workload_shellscripts
similarity index 97%
rename from configs/config-global-dhp__workload_shellscripts
rename to configs/config-workload_shellscripts
index 830d0d459..573934d0d 100644
--- a/configs/config-global-dhp__workload_shellscripts
+++ b/configs/config-workload_shellscripts
@@ -10,9 +10,6 @@
 # MM Test Parameters
 export MMTESTS="gitsource"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_simoop-short b/configs/config-workload_simoop-short
similarity index 96%
rename from configs/config-global-dhp__workload_simoop-short
rename to configs/config-workload_simoop-short
index f1db635fb..60d51e718 100644
--- a/configs/config-global-dhp__workload_simoop-short
+++ b/configs/config-workload_simoop-short
@@ -9,10 +9,6 @@
 # MM Test Parameters (no particular order)
 export MMTESTS="simoop"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_simoop-sniff b/configs/config-workload_simoop-sniff
similarity index 96%
rename from configs/config-global-dhp__workload_simoop-sniff
rename to configs/config-workload_simoop-sniff
index b7ae9fb92..ed82e344e 100644
--- a/configs/config-global-dhp__workload_simoop-sniff
+++ b/configs/config-workload_simoop-sniff
@@ -9,10 +9,6 @@
 # MM Test Parameters (no particular order)
 export MMTESTS="simoop"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_sparsetruncate-large b/configs/config-workload_sparsetruncate-large
similarity index 93%
rename from configs/config-global-dhp__workload_sparsetruncate-large
rename to configs/config-workload_sparsetruncate-large
index 2f7970874..66efc4a25 100644
--- a/configs/config-global-dhp__workload_sparsetruncate-large
+++ b/configs/config-workload_sparsetruncate-large
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="sparsetruncate"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_sparsetruncate-small b/configs/config-workload_sparsetruncate-small
similarity index 93%
rename from configs/config-global-dhp__workload_sparsetruncate-small
rename to configs/config-workload_sparsetruncate-small
index 57b029a5b..45ba7a24c 100644
--- a/configs/config-global-dhp__workload_sparsetruncate-small
+++ b/configs/config-workload_sparsetruncate-small
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="sparsetruncate"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_sparsetruncate-tiny b/configs/config-workload_sparsetruncate-tiny
similarity index 92%
rename from configs/config-global-dhp__workload_sparsetruncate-tiny
rename to configs/config-workload_sparsetruncate-tiny
index 3ed84f37b..f504460d1 100644
--- a/configs/config-global-dhp__workload_sparsetruncate-tiny
+++ b/configs/config-workload_sparsetruncate-tiny
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="sparsetruncate"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_stockfish b/configs/config-workload_stockfish
similarity index 96%
rename from configs/config-global-dhp__workload_stockfish
rename to configs/config-workload_stockfish
index 33ef1c972..2e4945c08 100644
--- a/configs/config-global-dhp__workload_stockfish
+++ b/configs/config-workload_stockfish
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="stockfish"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_stream-omp-20 b/configs/config-workload_stream-omp-20
similarity index 92%
rename from configs/config-global-dhp__workload_stream-omp-20
rename to configs/config-workload_stream-omp-20
index 8a544c3bb..a2acd4e25 100644
--- a/configs/config-global-dhp__workload_stream-omp-20
+++ b/configs/config-workload_stream-omp-20
@@ -1,14 +1,9 @@
-
 # MM Test Parameters
 export MMTESTS="stream"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
 . $SHELLPACK_INCLUDE/include-sizes.sh
 get_numa_details
 
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_stream-omp-cpus b/configs/config-workload_stream-omp-cpus
similarity index 92%
rename from configs/config-global-dhp__workload_stream-omp-cpus
rename to configs/config-workload_stream-omp-cpus
index d4e31444d..d2b7d61ac 100644
--- a/configs/config-global-dhp__workload_stream-omp-cpus
+++ b/configs/config-workload_stream-omp-cpus
@@ -1,14 +1,9 @@
-
 # MM Test Parameters
 export MMTESTS="stream"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
 . $SHELLPACK_INCLUDE/include-sizes.sh
 get_numa_details
 
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_stream-omp-llcs b/configs/config-workload_stream-omp-llcs
similarity index 92%
rename from configs/config-global-dhp__workload_stream-omp-llcs
rename to configs/config-workload_stream-omp-llcs
index e7de07e25..ed8965cc0 100644
--- a/configs/config-global-dhp__workload_stream-omp-llcs
+++ b/configs/config-workload_stream-omp-llcs
@@ -1,14 +1,9 @@
-
 # MM Test Parameters
 export MMTESTS="stream"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
 . $SHELLPACK_INCLUDE/include-sizes.sh
 get_numa_details
 
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_stream-omp-nodes b/configs/config-workload_stream-omp-nodes
similarity index 92%
rename from configs/config-global-dhp__workload_stream-omp-nodes
rename to configs/config-workload_stream-omp-nodes
index 62cfdc8ed..344afb6fa 100644
--- a/configs/config-global-dhp__workload_stream-omp-nodes
+++ b/configs/config-workload_stream-omp-nodes
@@ -1,14 +1,9 @@
-
 # MM Test Parameters
 export MMTESTS="stream"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
 . $SHELLPACK_INCLUDE/include-sizes.sh
 get_numa_details
 
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_stream-omp-nodes-spread b/configs/config-workload_stream-omp-nodes-spread
similarity index 93%
rename from configs/config-global-dhp__workload_stream-omp-nodes-spread
rename to configs/config-workload_stream-omp-nodes-spread
index 8787c602e..d29584604 100644
--- a/configs/config-global-dhp__workload_stream-omp-nodes-spread
+++ b/configs/config-workload_stream-omp-nodes-spread
@@ -1,14 +1,9 @@
-
 # MM Test Parameters
 export MMTESTS="stream"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
 . $SHELLPACK_INCLUDE/include-sizes.sh
 get_numa_details
 
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_stream-single b/configs/config-workload_stream-single
similarity index 92%
rename from configs/config-global-dhp__workload_stream-single
rename to configs/config-workload_stream-single
index af9b4b468..0dd389b89 100644
--- a/configs/config-global-dhp__workload_stream-single
+++ b/configs/config-workload_stream-single
@@ -1,14 +1,9 @@
-
 # MM Test Parameters
 export MMTESTS="stream"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
 . $SHELLPACK_INCLUDE/include-sizes.sh
 get_numa_details
 
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_stream-single-bind b/configs/config-workload_stream-single-bind
similarity index 92%
rename from configs/config-global-dhp__workload_stream-single-bind
rename to configs/config-workload_stream-single-bind
index 840e9652f..fcb0e681d 100644
--- a/configs/config-global-dhp__workload_stream-single-bind
+++ b/configs/config-workload_stream-single-bind
@@ -1,14 +1,9 @@
-
 # MM Test Parameters
 export MMTESTS="stream"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
 . $SHELLPACK_INCLUDE/include-sizes.sh
 get_numa_details
 
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_stressng-context b/configs/config-workload_stressng-context
similarity index 94%
rename from configs/config-global-dhp__workload_stressng-context
rename to configs/config-workload_stressng-context
index 7f0182a5c..fa975a16f 100644
--- a/configs/config-global-dhp__workload_stressng-context
+++ b/configs/config-workload_stressng-context
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="stressng"
 
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__workload_stressng-context-profile b/configs/config-workload_stressng-context-profile
similarity index 94%
rename from configs/config-global-dhp__workload_stressng-context-profile
rename to configs/config-workload_stressng-context-profile
index a13afe4f1..48dff47b3 100644
--- a/configs/config-global-dhp__workload_stressng-context-profile
+++ b/configs/config-workload_stressng-context-profile
@@ -4,9 +4,6 @@
 # MM Test Parameters
 export MMTESTS="stressng"
 
-
-# Machine configuration
-
 # List of monitors
 export RUN_MONITOR=yes
 export MONITORS_ALWAYS=
diff --git a/configs/config-global-dhp__workload_thotdata b/configs/config-workload_thotdata
similarity index 93%
rename from configs/config-global-dhp__workload_thotdata
rename to configs/config-workload_thotdata
index a5dcc9691..babd5e5c7 100644
--- a/configs/config-global-dhp__workload_thotdata
+++ b/configs/config-workload_thotdata
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="thotdata"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_thpfioscale b/configs/config-workload_thpfioscale
similarity index 100%
rename from configs/config-global-dhp__workload_thpfioscale
rename to configs/config-workload_thpfioscale
diff --git a/configs/config-global-dhp__workload_thpfioscale-defrag b/configs/config-workload_thpfioscale-defrag
similarity index 100%
rename from configs/config-global-dhp__workload_thpfioscale-defrag
rename to configs/config-workload_thpfioscale-defrag
diff --git a/configs/config-global-dhp__workload_thpfioscale-madvhugepage b/configs/config-workload_thpfioscale-madvhugepage
similarity index 100%
rename from configs/config-global-dhp__workload_thpfioscale-madvhugepage
rename to configs/config-workload_thpfioscale-madvhugepage
diff --git a/configs/config-global-dhp__workload_thpscale b/configs/config-workload_thpscale
similarity index 95%
rename from configs/config-global-dhp__workload_thpscale
rename to configs/config-workload_thpscale
index 1a6991319..2e4fa5a0c 100644
--- a/configs/config-global-dhp__workload_thpscale
+++ b/configs/config-workload_thpscale
@@ -10,10 +10,6 @@
 # MM Test Parameters
 export MMTESTS="thpscale"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_thpscale-madvhugepage b/configs/config-workload_thpscale-madvhugepage
similarity index 95%
rename from configs/config-global-dhp__workload_thpscale-madvhugepage
rename to configs/config-workload_thpscale-madvhugepage
index 086f5d8c7..b67c2fd3d 100644
--- a/configs/config-global-dhp__workload_thpscale-madvhugepage
+++ b/configs/config-workload_thpscale-madvhugepage
@@ -10,10 +10,6 @@
 # MM Test Parameters
 export MMTESTS="thpscale"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_unixbench b/configs/config-workload_unixbench
similarity index 93%
rename from configs/config-global-dhp__workload_unixbench
rename to configs/config-workload_unixbench
index c33ac1124..5fe944105 100644
--- a/configs/config-global-dhp__workload_unixbench
+++ b/configs/config-workload_unixbench
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="unixbench-dhry2reg unixbench-syscall unixbench-pipe unixbench-spawn unixbench-execl"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_unixbench-io b/configs/config-workload_unixbench-io
similarity index 93%
rename from configs/config-global-dhp__workload_unixbench-io
rename to configs/config-workload_unixbench-io
index 64fd188f9..bb78a0855 100644
--- a/configs/config-global-dhp__workload_unixbench-io
+++ b/configs/config-workload_unixbench-io
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="unixbench-fsbuffer unixbench-fsbuffer-r unixbench-fsbuffer-w unixbench-fsdisk unixbench-fsdisk-r unixbench-fsdisk-w unixbench-fstime unixbench-fstime-r unixbench-fstime-w"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_unixbench-io-fsbuffer b/configs/config-workload_unixbench-io-fsbuffer
similarity index 92%
rename from configs/config-global-dhp__workload_unixbench-io-fsbuffer
rename to configs/config-workload_unixbench-io-fsbuffer
index be29fa4af..4011b770d 100644
--- a/configs/config-global-dhp__workload_unixbench-io-fsbuffer
+++ b/configs/config-workload_unixbench-io-fsbuffer
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="unixbench-fsbuffer unixbench-fsbuffer-r unixbench-fsbuffer-w"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_unixbench-io-fsdisk b/configs/config-workload_unixbench-io-fsdisk
similarity index 92%
rename from configs/config-global-dhp__workload_unixbench-io-fsdisk
rename to configs/config-workload_unixbench-io-fsdisk
index 077f52dea..2af74c572 100644
--- a/configs/config-global-dhp__workload_unixbench-io-fsdisk
+++ b/configs/config-workload_unixbench-io-fsdisk
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="unixbench-fsdisk unixbench-fsdisk-r unixbench-fsdisk-w"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_unixbench-io-fstime b/configs/config-workload_unixbench-io-fstime
similarity index 92%
rename from configs/config-global-dhp__workload_unixbench-io-fstime
rename to configs/config-workload_unixbench-io-fstime
index 8f1066565..925bc71fd 100644
--- a/configs/config-global-dhp__workload_unixbench-io-fstime
+++ b/configs/config-workload_unixbench-io-fstime
@@ -1,11 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="unixbench-fstime unixbench-fstime-r unixbench-fstime-w"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_usemem b/configs/config-workload_usemem
similarity index 94%
rename from configs/config-global-dhp__workload_usemem
rename to configs/config-workload_usemem
index ce5c08640..e33d57bf5 100644
--- a/configs/config-global-dhp__workload_usemem
+++ b/configs/config-workload_usemem
@@ -5,10 +5,6 @@
 # MM Test Parameters
 export MMTESTS="usemem"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_usemem-stress-numa-compact b/configs/config-workload_usemem-stress-numa-compact
similarity index 95%
rename from configs/config-global-dhp__workload_usemem-stress-numa-compact
rename to configs/config-workload_usemem-stress-numa-compact
index 9fd7dfec2..e9d4b7e2a 100644
--- a/configs/config-global-dhp__workload_usemem-stress-numa-compact
+++ b/configs/config-workload_usemem-stress-numa-compact
@@ -5,10 +5,6 @@
 # MM Test Parameters
 export MMTESTS="usemem"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_usemem-swap-ramdisk b/configs/config-workload_usemem-swap-ramdisk
similarity index 96%
rename from configs/config-global-dhp__workload_usemem-swap-ramdisk
rename to configs/config-workload_usemem-swap-ramdisk
index c00f9ee47..a0575900e 100644
--- a/configs/config-global-dhp__workload_usemem-swap-ramdisk
+++ b/configs/config-workload_usemem-swap-ramdisk
@@ -1,9 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="usemem"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
 # Machine configuration
 export TESTDISK_RD_PREALLOC=yes
 export TESTDISK_RD_SIZE=$((MEMTOTAL_BYTES/3))
diff --git a/configs/config-global-dhp__workload_will-it-scale-io b/configs/config-workload_will-it-scale-io
similarity index 95%
rename from configs/config-global-dhp__workload_will-it-scale-io
rename to configs/config-workload_will-it-scale-io
index 810d7cd7b..b0ab538c6 100644
--- a/configs/config-global-dhp__workload_will-it-scale-io
+++ b/configs/config-workload_will-it-scale-io
@@ -8,10 +8,6 @@
 # MM Test Parameters (no particular order)
 export MMTESTS="wis-pread wis-pwrite wis-unlink wis-mmap wis-open wis-poll wis-filelock wis-read wis-fallocate"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__workload_will-it-scale-sys b/configs/config-workload_will-it-scale-sys
similarity index 95%
rename from configs/config-global-dhp__workload_will-it-scale-sys
rename to configs/config-workload_will-it-scale-sys
index 994ace9c2..d099f9e3b 100644
--- a/configs/config-global-dhp__workload_will-it-scale-sys
+++ b/configs/config-workload_will-it-scale-sys
@@ -6,10 +6,6 @@
 # MM Test Parameters (no particular order)
 export MMTESTS="wis-futex wis-malloc wis-pf wis-getppid wis-sched wis-pthreadmutex wis-signal wis-pipe wis-eventfd wis-posixsems"
 
-#export OPROFILE_REPORT_CALLGRAPH=8
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0
diff --git a/configs/config-global-dhp__wp-tlbflush b/configs/config-workload_wp-tlbflush
similarity index 96%
rename from configs/config-global-dhp__wp-tlbflush
rename to configs/config-workload_wp-tlbflush
index 81490e894..f77c61435 100644
--- a/configs/config-global-dhp__wp-tlbflush
+++ b/configs/config-workload_wp-tlbflush
@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="wptlbflush"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0