diff --git a/benchmarks/new_opencl/bfs/Makefile b/benchmarks/new_opencl/bfs/Makefile
index 026c9c90..2a11412e 100644
--- a/benchmarks/new_opencl/bfs/Makefile
+++ b/benchmarks/new_opencl/bfs/Makefile
@@ -8,7 +8,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error
 
 CXXFLAGS += -I$(POCL_RT_PATH)/include
 
-LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/dummy -lOpenCL -lvortex
+LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex
 
 PROJECT = bfs
 
diff --git a/benchmarks/new_opencl/guassian/Makefile b/benchmarks/new_opencl/guassian/Makefile
index 3ff95327..52f60500 100644
--- a/benchmarks/new_opencl/guassian/Makefile
+++ b/benchmarks/new_opencl/guassian/Makefile
@@ -8,7 +8,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error
 
 CXXFLAGS += -I$(POCL_RT_PATH)/include
 
-LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/dummy -lOpenCL -lvortex
+LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex
 
 PROJECT = guassian
 
diff --git a/benchmarks/new_opencl/kmeans/Makefile b/benchmarks/new_opencl/kmeans/Makefile
index d92b2449..65860dd6 100644
--- a/benchmarks/new_opencl/kmeans/Makefile
+++ b/benchmarks/new_opencl/kmeans/Makefile
@@ -8,7 +8,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error
 
 CXXFLAGS += -I$(POCL_RT_PATH)/include
 
-LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/dummy -lOpenCL -lvortex
+LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex
 
 PROJECT = kmeans
 
diff --git a/benchmarks/new_opencl/nearn/Makefile b/benchmarks/new_opencl/nearn/Makefile
index 954cc564..87f6dc48 100644
--- a/benchmarks/new_opencl/nearn/Makefile
+++ b/benchmarks/new_opencl/nearn/Makefile
@@ -8,7 +8,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error
 
 CXXFLAGS += -I$(POCL_RT_PATH)/include
 
-LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/dummy -lOpenCL -lvortex
+LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex
 
 PROJECT = nearn
 
diff --git a/benchmarks/new_opencl/saxpy/Makefile b/benchmarks/new_opencl/saxpy/Makefile
index d4b43029..46cdd7dc 100644
--- a/benchmarks/new_opencl/saxpy/Makefile
+++ b/benchmarks/new_opencl/saxpy/Makefile
@@ -7,7 +7,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error
 
 CXXFLAGS += -I$(POCL_RT_PATH)/include
 
-LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/dummy -lOpenCL -lvortex
+LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex
 
 PROJECT = saxpy
 
diff --git a/benchmarks/new_opencl/sfilter/Makefile b/benchmarks/new_opencl/sfilter/Makefile
index 6cd09cb6..9636752a 100644
--- a/benchmarks/new_opencl/sfilter/Makefile
+++ b/benchmarks/new_opencl/sfilter/Makefile
@@ -8,7 +8,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error
 
 CXXFLAGS += -I$(POCL_RT_PATH)/include
 
-LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/dummy -lOpenCL -lvortex
+LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex
 
 PROJECT = sfilter
 
diff --git a/benchmarks/new_opencl/sgemm/Makefile b/benchmarks/new_opencl/sgemm/Makefile
index 0b78e9d6..b23afa17 100644
--- a/benchmarks/new_opencl/sgemm/Makefile
+++ b/benchmarks/new_opencl/sgemm/Makefile
@@ -8,7 +8,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error
 
 CXXFLAGS += -I$(POCL_RT_PATH)/include
 
-LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/dummy -lOpenCL -lvortex
+LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex
 
 PROJECT = sgemm
 
diff --git a/benchmarks/new_opencl/vecadd/Makefile b/benchmarks/new_opencl/vecadd/Makefile
index c458532f..fd160cdc 100644
--- a/benchmarks/new_opencl/vecadd/Makefile
+++ b/benchmarks/new_opencl/vecadd/Makefile
@@ -8,7 +8,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error
 
 CXXFLAGS += -I$(POCL_RT_PATH)/include
 
-LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/dummy -lOpenCL -lvortex
+LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex
 
 PROJECT = vecadd
 
diff --git a/driver/sw/Makefile b/driver/sw/Makefile
index fe10c1c1..eaaffc36 100644
--- a/driver/sw/Makefile
+++ b/driver/sw/Makefile
@@ -1,9 +1,9 @@
 
 
-all: dummy
+all: stub
 
-dummy:
-	$(MAKE) -C dummy
+stub:
+	$(MAKE) -C stub
 
 opae:
 	$(MAKE) -C opae
diff --git a/driver/sw/dummy/Makefile b/driver/sw/stub/Makefile
similarity index 100%
rename from driver/sw/dummy/Makefile
rename to driver/sw/stub/Makefile
diff --git a/driver/sw/dummy/vortex.cpp b/driver/sw/stub/vortex.cpp
similarity index 100%
rename from driver/sw/dummy/vortex.cpp
rename to driver/sw/stub/vortex.cpp
diff --git a/driver/tests/demo/Makefile b/driver/tests/demo/Makefile
index eeaa2756..622349d5 100644
--- a/driver/tests/demo/Makefile
+++ b/driver/tests/demo/Makefile
@@ -40,7 +40,7 @@ kernel.elf: $(SRCS)
 	$(VX_CC) $(VX_CFLAGS) $(VX_STR) $(VX_FIO) $(VX_NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_SRCS) -I$(VX_RT_PATH) -o kernel.elf
 
 $(PROJECT): $(SRCS)
-	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -L../../sw/dummy -lvortex -o $@
+	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -L../../sw/stub -lvortex -o $@
 
 run-fpga: $(PROJECT)
 	LD_LIBRARY_PATH=../../sw/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) -f kernel.bin -n 16