diff --git a/data/gnuplot/boot-parallel.gpl b/data/gnuplot/boot-parallel.gpl
index 36a593b..89e8638 100644
--- a/data/gnuplot/boot-parallel.gpl
+++ b/data/gnuplot/boot-parallel.gpl
@@ -5,7 +5,7 @@
 # where <dir> is the platform directory
 
 
-fc_dat =        sprintf("%s/boot-parallel-10-fc-cdf.dat", base)
+fc_dat =        sprintf("%s/boot-parallel-10-fc-api-cdf.dat", base)
 chv_dat =       sprintf("%s/boot-parallel-10-chv-cdf.dat", base)
 qboot_dat =     sprintf("%s/boot-parallel-10-qemu-cdf.dat", base)
 
@@ -32,7 +32,7 @@ plot \
      chv_dat     index 0 using ($1/1000):2 w l lw 2 t 'CloudHV', \
      qboot_dat   index 0 using ($1/1000):2 w l lw 2 t 'QEMU', \
 
-fc_dat =        sprintf("%s/boot-parallel-50-fc-cdf.dat", base)
+fc_dat =        sprintf("%s/boot-parallel-50-fc-api-cdf.dat", base)
 chv_dat =       sprintf("%s/boot-parallel-50-chv-cdf.dat", base)
 qboot_dat =     sprintf("%s/boot-parallel-50-qemu-cdf.dat", base)
 
@@ -60,7 +60,7 @@ plot \
      qboot_dat   index 0 using ($1/1000):2 w l lw 2 t 'QEMU', \
 
 
-fc_dat =        sprintf("%s/boot-parallel-100-fc-cdf.dat", base)
+fc_dat =        sprintf("%s/boot-parallel-100-fc-api-cdf.dat", base)
 chv_dat =       sprintf("%s/boot-parallel-100-chv-cdf.dat", base)
 qboot_dat =     sprintf("%s/boot-parallel-100-qemu-cdf.dat", base)
 
diff --git a/data/gnuplot/boot-serial-all.gpl b/data/gnuplot/boot-serial-all.gpl
index c264d2f..05ff75f 100644
--- a/data/gnuplot/boot-serial-all.gpl
+++ b/data/gnuplot/boot-serial-all.gpl
@@ -6,9 +6,10 @@
 # where <dir> is the platform directory
 
 
-fc_dat =        sprintf("%s/boot-serial-fc-cdf.dat", base)
-fc_nopci_dat =  sprintf("%s/boot-serial-fc-nopci-cdf.dat", base)
-fc_net_dat =    sprintf("%s/boot-serial-fc-net-cdf.dat", base)
+fc_dat =        sprintf("%s/boot-serial-fc-api-cdf.dat", base)
+fc_file_dat =   sprintf("%s/boot-serial-fc-file-cdf.dat", base)
+fc_nopci_dat =  sprintf("%s/boot-serial-fc-nopci-api-cdf.dat", base)
+fc_net_dat =    sprintf("%s/boot-serial-fc-net-api-cdf.dat", base)
 chv_dat =       sprintf("%s/boot-serial-chv-cdf.dat", base)
 chv_net_dat =   sprintf("%s/boot-serial-chv-net-cdf.dat", base)
 chv_bz_dat =    sprintf("%s/boot-serial-chv-bz-cdf.dat", base)
@@ -36,6 +37,7 @@ set grid ytics mytics xtics mxtics
 plot \
      fc_dat          index 1 using 1:2         w l lw 2 t 'FC-pre', \
      fc_dat          index 0 using ($1/1000):2 w l lw 2 t 'FC', \
+     fc_file_dat     index 0 using ($1/1000):2 w l lw 2 t 'FC-file', \
      fc_nopci_dat    index 1 using 1:2         w l lw 2 t 'FC-pre (noPCI kernel)', \
      fc_net_dat      index 1 using 1:2         w l lw 2 t 'FC+Network-pre', \
      fc_net_dat      index 0 using ($1/1000):2 w l lw 2 t 'FC+Network', \
diff --git a/data/gnuplot/boot-serial.gpl b/data/gnuplot/boot-serial.gpl
index 71f2349..31c4f4f 100644
--- a/data/gnuplot/boot-serial.gpl
+++ b/data/gnuplot/boot-serial.gpl
@@ -5,7 +5,7 @@
 # where <dir> is the platform directory
 
 
-fc_dat =    sprintf("%s/boot-serial-fc-cdf.dat", base)
+fc_dat =    sprintf("%s/boot-serial-fc-api-cdf.dat", base)
 chv_dat =   sprintf("%s/boot-serial-chv-cdf.dat", base)
 qboot_dat = sprintf("%s/boot-serial-qboot-cdf.dat", base)
 
diff --git a/data/gnuplot/mem.gpl b/data/gnuplot/mem.gpl
index dd95dc6..bdfeeba 100644
--- a/data/gnuplot/mem.gpl
+++ b/data/gnuplot/mem.gpl
@@ -7,7 +7,6 @@
 
 fc_dat =     sprintf("%s/mem-fc.dat", base)
 chv_dat =    sprintf("%s/mem-chv.dat", base)
-chv_bz_dat = sprintf("%s/mem-chv-bz.dat", base)
 qboot_dat =  sprintf("%s/mem-qemu.dat", base)
 
 out_file = sprintf("%s/mem-percent.pdf", base)
@@ -84,5 +83,4 @@ set grid ytics mytics xtics mxtics
 plot \
      fc_dat     using ($1/1048576):(($8 - $4)/1024) w lp lw 2 t 'FC', \
      chv_dat    using ($1/1048576):(($8 - $4)/1024) w lp lw 2 t 'CloudHV', \
-     chv_bz_dat using ($1/1048576):(($8 - $4)/1024) w lp lw 2 t 'CloudHV (bzImage)', \
      qboot_dat  using ($1/1048576):(($8 - $4)/1024) w lp lw 2 t 'QEMU', \
diff --git a/data/m5d.metal/boot-parallel-10.pdf b/data/m5d.metal/boot-parallel-10.pdf
new file mode 100644
index 0000000..5f9f8f4
Binary files /dev/null and b/data/m5d.metal/boot-parallel-10.pdf differ
diff --git a/data/m5d.metal/boot-parallel-100.pdf b/data/m5d.metal/boot-parallel-100.pdf
new file mode 100644
index 0000000..377ae27
Binary files /dev/null and b/data/m5d.metal/boot-parallel-100.pdf differ
diff --git a/data/m5d.metal/boot-parallel-50.pdf b/data/m5d.metal/boot-parallel-50.pdf
new file mode 100644
index 0000000..e6e292e
Binary files /dev/null and b/data/m5d.metal/boot-parallel-50.pdf differ
diff --git a/data/m5d.metal/boot-serial-all.pdf b/data/m5d.metal/boot-serial-all.pdf
new file mode 100644
index 0000000..0b51cae
Binary files /dev/null and b/data/m5d.metal/boot-serial-all.pdf differ
diff --git a/data/m5d.metal/boot-serial.pdf b/data/m5d.metal/boot-serial.pdf
new file mode 100644
index 0000000..b7b356a
Binary files /dev/null and b/data/m5d.metal/boot-serial.pdf differ
diff --git a/data/m5d.metal/fio-bw.pdf b/data/m5d.metal/fio-bw.pdf
new file mode 100644
index 0000000..e69de29
diff --git a/data/m5d.metal/mem-abs.pdf b/data/m5d.metal/mem-abs.pdf
new file mode 100644
index 0000000..54fd4a0
Binary files /dev/null and b/data/m5d.metal/mem-abs.pdf differ
diff --git a/data/m5d.metal/mem-in-vm.pdf b/data/m5d.metal/mem-in-vm.pdf
new file mode 100644
index 0000000..bab66fd
Binary files /dev/null and b/data/m5d.metal/mem-in-vm.pdf differ
diff --git a/data/m5d.metal/mem-percent.pdf b/data/m5d.metal/mem-percent.pdf
new file mode 100644
index 0000000..d4f9ef1
Binary files /dev/null and b/data/m5d.metal/mem-percent.pdf differ
diff --git a/data/rn.haswell/boot-parallel-10.pdf b/data/rn.haswell/boot-parallel-10.pdf
new file mode 100644
index 0000000..e94dc79
Binary files /dev/null and b/data/rn.haswell/boot-parallel-10.pdf differ
diff --git a/data/rn.haswell/boot-parallel-100.pdf b/data/rn.haswell/boot-parallel-100.pdf
new file mode 100644
index 0000000..e005402
Binary files /dev/null and b/data/rn.haswell/boot-parallel-100.pdf differ
diff --git a/data/rn.haswell/boot-parallel-50.pdf b/data/rn.haswell/boot-parallel-50.pdf
new file mode 100644
index 0000000..573e0bc
Binary files /dev/null and b/data/rn.haswell/boot-parallel-50.pdf differ
diff --git a/data/rn.haswell/boot-serial-all.pdf b/data/rn.haswell/boot-serial-all.pdf
new file mode 100644
index 0000000..925cfd9
Binary files /dev/null and b/data/rn.haswell/boot-serial-all.pdf differ
diff --git a/data/rn.haswell/boot-serial.pdf b/data/rn.haswell/boot-serial.pdf
new file mode 100644
index 0000000..2573b59
Binary files /dev/null and b/data/rn.haswell/boot-serial.pdf differ
diff --git a/data/rn.haswell/fio-bw.pdf b/data/rn.haswell/fio-bw.pdf
new file mode 100644
index 0000000..e69de29
diff --git a/data/rn.haswell/mem-abs.pdf b/data/rn.haswell/mem-abs.pdf
new file mode 100644
index 0000000..d77f4f5
Binary files /dev/null and b/data/rn.haswell/mem-abs.pdf differ
diff --git a/data/rn.haswell/mem-in-vm.pdf b/data/rn.haswell/mem-in-vm.pdf
new file mode 100644
index 0000000..2d949a1
Binary files /dev/null and b/data/rn.haswell/mem-in-vm.pdf differ
diff --git a/data/rn.haswell/mem-percent.pdf b/data/rn.haswell/mem-percent.pdf
new file mode 100644
index 0000000..e09a709
Binary files /dev/null and b/data/rn.haswell/mem-percent.pdf differ
diff --git a/data/rn.nehalem/boot-parallel-10.pdf b/data/rn.nehalem/boot-parallel-10.pdf
new file mode 100644
index 0000000..50d5f91
Binary files /dev/null and b/data/rn.nehalem/boot-parallel-10.pdf differ
diff --git a/data/rn.nehalem/boot-parallel-100.pdf b/data/rn.nehalem/boot-parallel-100.pdf
new file mode 100644
index 0000000..8368d6d
Binary files /dev/null and b/data/rn.nehalem/boot-parallel-100.pdf differ
diff --git a/data/rn.nehalem/boot-parallel-50.pdf b/data/rn.nehalem/boot-parallel-50.pdf
new file mode 100644
index 0000000..f229005
Binary files /dev/null and b/data/rn.nehalem/boot-parallel-50.pdf differ
diff --git a/data/rn.nehalem/boot-serial-all.pdf b/data/rn.nehalem/boot-serial-all.pdf
new file mode 100644
index 0000000..9eaad2c
Binary files /dev/null and b/data/rn.nehalem/boot-serial-all.pdf differ
diff --git a/data/rn.nehalem/boot-serial.pdf b/data/rn.nehalem/boot-serial.pdf
new file mode 100644
index 0000000..07072c1
Binary files /dev/null and b/data/rn.nehalem/boot-serial.pdf differ
diff --git a/data/rn.nehalem/fio-bw.pdf b/data/rn.nehalem/fio-bw.pdf
new file mode 100644
index 0000000..e69de29
diff --git a/data/rn.nehalem/mem-abs.pdf b/data/rn.nehalem/mem-abs.pdf
new file mode 100644
index 0000000..3fef04a
Binary files /dev/null and b/data/rn.nehalem/mem-abs.pdf differ
diff --git a/data/rn.nehalem/mem-in-vm.pdf b/data/rn.nehalem/mem-in-vm.pdf
new file mode 100644
index 0000000..bdfe301
Binary files /dev/null and b/data/rn.nehalem/mem-in-vm.pdf differ
diff --git a/data/rn.nehalem/mem-percent.pdf b/data/rn.nehalem/mem-percent.pdf
new file mode 100644
index 0000000..dfdc216
Binary files /dev/null and b/data/rn.nehalem/mem-percent.pdf differ
diff --git a/data/update-plots.sh b/data/update-plots.sh
index 0c65500..44283e0 100755
--- a/data/update-plots.sh
+++ b/data/update-plots.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-DIRS="m5d.metal-ht m5d.metal rn.haswell rn.nehalem"
+DIRS="m5d.metal rn.haswell rn.nehalem"
 
 for DIR in $DIRS; do
+    echo "==== $DIR"
     gnuplot -e "base='$DIR'" gnuplot/boot-serial-all.gpl
     gnuplot -e "base='$DIR'" gnuplot/boot-serial.gpl
     gnuplot -e "base='$DIR'" gnuplot/boot-parallel.gpl