diff --git a/data/final_platforms/old_miriel.xml b/data/final_platforms/old_miriel.xml
index 228dd7cac2e27fabaf80f8e9207bc9ad647a755e..6324b7b901b48f34169b8aceaa502dd0c880cc59 100644
--- a/data/final_platforms/old_miriel.xml
+++ b/data/final_platforms/old_miriel.xml
@@ -24,7 +24,7 @@
  <prop id="smpi/ois" value="0:1.79150437795041e-06:2.60957841144294e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
  <prop id="smpi/or" value="0:3.27843243070814e-06:3.41675771019744e-09;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
  <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
- <prop id="smpi/lat_factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
+ <prop id="smpi/lat-factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
  <prop id="smpi/async_small_thres" value="17408"/>
  <prop id="smpi/send_is_detached_thres" value="17408"/>
  <prop id="smpi/wtime" value="4.08585e-08"/>
diff --git a/data/final_platforms/sirocco.xml b/data/final_platforms/sirocco.xml
index 4b235a4d10f81e0ff8c3e7aae0edfaa1430f6810..55219a1b2ff2c3e7ad2bbaced0cd245442da95e5 100644
--- a/data/final_platforms/sirocco.xml
+++ b/data/final_platforms/sirocco.xml
@@ -24,7 +24,7 @@
 <prop id="smpi/ois" value="0:2.7741781272553e-06:2.1631688187721e-10;1420:4.03664653739977e-06:6.92199520863807e-11;65536:5.77600529533672e-06:8.19394370464538e-11;131072:2.46349531812281e-06:1.48757168395357e-13;4e+05:2.43434499482972e-06:3.03855696558919e-13"/>
 <prop id="smpi/or" value="0:5.24254663627748e-06:2.05940556065388e-09;1420:1.13604897462265e-05:2.8332717225738e-10;65536:7.36920463371884e-06:3.32186380684382e-10;131072:0:0;4e+05:0:0"/>
 <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
-<prop id="smpi/lat_factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
+<prop id="smpi/lat-factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
 <prop id="smpi/async_small_thres" value="65536"/>
 <prop id="smpi/send_is_detached_thres" value="320000"/>
 <prop id="smpi/wtime" value="3.098699e-08"/>
diff --git a/data/miriel_27_06_2016/calibration/Analysis.Rmd b/data/miriel_27_06_2016/calibration/Analysis.Rmd
index bdcf1b2b42e319f7cb044141067e72bbf29852d3..548200002e7e2539cca917acd5f968f781cfe036 100644
--- a/data/miriel_27_06_2016/calibration/Analysis.Rmd
+++ b/data/miriel_27_06_2016/calibration/Analysis.Rmd
@@ -299,7 +299,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat-factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
   desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';'))
@@ -307,7 +307,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
   bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
-  lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
+  lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
   ois <- xmlNode("prop", attrs = c(id="smpi/ois", value=desc[desc$Name=="smpi/ois",]$label))
diff --git a/data/miriel_27_06_2016/calibration/testplatform.Rmd b/data/miriel_27_06_2016/calibration/testplatform.Rmd
index db1c06779242983c1d82d2de67d4cba66da0d23e..8e6213cb0f26ca2fac9582a2d3afaf7ae2538f28 100644
--- a/data/miriel_27_06_2016/calibration/testplatform.Rmd
+++ b/data/miriel_27_06_2016/calibration/testplatform.Rmd
@@ -389,7 +389,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/ois" value="0:1.75232188013067e-06:2.20494312485917e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/or" value="0:3.33315583120708e-06:3.40864964492857e-09;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/bw-factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/>
-##  <prop id="smpi/lat_factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/>
+##  <prop id="smpi/lat-factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/>
 ##  <prop id="smpi/async_small_thres" value="17408"/>
 ##  <prop id="smpi/send_is_detached_thres" value="17408"/>
 ##  <prop id="smpi/wtime" value="4.085767e-08"/>
diff --git a/data/miriel_27_06_2016/calibration/testplatform.html b/data/miriel_27_06_2016/calibration/testplatform.html
index 852f35d168aff442932dac20c1a096a05d58e03d..336b1e87de780b165e5282ed11e94c6e005f7094 100644
--- a/data/miriel_27_06_2016/calibration/testplatform.html
+++ b/data/miriel_27_06_2016/calibration/testplatform.html
@@ -545,7 +545,7 @@ Time for one MPI_Test call</p>
 ##  &lt;prop id=&quot;smpi/ois&quot; value=&quot;0:1.75232188013067e-06:2.20494312485917e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/or&quot; value=&quot;0:3.33315583120708e-06:3.40864964492857e-09;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/bw-factor&quot; value=&quot;0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955&quot;/&gt;
-##  &lt;prop id=&quot;smpi/lat_factor&quot; value=&quot;0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192&quot;/&gt;
+##  &lt;prop id=&quot;smpi/lat-factor&quot; value=&quot;0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/async_small_thres&quot; value=&quot;17408&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/send_is_detached_thres&quot; value=&quot;17408&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/wtime&quot; value=&quot;4.085767e-08&quot;/&gt;
diff --git a/data/miriel_27_06_2016/calibration/testplatform.md b/data/miriel_27_06_2016/calibration/testplatform.md
index db1c06779242983c1d82d2de67d4cba66da0d23e..8e6213cb0f26ca2fac9582a2d3afaf7ae2538f28 100644
--- a/data/miriel_27_06_2016/calibration/testplatform.md
+++ b/data/miriel_27_06_2016/calibration/testplatform.md
@@ -389,7 +389,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/ois" value="0:1.75232188013067e-06:2.20494312485917e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/or" value="0:3.33315583120708e-06:3.40864964492857e-09;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/bw-factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/>
-##  <prop id="smpi/lat_factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/>
+##  <prop id="smpi/lat-factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/>
 ##  <prop id="smpi/async_small_thres" value="17408"/>
 ##  <prop id="smpi/send_is_detached_thres" value="17408"/>
 ##  <prop id="smpi/wtime" value="4.085767e-08"/>
diff --git a/data/miriel_27_06_2016/calibration/testplatform_output.xml b/data/miriel_27_06_2016/calibration/testplatform_output.xml
index c389b45426431396432f260d594140d853eb0a94..b592b9380a8f238bec67297682aa5dcf700a5158 100644
--- a/data/miriel_27_06_2016/calibration/testplatform_output.xml
+++ b/data/miriel_27_06_2016/calibration/testplatform_output.xml
@@ -4,7 +4,7 @@
  <prop id="smpi/ois" value="0:1.75232188013067e-06:2.20494312485917e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
  <prop id="smpi/or" value="0:3.33315583120708e-06:3.40864964492857e-09;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
  <prop id="smpi/bw-factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/>
- <prop id="smpi/lat_factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/>
+ <prop id="smpi/lat-factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/>
  <prop id="smpi/async_small_thres" value="17408"/>
  <prop id="smpi/send_is_detached_thres" value="17408"/>
  <prop id="smpi/wtime" value="4.085767e-08"/>
diff --git a/data/plafrim_15_06_16/calibration/Analysis.Rmd b/data/plafrim_15_06_16/calibration/Analysis.Rmd
index bdcf1b2b42e319f7cb044141067e72bbf29852d3..548200002e7e2539cca917acd5f968f781cfe036 100644
--- a/data/plafrim_15_06_16/calibration/Analysis.Rmd
+++ b/data/plafrim_15_06_16/calibration/Analysis.Rmd
@@ -299,7 +299,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat-factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
   desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';'))
@@ -307,7 +307,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
   bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
-  lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
+  lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
   ois <- xmlNode("prop", attrs = c(id="smpi/ois", value=desc[desc$Name=="smpi/ois",]$label))
diff --git a/data/plafrim_15_06_16/calibration/testplatform.Rmd b/data/plafrim_15_06_16/calibration/testplatform.Rmd
index 0f5a208ec41163de9282fb2a6dbb84389022b61a..f029ccb0f46e4f007333bf6e92abba80fb94e2a3 100644
--- a/data/plafrim_15_06_16/calibration/testplatform.Rmd
+++ b/data/plafrim_15_06_16/calibration/testplatform.Rmd
@@ -394,7 +394,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/ois" value="0:1.79150437795041e-06:2.60957841144294e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
 ##  <prop id="smpi/or" value="0:3.27843243070814e-06:3.41675771019744e-09;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
 ##  <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
-##  <prop id="smpi/lat_factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
+##  <prop id="smpi/lat-factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
 ##  <prop id="smpi/async_small_thres" value="17408"/>
 ##  <prop id="smpi/send_is_detached_thres" value="17408"/>
 ##  <prop id="smpi/wtime" value="4.08585e-08"/>
diff --git a/data/plafrim_15_06_16/calibration/testplatform.html b/data/plafrim_15_06_16/calibration/testplatform.html
index 19b703a510d38d82c62a5f02a62aa112ea24c746..5eea5943b87e2a8483a4de967e8347c7cebda8b8 100644
--- a/data/plafrim_15_06_16/calibration/testplatform.html
+++ b/data/plafrim_15_06_16/calibration/testplatform.html
@@ -550,7 +550,7 @@ Time for one MPI_Test call</p>
 ##  &lt;prop id=&quot;smpi/ois&quot; value=&quot;0:1.79150437795041e-06:2.60957841144294e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/or&quot; value=&quot;0:3.27843243070814e-06:3.41675771019744e-09;1420:0:0;65536:0:0;131072:0:0;450000:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/bw-factor&quot; value=&quot;0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705&quot;/&gt;
-##  &lt;prop id=&quot;smpi/lat_factor&quot; value=&quot;0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401&quot;/&gt;
+##  &lt;prop id=&quot;smpi/lat-factor&quot; value=&quot;0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/async_small_thres&quot; value=&quot;17408&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/send_is_detached_thres&quot; value=&quot;17408&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/wtime&quot; value=&quot;4.08585e-08&quot;/&gt;
diff --git a/data/plafrim_15_06_16/calibration/testplatform.md b/data/plafrim_15_06_16/calibration/testplatform.md
index 0f5a208ec41163de9282fb2a6dbb84389022b61a..f029ccb0f46e4f007333bf6e92abba80fb94e2a3 100644
--- a/data/plafrim_15_06_16/calibration/testplatform.md
+++ b/data/plafrim_15_06_16/calibration/testplatform.md
@@ -394,7 +394,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/ois" value="0:1.79150437795041e-06:2.60957841144294e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
 ##  <prop id="smpi/or" value="0:3.27843243070814e-06:3.41675771019744e-09;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
 ##  <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
-##  <prop id="smpi/lat_factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
+##  <prop id="smpi/lat-factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
 ##  <prop id="smpi/async_small_thres" value="17408"/>
 ##  <prop id="smpi/send_is_detached_thres" value="17408"/>
 ##  <prop id="smpi/wtime" value="4.08585e-08"/>
diff --git a/data/plafrim_15_06_16/calibration/testplatform_output.xml b/data/plafrim_15_06_16/calibration/testplatform_output.xml
index ea026f51840ca03f2a3f683a62efea366384c303..35f4dcd1b91f5b5e03f5d0d62a3232c3f8f0195b 100644
--- a/data/plafrim_15_06_16/calibration/testplatform_output.xml
+++ b/data/plafrim_15_06_16/calibration/testplatform_output.xml
@@ -4,7 +4,7 @@
  <prop id="smpi/ois" value="0:1.79150437795041e-06:2.60957841144294e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
  <prop id="smpi/or" value="0:3.27843243070814e-06:3.41675771019744e-09;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
  <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
- <prop id="smpi/lat_factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
+ <prop id="smpi/lat-factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
  <prop id="smpi/async_small_thres" value="17408"/>
  <prop id="smpi/send_is_detached_thres" value="17408"/>
  <prop id="smpi/wtime" value="4.08585e-08"/>
diff --git a/data/sirocco_01_08_2016/calibration/Analysis.Rmd b/data/sirocco_01_08_2016/calibration/Analysis.Rmd
index 41090ac1a7627420be0552fad7384fc930de79e3..f4e08b5bba680f29b97f7a3cf4856f3f325e68c3 100644
--- a/data/sirocco_01_08_2016/calibration/Analysis.Rmd
+++ b/data/sirocco_01_08_2016/calibration/Analysis.Rmd
@@ -300,7 +300,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat-factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
   desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';'))
@@ -308,7 +308,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
   bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
-  lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
+  lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
   ois <- xmlNode("prop", attrs = c(id="smpi/ois", value=desc[desc$Name=="smpi/ois",]$label))
diff --git a/data/sirocco_01_08_2016/calibration/sirocco_output.xml b/data/sirocco_01_08_2016/calibration/sirocco_output.xml
index 39c9fa11ad4619294afde86de140da6dbaf8085a..a3548bd15e7c9ebd148163b949141af75b818e64 100644
--- a/data/sirocco_01_08_2016/calibration/sirocco_output.xml
+++ b/data/sirocco_01_08_2016/calibration/sirocco_output.xml
@@ -4,7 +4,7 @@
  <prop id="smpi/ois" value="0:2.7741781272553e-06:2.1631688187721e-10;1420:4.03664653739977e-06:6.92199520863807e-11;65536:5.77600529533672e-06:8.19394370464538e-11;131072:2.46349531812281e-06:1.48757168395357e-13;4e+05:2.43434499482972e-06:3.03855696558919e-13"/>
  <prop id="smpi/or" value="0:5.24254663627748e-06:2.05940556065388e-09;1420:1.13604897462265e-05:2.8332717225738e-10;65536:7.36920463371884e-06:3.32186380684382e-10;131072:0:0;4e+05:0:0"/>
  <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
- <prop id="smpi/lat_factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
+ <prop id="smpi/lat-factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
  <prop id="smpi/async_small_thres" value="65536"/>
  <prop id="smpi/send_is_detached_thres" value="320000"/>
  <prop id="smpi/wtime" value="3.098699e-08"/>
diff --git a/data/sirocco_01_08_2016/calibration/testplatform.Rmd b/data/sirocco_01_08_2016/calibration/testplatform.Rmd
index cec90049099aa4f200528ba3fcb29d2884d3996c..a134aee4010f2df8b433a15ce19fc442a18c7669 100644
--- a/data/sirocco_01_08_2016/calibration/testplatform.Rmd
+++ b/data/sirocco_01_08_2016/calibration/testplatform.Rmd
@@ -520,7 +520,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/ois" value="0:2.7741781272553e-06:2.1631688187721e-10;1420:4.03664653739977e-06:6.92199520863807e-11;65536:5.77600529533672e-06:8.19394370464538e-11;131072:2.46349531812281e-06:1.48757168395357e-13;4e+05:2.43434499482972e-06:3.03855696558919e-13"/>
 ##  <prop id="smpi/or" value="0:5.24254663627748e-06:2.05940556065388e-09;1420:1.13604897462265e-05:2.8332717225738e-10;65536:7.36920463371884e-06:3.32186380684382e-10;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
-##  <prop id="smpi/lat_factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
+##  <prop id="smpi/lat-factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
 ##  <prop id="smpi/async_small_thres" value="65536"/>
 ##  <prop id="smpi/send_is_detached_thres" value="320000"/>
 ##  <prop id="smpi/wtime" value="3.098699e-08"/>
diff --git a/data/sirocco_01_08_2016/calibration/testplatform.html b/data/sirocco_01_08_2016/calibration/testplatform.html
index caa9a08c0c787ef36b3ee6c98e4f8c7d0624672c..d6a4cf31822f78bbc81c9971f38c473cc6b790c8 100644
--- a/data/sirocco_01_08_2016/calibration/testplatform.html
+++ b/data/sirocco_01_08_2016/calibration/testplatform.html
@@ -676,7 +676,7 @@ Time for one MPI_Test call</p>
 ##  &lt;prop id=&quot;smpi/ois&quot; value=&quot;0:2.7741781272553e-06:2.1631688187721e-10;1420:4.03664653739977e-06:6.92199520863807e-11;65536:5.77600529533672e-06:8.19394370464538e-11;131072:2.46349531812281e-06:1.48757168395357e-13;4e+05:2.43434499482972e-06:3.03855696558919e-13&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/or&quot; value=&quot;0:5.24254663627748e-06:2.05940556065388e-09;1420:1.13604897462265e-05:2.8332717225738e-10;65536:7.36920463371884e-06:3.32186380684382e-10;131072:0:0;4e+05:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/bw-factor&quot; value=&quot;0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999&quot;/&gt;
-##  &lt;prop id=&quot;smpi/lat_factor&quot; value=&quot;0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862&quot;/&gt;
+##  &lt;prop id=&quot;smpi/lat-factor&quot; value=&quot;0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/async_small_thres&quot; value=&quot;65536&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/send_is_detached_thres&quot; value=&quot;320000&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/wtime&quot; value=&quot;3.098699e-08&quot;/&gt;
diff --git a/data/sirocco_01_08_2016/calibration/testplatform.md b/data/sirocco_01_08_2016/calibration/testplatform.md
index cec90049099aa4f200528ba3fcb29d2884d3996c..a134aee4010f2df8b433a15ce19fc442a18c7669 100644
--- a/data/sirocco_01_08_2016/calibration/testplatform.md
+++ b/data/sirocco_01_08_2016/calibration/testplatform.md
@@ -520,7 +520,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/ois" value="0:2.7741781272553e-06:2.1631688187721e-10;1420:4.03664653739977e-06:6.92199520863807e-11;65536:5.77600529533672e-06:8.19394370464538e-11;131072:2.46349531812281e-06:1.48757168395357e-13;4e+05:2.43434499482972e-06:3.03855696558919e-13"/>
 ##  <prop id="smpi/or" value="0:5.24254663627748e-06:2.05940556065388e-09;1420:1.13604897462265e-05:2.8332717225738e-10;65536:7.36920463371884e-06:3.32186380684382e-10;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
-##  <prop id="smpi/lat_factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
+##  <prop id="smpi/lat-factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
 ##  <prop id="smpi/async_small_thres" value="65536"/>
 ##  <prop id="smpi/send_is_detached_thres" value="320000"/>
 ##  <prop id="smpi/wtime" value="3.098699e-08"/>
diff --git a/data/taurus_26_07_2016/calibration/Analysis.Rmd b/data/taurus_26_07_2016/calibration/Analysis.Rmd
index 41090ac1a7627420be0552fad7384fc930de79e3..f4e08b5bba680f29b97f7a3cf4856f3f325e68c3 100644
--- a/data/taurus_26_07_2016/calibration/Analysis.Rmd
+++ b/data/taurus_26_07_2016/calibration/Analysis.Rmd
@@ -300,7 +300,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat-factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
   desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';'))
@@ -308,7 +308,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
   bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
-  lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
+  lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
   ois <- xmlNode("prop", attrs = c(id="smpi/ois", value=desc[desc$Name=="smpi/ois",]$label))
diff --git a/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml b/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml
index 0bd1332b397b31b30603e164a256ee1e9f21e93f..3a125cd55a08b8e46c6065fa4fc6a203eace3779 100644
--- a/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml
+++ b/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml
@@ -4,7 +4,7 @@
  <prop id="smpi/ois" value="0:3.65848336553355e-06:1.33280621516301e-10;1420:3.83673729379869e-06:7.84867337035856e-11;33500:5.57232433176236e-06:6.5668893954931e-11;65536:4.17803219267394e-06:2.37460347640595e-12;320000:4.70677307448713e-06:3.38065421824938e-13"/>
  <prop id="smpi/or" value="0:3.51809764924934e-06:3.01847204118237e-10;1420:8.16124874852713e-06:2.66840481979518e-10;33500:1.49347740713389e-05:1.97645004617501e-10;65536:5.88893263987424e-05:1.29160163208845e-09;320000:0:0"/>
  <prop id="smpi/bw-factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/>
- <prop id="smpi/lat_factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/>
+ <prop id="smpi/lat-factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/>
  <prop id="smpi/async_small_thres" value="65536"/>
  <prop id="smpi/send_is_detached_thres" value="320000"/>
  <prop id="smpi/wtime" value="4.195637e-08"/>
diff --git a/data/taurus_26_07_2016/calibration/taurus.Rmd b/data/taurus_26_07_2016/calibration/taurus.Rmd
index 15a3f9a41072cbf5d4309f3003f2e3ce9507195d..9d0958fd45241e0116e0e35e5366165d6b098f85 100644
--- a/data/taurus_26_07_2016/calibration/taurus.Rmd
+++ b/data/taurus_26_07_2016/calibration/taurus.Rmd
@@ -557,7 +557,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/ois" value="0:3.65848336553355e-06:1.33280621516301e-10;1420:3.83673729379869e-06:7.84867337035856e-11;33500:5.57232433176236e-06:6.5668893954931e-11;65536:4.17803219267394e-06:2.37460347640595e-12;320000:4.70677307448713e-06:3.38065421824938e-13"/>
 ##  <prop id="smpi/or" value="0:3.51809764924934e-06:3.01847204118237e-10;1420:8.16124874852713e-06:2.66840481979518e-10;33500:1.49347740713389e-05:1.97645004617501e-10;65536:5.88893263987424e-05:1.29160163208845e-09;320000:0:0"/>
 ##  <prop id="smpi/bw-factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/>
-##  <prop id="smpi/lat_factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/>
+##  <prop id="smpi/lat-factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/>
 ##  <prop id="smpi/async_small_thres" value="65536"/>
 ##  <prop id="smpi/send_is_detached_thres" value="320000"/>
 ##  <prop id="smpi/wtime" value="4.195637e-08"/>
diff --git a/data/taurus_26_07_2016/calibration/taurus.html b/data/taurus_26_07_2016/calibration/taurus.html
index 523ec2b0720103a033b8e9104b4d0f6da848837f..1d4f06a368d765a1d42e4535d089a458de1fb82e 100644
--- a/data/taurus_26_07_2016/calibration/taurus.html
+++ b/data/taurus_26_07_2016/calibration/taurus.html
@@ -713,7 +713,7 @@ Time for one MPI_Test call</p>
 ##  &lt;prop id=&quot;smpi/ois&quot; value=&quot;0:3.65848336553355e-06:1.33280621516301e-10;1420:3.83673729379869e-06:7.84867337035856e-11;33500:5.57232433176236e-06:6.5668893954931e-11;65536:4.17803219267394e-06:2.37460347640595e-12;320000:4.70677307448713e-06:3.38065421824938e-13&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/or&quot; value=&quot;0:3.51809764924934e-06:3.01847204118237e-10;1420:8.16124874852713e-06:2.66840481979518e-10;33500:1.49347740713389e-05:1.97645004617501e-10;65536:5.88893263987424e-05:1.29160163208845e-09;320000:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/bw-factor&quot; value=&quot;0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859&quot;/&gt;
-##  &lt;prop id=&quot;smpi/lat_factor&quot; value=&quot;0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888&quot;/&gt;
+##  &lt;prop id=&quot;smpi/lat-factor&quot; value=&quot;0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/async_small_thres&quot; value=&quot;65536&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/send_is_detached_thres&quot; value=&quot;320000&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/wtime&quot; value=&quot;4.195637e-08&quot;/&gt;
diff --git a/data/taurus_26_07_2016/calibration/taurus.md b/data/taurus_26_07_2016/calibration/taurus.md
index 15a3f9a41072cbf5d4309f3003f2e3ce9507195d..9d0958fd45241e0116e0e35e5366165d6b098f85 100644
--- a/data/taurus_26_07_2016/calibration/taurus.md
+++ b/data/taurus_26_07_2016/calibration/taurus.md
@@ -557,7 +557,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/ois" value="0:3.65848336553355e-06:1.33280621516301e-10;1420:3.83673729379869e-06:7.84867337035856e-11;33500:5.57232433176236e-06:6.5668893954931e-11;65536:4.17803219267394e-06:2.37460347640595e-12;320000:4.70677307448713e-06:3.38065421824938e-13"/>
 ##  <prop id="smpi/or" value="0:3.51809764924934e-06:3.01847204118237e-10;1420:8.16124874852713e-06:2.66840481979518e-10;33500:1.49347740713389e-05:1.97645004617501e-10;65536:5.88893263987424e-05:1.29160163208845e-09;320000:0:0"/>
 ##  <prop id="smpi/bw-factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/>
-##  <prop id="smpi/lat_factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/>
+##  <prop id="smpi/lat-factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/>
 ##  <prop id="smpi/async_small_thres" value="65536"/>
 ##  <prop id="smpi/send_is_detached_thres" value="320000"/>
 ##  <prop id="smpi/wtime" value="4.195637e-08"/>
diff --git a/data/taurus_26_07_2016/calibration/taurus_output.xml b/data/taurus_26_07_2016/calibration/taurus_output.xml
index 2e2e6a70e44ebd7d9c287b65d99004b2323ed7f6..7f3a0afcdd460aaafa74354687569510e2e21a16 100644
--- a/data/taurus_26_07_2016/calibration/taurus_output.xml
+++ b/data/taurus_26_07_2016/calibration/taurus_output.xml
@@ -4,7 +4,7 @@
  <prop id="smpi/ois"/>
  <prop id="smpi/or"/>
  <prop id="smpi/bw-factor"/>
- <prop id="smpi/lat_factor"/>
+ <prop id="smpi/lat-factor"/>
  <prop id="smpi/async_small_thres" value="65536"/>
  <prop id="smpi/send_is_detached_thres" value="260000"/>
 </config>
diff --git a/src/calibration/Analysis.Rmd b/src/calibration/Analysis.Rmd
index 41090ac1a7627420be0552fad7384fc930de79e3..f4e08b5bba680f29b97f7a3cf4856f3f325e68c3 100644
--- a/src/calibration/Analysis.Rmd
+++ b/src/calibration/Analysis.Rmd
@@ -300,7 +300,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat-factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
   desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';'))
@@ -308,7 +308,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
   bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
-  lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
+  lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
   ois <- xmlNode("prop", attrs = c(id="smpi/ois", value=desc[desc$Name=="smpi/ois",]$label))
diff --git a/src/calibration/examples/Analysis.Rmd b/src/calibration/examples/Analysis.Rmd
index bdcf1b2b42e319f7cb044141067e72bbf29852d3..548200002e7e2539cca917acd5f968f781cfe036 100644
--- a/src/calibration/examples/Analysis.Rmd
+++ b/src/calibration/examples/Analysis.Rmd
@@ -299,7 +299,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat-factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
   desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';'))
@@ -307,7 +307,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
   bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
-  lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
+  lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
   ois <- xmlNode("prop", attrs = c(id="smpi/ois", value=desc[desc$Name=="smpi/ois",]$label))
diff --git a/src/calibration/examples/stampede_output.xml b/src/calibration/examples/stampede_output.xml
index f2550af880e840fa12662b39389acc758df4b8df..781dc3189cacf299dd77382c3dc52cbf3152f524 100644
--- a/src/calibration/examples/stampede_output.xml
+++ b/src/calibration/examples/stampede_output.xml
@@ -4,7 +4,7 @@
  <prop id="smpi/ois" value="0:2.9956039499098e-07:1.31295276288599e-10;4120:5.22643731028535e-07:5.59286363481658e-12;17408:0:0"/>
  <prop id="smpi/or" value="0:1.3635950877903e-06:1.08008992233296e-10;4120:0:0;17408:0:0"/>
  <prop id="smpi/bw-factor" value="0:1.0212271015512;4120:1.00592739101783;17408:1.32354721253027"/>
- <prop id="smpi/lat_factor" value="0:0.000453157054255973;4120:0.149947156921692;17408:0.260476437970144"/>
+ <prop id="smpi/lat-factor" value="0:0.000453157054255973;4120:0.149947156921692;17408:0.260476437970144"/>
  <prop id="smpi/async_small_thres" value="17408"/>
  <prop id="smpi/send_is_detached_thres" value="17408"/>
  <prop id="smpi/wtime" value="3.54637e-08"/>