diff --git a/src/graph-algo/parse_tslot_throughput.sh b/src/graph-algo/parse_tslot_throughput.sh
index fc529a7a..1721db50 100755
--- a/src/graph-algo/parse_tslot_throughput.sh
+++ b/src/graph-algo/parse_tslot_throughput.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # this script parses the output of a throughput experiment, generated
-# by running ./measure_tslot_throughput.sh in fastpass/src/controller.
+# by running ./measure_tslot_throughput.sh in fastpass/src/arbiter.
 # it generates a csv output file and a graph of throughput vs. number
 # of cores.
 
diff --git a/src/graph-algo/platform.h b/src/graph-algo/platform.h
index 895c3124..f927bb5e 100644
--- a/src/graph-algo/platform.h
+++ b/src/graph-algo/platform.h
@@ -12,7 +12,7 @@
 #include <rte_mempool.h>
 #include <rte_branch_prediction.h>
 #include "../protocol/platform/generic.h"
-#include "../controller/dpdk-time.h"
+#include "../arbiter/dpdk-time.h"
 #define fp_free(ptr)                            rte_free(ptr)
 #define fp_calloc(typestr, num, size)           rte_calloc(typestr, num, size, 0)
 #define fp_malloc(typestr, size)		rte_malloc(typestr, size, 0)
diff --git a/src/kernel-mod/vm-tools/local.sh b/src/kernel-mod/vm-tools/local.sh
index 982e2fc5..9898e863 100755
--- a/src/kernel-mod/vm-tools/local.sh
+++ b/src/kernel-mod/vm-tools/local.sh
@@ -45,7 +45,7 @@ cd /tmp
 	rm -f .echo_tmp
 
 # bind DPDK port (eth11)
-cd ~/fastpass/src/controller
+cd ~/fastpass/src/arbiter
 sudo ./pci_bind.py +2
 
 # start passive shell (eth6)
diff --git a/src/protocol/platform.h b/src/protocol/platform.h
index 0a96bd18..fb5b28c7 100644
--- a/src/protocol/platform.h
+++ b/src/protocol/platform.h
@@ -11,7 +11,7 @@
 #ifdef __KERNEL__
 #include "../kernel-mod/linux-platform.h"
 #else
-#include "../controller/dpdk-platform.h"
+#include "../arbiter/dpdk-platform.h"
 #endif
 
 /** FUNCTIONS IN PLATFORM.H **/