diff --git a/kw/mb/blstm/Makefile b/kw/mb/blstm/Makefile
index 0f12f2a..9606865 100644
--- a/kw/mb/blstm/Makefile
+++ b/kw/mb/blstm/Makefile
@@ -6,4 +6,4 @@ all:
 	$(MAKE) -C host
 
 run: all
-	host/build/blstm pulp/build/system.oprecompkw/blstm/blstm
+	host/build/blstm pulp/build/oprecompkw/blstm/blstm
diff --git a/kw/mb/blstm/host/Makefile b/kw/mb/blstm/host/Makefile
index 7e96468..7b3f5c0 100644
--- a/kw/mb/blstm/host/Makefile
+++ b/kw/mb/blstm/host/Makefile
@@ -5,7 +5,7 @@ CFLAGS ?= -O3 -g -Wall -Wextra -std=c99
 CPPFLAGS ?= -O3 -g -Wall -Wextra -std=c++11 -fopenmp
 CFLAGS += -I$(PULP_SDK_HOME)/install/ws/include
 CPPFLAGS += -I$(PULP_SDK_HOME)/install/ws/include -I./include
-LDFLAGS ?= -L$(PULP_SDK_HOME)/install/ws/lib -loprecomp -lcxl -lgvlauncher -lpthread
+LDFLAGS ?= -L$(PULP_SDK_HOME)/install/ws/lib -loprecomp -lcxl -lpulpvplauncher -lpthread
 
 all: clean build/neuron build/blstm
 
diff --git a/kw/samples/nop/Makefile b/kw/samples/nop/Makefile
index 19fc89e..4501028 100644
--- a/kw/samples/nop/Makefile
+++ b/kw/samples/nop/Makefile
@@ -6,4 +6,5 @@ all:
 	$(MAKE) -C host
 
 run: all
-	host/build/nop pulp/build/system.oprecompkw/nop/nop
+	host/build/nop pulp/build/oprecompkw/nop/nop
+
diff --git a/kw/samples/nop/host/Makefile b/kw/samples/nop/host/Makefile
index 56abd74..34d64b4 100644
--- a/kw/samples/nop/host/Makefile
+++ b/kw/samples/nop/host/Makefile
@@ -3,7 +3,7 @@
 
 CFLAGS ?= -O3 -g -Wall -Wextra
 CFLAGS += -I$(PULP_SDK_HOME)/install/ws/include
-LDFLAGS ?= -L$(PULP_SDK_HOME)/install/ws/lib -loprecomp -lcxl -lgvlauncher -lpthread
+LDFLAGS ?= -L$(PULP_SDK_HOME)/install/ws/lib -loprecomp -lcxl -lpulpvplauncher -lpthread
 
 all:: build/nop
 
diff --git a/kw/samples/square/Makefile b/kw/samples/square/Makefile
index b927841..ebd9db4 100644
--- a/kw/samples/square/Makefile
+++ b/kw/samples/square/Makefile
@@ -6,4 +6,4 @@ all:
 	$(MAKE) -C host
 
 run: all
-	host/build/square pulp/build/system.oprecompkw/square/square
+	host/build/square pulp/build/oprecompkw/square/square
diff --git a/kw/samples/square/host/Makefile b/kw/samples/square/host/Makefile
index 6406125..0fc007f 100644
--- a/kw/samples/square/host/Makefile
+++ b/kw/samples/square/host/Makefile
@@ -3,7 +3,7 @@
 
 CFLAGS ?= -O3 -g -Wall -Wextra -std=c99
 CFLAGS += -I$(PULP_SDK_HOME)/install/ws/include
-LDFLAGS ?= -L$(PULP_SDK_HOME)/install/ws/lib -loprecomp -lcxl -lgvlauncher -lpthread
+LDFLAGS ?= -L$(PULP_SDK_HOME)/install/ws/lib -loprecomp -lcxl -lpulpvplauncher -lpthread
 
 all:: build/square
 
diff --git a/mb/cnn/kw/Makefile b/mb/cnn/kw/Makefile
index 368ec88..3dfb4d9 100644
--- a/mb/cnn/kw/Makefile
+++ b/mb/cnn/kw/Makefile
@@ -6,4 +6,4 @@ all:
 	$(MAKE) -C host
 
 run: all
-	host/build/conv pulp/build/system.oprecompkw/conv/conv
+	host/build/conv pulp/build/oprecompkw/conv/conv
diff --git a/mb/cnn/kw/host/Makefile b/mb/cnn/kw/host/Makefile
index d8622c9..4b61f75 100644
--- a/mb/cnn/kw/host/Makefile
+++ b/mb/cnn/kw/host/Makefile
@@ -3,7 +3,7 @@
 
 CFLAGS ?= -O3 -g -Wall -Wextra -std=c99
 CFLAGS += -I$(PULP_SDK_HOME)/install/ws/include
-LDFLAGS ?= -L$(PULP_SDK_HOME)/install/ws/lib -loprecomp -lcxl -lgvlauncher -lpthread
+LDFLAGS ?= -L$(PULP_SDK_HOME)/install/ws/lib -loprecomp -lcxl -lpulpvplauncher -lpthread
 
 all:: build/conv