From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 30 Mar 2010 11:54:11 +0000 (+0000)
Subject: Rename configuration variables *_model into */model (to start a hierarchy)
X-Git-Tag: SVN~346
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9f54e5c450791e19b01f31e86c93e5a603fd0c4b

Rename configuration variables *_model into */model (to start a hierarchy)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7394 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/ChangeLog b/ChangeLog
index 7b63594643..07655906f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,11 @@ SimGrid (3.3.5-svn) unstable; urgency=low
   * Add a MSG_task_set_data() function
  SIMIX:
   * add a SIMIX_sem_get_capacity() function
+ SURF:
+  * Rename configuration variables to start a hierarchy:
+    o cpu_model -> cpu/model
+    o network_model -> network/model
+    o workstation_model -> workstation/model
  SMPI:
   * Implement MPI_Get_count, MPI_MAXLOC, MPI_MINLOC
  XBT:
diff --git a/buildtools/Cmake/src/memcheck_tests.txt b/buildtools/Cmake/src/memcheck_tests.txt
index 31db6dde85..c3cd590c7b 100644
--- a/buildtools/Cmake/src/memcheck_tests.txt
+++ b/buildtools/Cmake/src/memcheck_tests.txt
@@ -109,9 +109,9 @@ ADD_TEST(memcheck-gras-properties-rl-0 /bin/sh -c "cd ~/Developments/simgrid/exa
 ADD_TEST(memcheck-gras-properties-rl-1 /bin/sh -c "cd ~/Developments/simgrid/examples/gras/properties/ && ./properties_bob --log=root.fmt=%P:%t%e%m%n")
 
 # MSG examples
-ADD_TEST(memcheck-msg-sendrecv_CLM03-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml --cfg=workstation_model:CLM03 --cfg=cpu_model:Cas01 --cfg=network_model:CM02")
-ADD_TEST(memcheck-msg-sendrecv_Vegas-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Vegas"")
-ADD_TEST(memcheck-msg-sendrecv_Reno-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Reno" --log=surf_lagrange.thres=critical")
+ADD_TEST(memcheck-msg-sendrecv_CLM03-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu_model:Cas01 --cfg=network_model:CM02")
+ADD_TEST(memcheck-msg-sendrecv_Vegas-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu_model:Cas01 network_model:Vegas"")
+ADD_TEST(memcheck-msg-sendrecv_Reno-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu_model:Cas01 network_model:Reno" --log=surf_lagrange.thres=critical")
 ADD_TEST(memcheck-msg-suspend-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && suspend/suspend ./msg_platform.xml ./suspend/deployment_suspend.xml ")
 ADD_TEST(memcheck-msg-masterslave-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./small_platform.xml ./masterslave/deployment_masterslave.xml")
 ADD_TEST(memcheck-msg-masterslave-forwarder-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./msg_platform.xml ./masterslave/deployment_masterslave_forwarder.xml ")
@@ -122,17 +122,17 @@ ADD_TEST(memcheck-msg-ptask-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg
 ADD_TEST(memcheck-msg-ptask-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && parallel_task/test_ptask ./parallel_task/test_ptask_platform.xml ./parallel_task/test_ptask_deployment.xml")
 ADD_TEST(memcheck-msg-priority-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && priority/priority ./small_platform.xml  ./priority/deployment_priority.xml")
 ADD_TEST(memcheck-msg-properties-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && properties/msg_prop ./../platforms/prop.xml ./properties/deployment_properties.xml ")
-ADD_TEST(memcheck-msg-trace-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test1.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test2.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test3.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-3 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test4.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-4 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test5.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-5 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test6.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-6 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test7.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-7 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test8.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-8 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test9.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-9 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test10.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-10 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test11.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test1.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test2.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test3.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-3 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test4.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-4 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test5.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-5 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test6.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-6 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test7.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-7 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test8.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-8 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test9.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-9 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test10.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-10 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test11.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
 ADD_TEST(memcheck-msg-masterslave_cpu_ti-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./small_platform.xml ./masterslave/deployment_masterslave.xml --cfg=cpu_model:CpuTI")
 ADD_TEST(memcheck-msg-masterslave_cpu_ti-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./msg_platform.xml ./masterslave/deployment_masterslave_forwarder.xml --cfg=cpu_model:CpuTI")
 ADD_TEST(memcheck-msg-masterslave_cpu_ti-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_failure --log=xbt_cfg.thres:critical --log=no_loc ./small_platform_with_failures.xml ./masterslave/deployment_masterslave.xml --cfg=path:${PROJECT_DIRECTORY}/src --cfg=cpu_model:CpuTI")
@@ -186,11 +186,11 @@ ADD_TEST(memcheck-smpi-reduce-0 /bin/sh -c "cd ~/Developments/simgrid/examples/s
 ADD_TEST(memcheck-smpi-reduce-1 /bin/sh -c "cd ~/Developments/simgrid/examples/smpi/ && ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 6 ./reduce -q")
 ADD_TEST(memcheck-smpi-reduce-2 /bin/sh -c "cd ~/Developments/simgrid/examples/smpi/ && ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 12 ./reduce -q ")
 if(HAVE_GTNETS)
-ADD_TEST(memcheck-msg-gtnets1-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
-ADD_TEST(memcheck-msg-gtnets2-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
-ADD_TEST(memcheck-msg-gtnets3-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
-ADD_TEST(memcheck-msg-gtnets4-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08")
-ADD_TEST(memcheck-msg-gtnets5-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01  --cfg=network_model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO")
+ADD_TEST(memcheck-msg-gtnets1-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
+ADD_TEST(memcheck-msg-gtnets2-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
+ADD_TEST(memcheck-msg-gtnets3-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
+ADD_TEST(memcheck-msg-gtnets4-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08")
+ADD_TEST(memcheck-msg-gtnets5-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01  --cfg=network_model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO")
 endif(HAVE_GTNETS)
 
 set(MEMCHECK_LIST
diff --git a/examples/msg/README b/examples/msg/README
index 140708a7b1..7b670cda30 100644
--- a/examples/msg/README
+++ b/examples/msg/README
@@ -24,7 +24,7 @@ OLD NAME: ping_pong.c
     make sendrecv/sendrecv
 
     - Execute:
-    sendrecv/sendrecv <platformfile.xml> <deploymentfile.xml> --cfg=workstation_model:<networkmodel>
+    sendrecv/sendrecv <platformfile.xml> <deploymentfile.xml> --cfg=workstation/model:<networkmodel>
     where networkmodel can be one of the following:
         1) CLM03                 - Simple fairness model
         2) KFCCNL05              - Maxmin fairness
diff --git a/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh
index 089f5ef796..2b8af36225 100644
--- a/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh
+++ b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh
@@ -2,10 +2,10 @@
 
 p Testing dogbone communication pattern with GTNets model
 
-$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'GTNets'
+$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets'
 > [S1:master:(1) 0.300171] [msg_test/INFO] Send completed (to C1). Transfer time: 0.300171	 Agregate bandwidth: 33314.335278
 > [S1:master:(1) 0.300171] [msg_test/INFO] Completed peer: C1 time: 0.300171
 > [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 33314.335278 ;  message from S1 to C1  with remaining : 0.000000
diff --git a/examples/msg/gtnets/gtnets-dogbone-lv08.tesh b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh
index 9b5cee9a25..9ba462c595 100644
--- a/examples/msg/gtnets/gtnets-dogbone-lv08.tesh
+++ b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh
@@ -2,10 +2,10 @@
 
 p Testing dogbone communication pattern with LV08 model
 
-$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'LV08'
+$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08'
 > [S1:master:(1) 0.342000] [msg_test/INFO] Send completed (to C1). Transfer time: 0.342000	 Agregate bandwidth: 29239.766082
 > [S1:master:(1) 0.342000] [msg_test/INFO] Completed peer: C1 time: 0.342000
 > [S2:master:(2) 0.342000] [msg_test/INFO] Send completed (to C2). Transfer time: 0.342000	 Agregate bandwidth: 29239.766082
diff --git a/examples/msg/gtnets/gtnets-onelink-gtnets.tesh b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh
index 48dd4b2c34..1eeb08e082 100644
--- a/examples/msg/gtnets/gtnets-onelink-gtnets.tesh
+++ b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh
@@ -2,10 +2,10 @@
 
 p Testing onelink communication pattern with GTNets model
 
-$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'GTNets'
+$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets'
 > [S1:master:(1) 106.291000] [msg_test/INFO] Send completed (to C1). Transfer time: 106.291000	 Agregate bandwidth: 9408.134273
 > [S1:master:(1) 106.291000] [msg_test/INFO] Completed peer: C1 time: 106.291000
 > [C1:slave:(2) 106.291000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9408.134273 ;  message from S1 to C1  with remaining : 0.000000
diff --git a/examples/msg/gtnets/gtnets-onelink-lv08.tesh b/examples/msg/gtnets/gtnets-onelink-lv08.tesh
index 38cf50c777..a54832d81b 100644
--- a/examples/msg/gtnets/gtnets-onelink-lv08.tesh
+++ b/examples/msg/gtnets/gtnets-onelink-lv08.tesh
@@ -2,10 +2,10 @@
 
 p Testing onelink communication pattern with LV08 model
 
-$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01  --cfg=network_model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'LV08'
+$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01  --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08'
 > [S1:master:(1) 108.799652] [msg_test/INFO] Send completed (to C1). Transfer time: 108.799652	 Agregate bandwidth: 9191.205854
 > [S1:master:(1) 108.799652] [msg_test/INFO] Completed peer: C1 time: 108.799652
 > [C1:slave:(2) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9191.205854 ;  message from S1 to C1  with remaining : 0.000000
diff --git a/examples/msg/gtnets/gtnets-waxman.tesh b/examples/msg/gtnets/gtnets-waxman.tesh
index 502faed368..1fc2030869 100644
--- a/examples/msg/gtnets/gtnets-waxman.tesh
+++ b/examples/msg/gtnets/gtnets-waxman.tesh
@@ -2,10 +2,10 @@
 
 p Testing waxman radom communication pattern with GTNets model, 200 nodes, 200 flows
 
-$ gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'GTNets'
+$ gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets'
 > [Gavrel:master:(245) 0.016724] [msg_test/INFO] Send completed (to Lafontaine). Transfer time: 0.016724	 Agregate bandwidth: 5979535.896806
 > [Gavrel:master:(245) 0.016724] [msg_test/INFO] Completed peer: Lafontaine time: 0.016724
 > [Lafontaine:slave:(246) 0.016724] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 59795.358968 ;  message from Ouellet to Amadeus  with remaining : 99000.000000
diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index 43b2826c29..fe661afa12 100644
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -142,11 +142,10 @@ MSG_error_t test_all(const char *platform_file, const char *application_file)
 {
   MSG_error_t res = MSG_OK;
 
-  /* MSG_config("workstation_model", "GTNETS"); */
-  /* MSG_config("workstation_model","KCCFLN05"); */
+  /* MSG_config("workstation/model", "GTNETS"); */
+  /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
     MSG_set_channel_number(MAX_CHANNEL);
-    //MSG_paje_output("msg_test.trace");
     MSG_create_environment(platform_file);
   }
   {                             /*   Application deployment */
diff --git a/examples/msg/masterslave/masterslave_cpu_ti.tesh b/examples/msg/masterslave/masterslave_cpu_ti.tesh
index d6515923f9..f11de0657f 100644
--- a/examples/msg/masterslave/masterslave_cpu_ti.tesh
+++ b/examples/msg/masterslave/masterslave_cpu_ti.tesh
@@ -2,8 +2,8 @@
 
 p Testing a simple master/slave example application
 
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 5 slaves and 20 tasks to process
 > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" to "Jupiter"
@@ -126,8 +126,8 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_pla
 
 p Testing a master/slave example application with a forwarder module
 
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Got 5 slaves and 20 tasks to process
 > [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" to "iRMX"
@@ -276,7 +276,7 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platf
 
 p Testing a simple master/slave example application handling failures
 
-$ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu_model:CpuTI
+$ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu/model:CpuTI
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [0.000000] [simix_process/WARNING] Cannot launch process 'slave' on failed host 'Fafard'
 > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 5 slave(s) :
@@ -370,8 +370,8 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 
 p Testing the bypassing of the flexml parser
 
-$ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [0.000000] [surf_parse/WARNING] Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.
 > [host A:master:(1) 0.000000] [msg_test/INFO] Got 1 slave(s) :
diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c
index 170255e2e7..b7dd543fe9 100644
--- a/examples/msg/masterslave/masterslave_failure.c
+++ b/examples/msg/masterslave/masterslave_failure.c
@@ -182,7 +182,7 @@ MSG_error_t test_all(const char *platform_file, const char *application_file)
 {
   MSG_error_t res = MSG_OK;
 
-  /* MSG_config("workstation_model","KCCFLN05"); */
+  /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
     MSG_set_channel_number(MAX_CHANNEL);
     MSG_create_environment(platform_file);
diff --git a/examples/msg/masterslave/masterslave_forwarder.c b/examples/msg/masterslave/masterslave_forwarder.c
index 58f6b305d4..c1eb978451 100644
--- a/examples/msg/masterslave/masterslave_forwarder.c
+++ b/examples/msg/masterslave/masterslave_forwarder.c
@@ -179,7 +179,7 @@ MSG_error_t test_all(const char *platform_file, const char *application_file)
 {
   MSG_error_t res = MSG_OK;
 
-  /* MSG_config("surf_workstation_model","KCCFLN05"); */
+  /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
     MSG_set_channel_number(MAX_CHANNEL);
     MSG_create_environment(platform_file);
diff --git a/examples/msg/masterslave/masterslave_mailbox.c b/examples/msg/masterslave/masterslave_mailbox.c
index 382f78def7..32e5051a0c 100644
--- a/examples/msg/masterslave/masterslave_mailbox.c
+++ b/examples/msg/masterslave/masterslave_mailbox.c
@@ -96,7 +96,7 @@ MSG_error_t test_all(const char *platform_file,
 {
   MSG_error_t res = MSG_OK;
 
-  /* MSG_config("surf_workstation_model","KCCFLN05"); */
+  /* MSG_config("workstation/model","KCCFLN05"); */
   {				/*  Simulation setting */
     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
diff --git a/examples/msg/parallel_task/parallel_task.c b/examples/msg/parallel_task/parallel_task.c
index 771a97be46..8f13bd362f 100644
--- a/examples/msg/parallel_task/parallel_task.c
+++ b/examples/msg/parallel_task/parallel_task.c
@@ -63,7 +63,7 @@ MSG_error_t test_all(const char *platform_file)
 {
   MSG_error_t res = MSG_OK;
 
-  MSG_config("workstation_model", "ptask_L07");
+  MSG_config("workstation/model", "ptask_L07");
   MSG_set_channel_number(1);
   MSG_create_environment(platform_file);
 
diff --git a/examples/msg/parallel_task/test_ptask.c b/examples/msg/parallel_task/test_ptask.c
index df74c53ae7..8ee0ec9142 100644
--- a/examples/msg/parallel_task/test_ptask.c
+++ b/examples/msg/parallel_task/test_ptask.c
@@ -128,7 +128,7 @@ MSG_error_t test_all(const char *platform_file, const char *application_file)
   MSG_error_t res = MSG_OK;
 
 
-  MSG_config("workstation_model", "ptask_L07");
+  MSG_config("workstation/model", "ptask_L07");
 
   /*  Simulation setting */
   MSG_set_channel_number(MAX_CHANNEL);
diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c
index 68deabd3c3..785ae0b04c 100644
--- a/examples/msg/sendrecv/sendrecv.c
+++ b/examples/msg/sendrecv/sendrecv.c
@@ -167,14 +167,14 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
-  /* Options for the workstation_model:
+  /* Options for the workstation/model:
 
      KCCFLN05              => for maxmin
      KCCFLN05_proportional => for proportional (Vegas)
      KCCFLN05_Vegas        => for TCP Vegas
      KCCFLN05_Reno         => for TCP Reno
    */
-  //MSG_config("workstation_model", argv[3]);
+  //MSG_config("workstation/model", argv[3]);
 
   res = test_all(argv[1], argv[2]);
 
diff --git a/examples/msg/sendrecv/sendrecv_CLM03.tesh b/examples/msg/sendrecv/sendrecv_CLM03.tesh
index fd6a2f6b4c..478e23a5ed 100644
--- a/examples/msg/sendrecv/sendrecv_CLM03.tesh
+++ b/examples/msg/sendrecv/sendrecv_CLM03.tesh
@@ -2,10 +2,10 @@
 
 p Testing the surf network maxmin fairness model
 
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation_model:CLM03 --cfg=cpu_model:Cas01 --cfg=network_model:CM02
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'CLM03'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu/model:Cas01 --cfg=network/model:CM02
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'CLM03'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
 > [0.000000] [msg_test/INFO] test_all
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [Inmos:sender:(1) 0.000000] [msg_test/INFO] sender
diff --git a/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh b/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh
index ce6f19ee93..4c2f861048 100644
--- a/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh
+++ b/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh
@@ -2,8 +2,8 @@
 
 p Testing the surf network maxmin fairness model
 
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation_model:CLM03
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'CLM03'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'CLM03'
 > [0.000000] [msg_test/INFO] test_all
 > [Inmos:sender:(1) 0.000000] [msg_test/INFO] sender
 > [Inmos:sender:(1) 0.000000] [msg_test/INFO] host = Bellevue
diff --git a/examples/msg/sendrecv/sendrecv_Reno.tesh b/examples/msg/sendrecv/sendrecv_Reno.tesh
index cb5e86cd55..f01be06129 100644
--- a/examples/msg/sendrecv/sendrecv_Reno.tesh
+++ b/examples/msg/sendrecv/sendrecv_Reno.tesh
@@ -3,10 +3,10 @@
 p Testing the surf network Reno fairness model using lagrangian approach
 
 
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Reno" --log=surf_lagrange.thres=critical
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'Reno'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Reno'
 > [0.000000] [msg_test/INFO] test_all
 > [Inmos:sender:(1) 0.000000] [msg_test/INFO] sender
 > [Inmos:sender:(1) 0.000000] [msg_test/INFO] host = Bellevue
diff --git a/examples/msg/sendrecv/sendrecv_Vegas.tesh b/examples/msg/sendrecv/sendrecv_Vegas.tesh
index 39cac19ba3..0f5a5844cc 100644
--- a/examples/msg/sendrecv/sendrecv_Vegas.tesh
+++ b/examples/msg/sendrecv/sendrecv_Vegas.tesh
@@ -2,10 +2,10 @@
 
 p Testing the surf network Vegas fairness model using lagrangian approach
 
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Vegas"
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'Vegas'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas"
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vegas'
 > [0.000000] [msg_test/INFO] test_all
 > [Inmos:sender:(1) 0.000000] [msg_test/INFO] sender
 > [Inmos:sender:(1) 0.000000] [msg_test/INFO] host = Bellevue
diff --git a/examples/msg/trace/trace.tesh b/examples/msg/trace/trace.tesh
index 548f62798f..3d14f38ef6 100644
--- a/examples/msg/trace/trace.tesh
+++ b/examples/msg/trace/trace.tesh
@@ -2,10 +2,10 @@
 
 p Testing trace integration using file.trace and test1.xml, a < max(time), b < max(time)
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test1.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 400.000000
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -13,10 +13,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test1.xm
 
 p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time) 
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test2.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 850.000000
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -25,10 +25,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test2.xm
 
 p Testing trace integration using file.trace and test3.xml, a < max(time), b > 2 max(time) 
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test3.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 1980.000000
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -36,10 +36,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test3.xm
 
 p Testing trace integration using file.trace and test4.xml, max(time) < a < 2max(time), max(time) < b < 2max(time)
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test4.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task size: 400.000000
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -47,10 +47,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test4.xm
 
 p Testing trace integration using file.trace and test5.xml, max(time) < a < 2max(time), 2max(time) < b < 3max(time)
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test5.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 90.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 90.000000] [test_trace_integration/INFO] Task size: 850.000000
 > [CPU1:test_trace:(1) 90.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -58,10 +58,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test5.xm
 
 p Testing trace integration using file.trace and test6.xml, max(time) < a < 2max(time), b > 3max(time)
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test6.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task size: 1980.000000
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -69,10 +69,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test6.xm
 
 p Testing trace integration using file.trace and test7.xml, two process with same priority
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test7.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 400.000000
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.500000
@@ -84,10 +84,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test7.xm
 
 p Testing trace integration using file.trace and test8.xml, two process with different priority
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test8.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 400.000000
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 2.500000
@@ -99,10 +99,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test8.xm
 
 p Testing trace integration using file.trace and test9.xml, three process with same priority
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test9.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task size: 400.000000
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -118,10 +118,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test9.xm
 
 p Testing trace integration using file.trace and test10.xml, three process with different priority
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test10.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task size: 420.000000
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task prio: 2.000000
@@ -137,10 +137,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test10.x
 
 p Testing trace integration using file.trace and test11.xml, three process with different priority. Changed timestep to 0.1.
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test11.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task size: 420.000000
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task prio: 2.000000
diff --git a/src/msg/msg_config.c b/src/msg/msg_config.c
index 11cbc29c73..d82888df0e 100644
--- a/src/msg/msg_config.c
+++ b/src/msg/msg_config.c
@@ -15,7 +15,7 @@
 /** \brief set a configuration variable
  *
  * Currently existing configuation variable:
- *   - workstation_model (string): Model of workstation to use.
+ *   - workstation/model (string): Model of workstation to use.
  *     Possible values (defaults to "KCCFLN05"):
  *     - "CLM03": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + support for parallel tasks
  *     - "KCCFLN05": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file.
@@ -25,7 +25,7 @@
  *     - "KCCFLN05_Reno": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file. Uses the fairness adapted to the TCP Reno flow control.
  *
  * Example:
- * MSG_config("workstation_model","KCCFLN05");
+ * MSG_config("workstation/model","KCCFLN05");
  */
 void MSG_config(const char *name, ...)
 {
diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 8fb38b6267..ac344b333f 100644
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -72,7 +72,7 @@ void SD_init(int *argc, char **argv)
   sd_global->task_number = 0;
 
   surf_init(argc, argv);
-  xbt_cfg_set_string(_surf_cfg_set, "workstation_model", "ptask_L07");
+  xbt_cfg_set_string(_surf_cfg_set, "workstation/model", "ptask_L07");
 }
 
 /**
diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 49b3b2a0dd..e5b64aaf14 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -57,7 +57,7 @@ int _surf_init_status = 0;      /* 0: beginning of time;
                                    1: pre-inited (cfg_set created);
                                    2: inited (running) */
 
-/* callback of the workstation_model variable */
+/* callback of the workstation/model variable */
 static void _surf_cfg_cb__workstation_model(const char *name, int pos)
 {
   char *val;
@@ -71,7 +71,7 @@ static void _surf_cfg_cb__workstation_model(const char *name, int pos)
   find_model_description(surf_workstation_model_description, val);
 }
 
-/* callback of the cpu_model variable */
+/* callback of the cpu/model variable */
 static void _surf_cfg_cb__cpu_model(const char *name, int pos)
 {
   char *val;
@@ -145,7 +145,7 @@ void surf_config_init(int *argc, char **argv)
                 surf_cpu_model_description[i].name);
     default_value = xbt_strdup("Cas01");
     xbt_cfg_register(&_surf_cfg_set,
-                     "cpu_model", description, xbt_cfgelm_string,
+                     "cpu/model", description, xbt_cfgelm_string,
                      &default_value, 1, 1, &_surf_cfg_cb__cpu_model, NULL);
 
     sprintf(description,
@@ -158,7 +158,7 @@ void surf_config_init(int *argc, char **argv)
                 surf_network_model_description[i].name);
     default_value = xbt_strdup("LV08");
     xbt_cfg_register(&_surf_cfg_set,
-                     "network_model", description, xbt_cfgelm_string,
+                     "network/model", description, xbt_cfgelm_string,
                      &default_value, 1, 1, &_surf_cfg_cb__network_model,
                      NULL);
 
@@ -172,7 +172,7 @@ void surf_config_init(int *argc, char **argv)
                 surf_workstation_model_description[i].name);
     default_value = xbt_strdup("CLM03");
     xbt_cfg_register(&_surf_cfg_set,
-                     "workstation_model", description, xbt_cfgelm_string,
+                     "workstation/model", description, xbt_cfgelm_string,
                      &default_value, 1, 1, &_surf_cfg_cb__workstation_model,
                      NULL);
 
@@ -243,15 +243,15 @@ void surf_config_models_setup(const char *platform_file)
   surf_timer_model_init(platform_file);
 
   workstation_model_name =
-    xbt_cfg_get_string(_surf_cfg_set, "workstation_model");
-  char *network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network_model");
-  char *cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu_model");
+    xbt_cfg_get_string(_surf_cfg_set, "workstation/model");
+  char *network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network/model");
+  char *cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu/model");
 
   if ((strcmp(network_model_name,"LV08") || strcmp(cpu_model_name,"Cas01"))
       && !strcmp(workstation_model_name, "CLM03")){
     const char *val = "compound";
     INFO0("Switching workstation model to compound since you changed the network and/or cpu model(s)");
-    xbt_cfg_set_string(_surf_cfg_set,"workstation_model",val);
+    xbt_cfg_set_string(_surf_cfg_set,"workstation/model",val);
     workstation_model_name = (char*)"compound";
   }
 
@@ -288,7 +288,7 @@ void surf_config_models_setup(const char *platform_file)
 void surf_config_models_create_elms(void)
 {
   char *workstation_model_name =
-    xbt_cfg_get_string(_surf_cfg_set, "workstation_model");
+    xbt_cfg_get_string(_surf_cfg_set, "workstation/model");
   int workstation_id =
     find_model_description(surf_workstation_model_description,
                            workstation_model_name);