Rename vpe binary name to avoid collision with latex

Change-Id: I34a46b9ebbc0e36486fbef528b34ea1c3be2e8be
Signed-off-by: Damjan Marion <damarion@cisco.com>

4 files changed, 10 insertions, 10 deletions

diff --git a/vpp-api-test/Makefile.am b/vpp-api-test/Makefile.am
index ae071bcebe0..5079f8d49b9 100644
--- a/vpp-api-test/Makefile.am
+++ b/vpp-api-test/Makefile.am
@@ -20,15 +20,15 @@ libvatplugin_la_SOURCES = \
 
 lib_LTLIBRARIES = libvatplugin.la	
 
-bin_PROGRAMS = vpe_api_test vpe_json_test
+bin_PROGRAMS = vpp_api_test vpp_json_test
 
-vpe_api_test_SOURCES = vat/api_format.c vat/main.c vat/plugin.c vat/vat.h vat/json_format.h vat/json_format.c
-vpe_json_test_SOURCES = vat/json_format.h vat/json_format.c vat/json_test.c
+vpp_api_test_SOURCES = vat/api_format.c vat/main.c vat/plugin.c vat/vat.h vat/json_format.h vat/json_format.c
+vpp_json_test_SOURCES = vat/json_format.h vat/json_format.c vat/json_test.c
 
-vpe_api_test_LDADD = -lvlibmemoryclient -lvlibapi -lsvm \
+vpp_api_test_LDADD = -lvlibmemoryclient -lvlibapi -lsvm \
 	-lvppinfra -lpthread -lm \
 	-lrt -ldl libvatplugin.la
-vpe_json_test_LDADD = -lvppinfra -lm
+vpp_json_test_LDADD = -lvppinfra -lm
 nobase_include_HEADERS = vat/vat.h vat/json_format.h
 
 
diff --git a/vpp-api-test/configure.ac b/vpp-api-test/configure.ac
index 652ddb5f674..59345daf885 100644
--- a/vpp-api-test/configure.ac
+++ b/vpp-api-test/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(vpe-api-test, 1.0)
+AC_INIT(vpp-api-test, 1.0)
 AM_INIT_AUTOMAKE
 
 AC_PROG_LIBTOOL
@@ -16,7 +16,7 @@ AC_ARG_WITH(q-platform,
             AC_HELP_STRING([--with-q-platform],[Build version for given platform (qnative)]),
 	    [case $with_q_platform in
 	       qnative) ;;
-               vpe) with_q_platform=vpe;;
+               vpp) with_q_platform=vpp;;
 	       *) with_q_platform=qnative;;
 	     esac])
 
diff --git a/vpp-api-test/scripts/vppctl b/vpp-api-test/scripts/vppctl
index 90828f6773b..12b132c9459 100755
--- a/vpp-api-test/scripts/vppctl
+++ b/vpp-api-test/scripts/vppctl
@@ -1,13 +1,13 @@
 #!/bin/bash
 if [ $# -gt 0 ]; then
-    echo exec ${@} | vpe_api_test | sed 's/vat# //g'
+    echo exec ${@} | vpp_api_test | sed 's/vat# //g'
 else
     echo -n "vpp# "
     while read CMD; do
 	if [ $CMD == "exit" ]; then
 	    exit
 	fi
-	echo exec $CMD | vpe_api_test | sed 's/vat# //g'
+	echo exec $CMD | vpp_api_test | sed 's/vat# //g'
 	echo -n "vpp# "
     done
 fi
diff --git a/vpp-api-test/vat/main.c b/vpp-api-test/vat/main.c
index e7c25520469..1bec4a101d1 100644
--- a/vpp-api-test/vat/main.c
+++ b/vpp-api-test/vat/main.c
@@ -236,7 +236,7 @@ int main (int argc, char ** argv)
     vat_api_hookup(vam);
     vat_plugin_api_reference();
 
-    if (connect_to_vpe("vpe_api_test") < 0) {
+    if (connect_to_vpe("vpp_api_test") < 0) {
         svm_region_exit();
         fformat (stderr, "Couldn't connect to vpe, exiting...\n");
         exit (1);