98 files changed, 581 insertions, 581 deletions

diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index c1c9e16..7f014d4 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -35,7 +35,7 @@ set(JVPP_LIBS jvpp_common ${VPPINFRA_DIR} ${VLIBMEMORYCLIENT_DIR} ${SVM_DIR}
         Threads::Threads m rt)
 
 ############# Registry package ##################
-set(PACKAGE_DIR_JVPP_REGISTRY io/fd/vpp/jvpp)
+set(PACKAGE_DIR_JVPP_REGISTRY io/fd/jvpp)
 unset(files)
 FILE(GLOB files RELATIVE
         ${CMAKE_CURRENT_SOURCE_DIR}
@@ -67,7 +67,7 @@ add_custom_command(TARGET jvpp-registry
         ${CMAKE_CURRENT_BINARY_DIR}/jvpp-registry-${JAPI_LIB_VERSION}.jar
         -C jvpp-registry/target .
         COMMAND rm ARGS -rf jvpp-registry/target
-        jvpp-registry/io_fd_vpp_jvpp_*.h
+        jvpp-registry/io_fd_jvpp_*.h
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMENT "JAR_GEN registry"
         )
@@ -106,8 +106,8 @@ function(jargen name)
             ${CMAKE_CURRENT_BINARY_DIR}/jvpp-${name}-${JAPI_LIB_VERSION}.jar
             -C jvpp-${name}/target .
             COMMAND rm ARGS -rf jvpp-${name}/target jvpp-${name}/jvpp-${name}.files
-            jvpp-${name}/jvpp_${name}_gen.h jvpp-${name}/io_fd_vpp_jvpp_*.h
-            jvpp-registry/io_fd_vpp_jvpp_*.h
+            jvpp-${name}/jvpp_${name}_gen.h jvpp-${name}/io_fd_jvpp_*.h
+            jvpp-registry/io_fd_jvpp_*.h
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             COMMENT "JAR_GEN ${name}"
             )
diff --git a/java/Readme.txt b/java/Readme.txt
index 689b9b3..375c596 100644
--- a/java/Readme.txt
+++ b/java/Readme.txt
@@ -137,10 +137,10 @@ JVpp Java      |                             |
 
 == Package structure
 
-* *io.fd.vpp.jvpp* - top level package for generated JVpp interface+ implementation and hand-crafted
+* *io.fd.jvpp* - top level package for generated JVpp interface+ implementation and hand-crafted
 VppConnection interface + implementation - packaged as jvpp-registry-version.jar
 
-* *io.fd.vpp.jvpp.[plugin]* - top level package for generated JVpp interface + implementation
+* *io.fd.jvpp.[plugin]* - top level package for generated JVpp interface + implementation
 + plugin's API tests - packaged as jvpp-[plugin]-version.jar
 
 ** *dto* - package for DTOs generated from VPP API structures + base/marker hand-crafted interfaces
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclExpectedDumpData.java b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclExpectedDumpData.java
index 4806052..f145ae2 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclExpectedDumpData.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclExpectedDumpData.java
@@ -14,37 +14,37 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.examples;
-
-
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_ADDRESS_2_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_ADDRESS_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_DST_ICMP_TYPE_END;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_DST_ICMP_TYPE_START;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_MAC;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_MAC_MASK;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_PREFIX;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_PREFIX_2;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_END;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_START;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.ICMP_PROTOCOL;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_ADDRESS_2_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_ADDRESS_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_DST_PORT_RANGE_END;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_DST_PORT_RANGE_START;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_MAC;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_MAC_MASK;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_PREFIX;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_PREFIX_2;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_SRC_PORT_RANGE_END;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_SRC_PORT_RANGE_START;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.UDP_PROTOCOL;
-
-import io.fd.vpp.jvpp.acl.dto.AclDetails;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetails;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDetails;
-import io.fd.vpp.jvpp.acl.types.AclRule;
-import io.fd.vpp.jvpp.acl.types.MacipAclRule;
+package io.fd.jvpp.acl.examples;
+
+
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_ADDRESS_2_AS_ARRAY;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_ADDRESS_AS_ARRAY;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_DST_ICMP_TYPE_END;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_DST_ICMP_TYPE_START;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_MAC;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_MAC_MASK;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_PREFIX;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_PREFIX_2;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_END;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_START;
+import static io.fd.jvpp.acl.examples.AclTestData.ICMP_PROTOCOL;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_ADDRESS_2_AS_ARRAY;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_ADDRESS_AS_ARRAY;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_DST_PORT_RANGE_END;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_DST_PORT_RANGE_START;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_MAC;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_MAC_MASK;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_PREFIX;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_PREFIX_2;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_SRC_PORT_RANGE_END;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_SRC_PORT_RANGE_START;
+import static io.fd.jvpp.acl.examples.AclTestData.UDP_PROTOCOL;
+
+import io.fd.jvpp.acl.dto.AclDetails;
+import io.fd.jvpp.acl.dto.AclInterfaceListDetails;
+import io.fd.jvpp.acl.dto.MacipAclDetails;
+import io.fd.jvpp.acl.types.AclRule;
+import io.fd.jvpp.acl.types.MacipAclRule;
 import java.util.Arrays;
 
 class AclExpectedDumpData {
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestData.java b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclTestData.java
index 199b1b6..599d0ac 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestData.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclTestData.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.examples;
+package io.fd.jvpp.acl.examples;
 
 
-import io.fd.vpp.jvpp.acl.types.AclRule;
-import io.fd.vpp.jvpp.acl.types.MacipAclRule;
+import io.fd.jvpp.acl.types.AclRule;
+import io.fd.jvpp.acl.types.MacipAclRule;
 
 class AclTestData {
 
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestRequests.java b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclTestRequests.java
index 149ea46..13c73c2 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestRequests.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclTestRequests.java
@@ -14,31 +14,31 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.examples;
-
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.createAclRules;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.createMacipRules;
-
-import io.fd.vpp.jvpp.VppInvocationException;
-import io.fd.vpp.jvpp.acl.dto.AclAddReplace;
-import io.fd.vpp.jvpp.acl.dto.AclAddReplaceReply;
-import io.fd.vpp.jvpp.acl.dto.AclDel;
-import io.fd.vpp.jvpp.acl.dto.AclDelReply;
-import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.AclDump;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDump;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclList;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclListReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclAdd;
-import io.fd.vpp.jvpp.acl.dto.MacipAclAddReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclAddReplace;
-import io.fd.vpp.jvpp.acl.dto.MacipAclAddReplaceReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDel;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDelReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDump;
-import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
+package io.fd.jvpp.acl.examples;
+
+import static io.fd.jvpp.acl.examples.AclTestData.createAclRules;
+import static io.fd.jvpp.acl.examples.AclTestData.createMacipRules;
+
+import io.fd.jvpp.VppInvocationException;
+import io.fd.jvpp.acl.dto.AclAddReplace;
+import io.fd.jvpp.acl.dto.AclAddReplaceReply;
+import io.fd.jvpp.acl.dto.AclDel;
+import io.fd.jvpp.acl.dto.AclDelReply;
+import io.fd.jvpp.acl.dto.AclDetailsReplyDump;
+import io.fd.jvpp.acl.dto.AclDump;
+import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump;
+import io.fd.jvpp.acl.dto.AclInterfaceListDump;
+import io.fd.jvpp.acl.dto.AclInterfaceSetAclList;
+import io.fd.jvpp.acl.dto.AclInterfaceSetAclListReply;
+import io.fd.jvpp.acl.dto.MacipAclAdd;
+import io.fd.jvpp.acl.dto.MacipAclAddReply;
+import io.fd.jvpp.acl.dto.MacipAclAddReplace;
+import io.fd.jvpp.acl.dto.MacipAclAddReplaceReply;
+import io.fd.jvpp.acl.dto.MacipAclDel;
+import io.fd.jvpp.acl.dto.MacipAclDelReply;
+import io.fd.jvpp.acl.dto.MacipAclDetailsReplyDump;
+import io.fd.jvpp.acl.dto.MacipAclDump;
+import io.fd.jvpp.acl.future.FutureJVppAclFacade;
 import java.util.concurrent.ExecutionException;
 
 class AclTestRequests {
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/FutureApiExample.java b/java/jvpp-acl/io/fd/jvpp/acl/examples/FutureApiExample.java
index 862df8d..144d839 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/FutureApiExample.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/examples/FutureApiExample.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.examples;
+package io.fd.jvpp.acl.examples;
 
-import static io.fd.vpp.jvpp.acl.examples.AclExpectedDumpData.verifyAclDump;
-import static io.fd.vpp.jvpp.acl.examples.AclExpectedDumpData.verifyAclInterfaceList;
-import static io.fd.vpp.jvpp.acl.examples.AclExpectedDumpData.verifyMacIpDump;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclAddRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclDelRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclDumpRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclInterfaceDeleteList;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclInterfaceListDumpRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclInterfaceSetAclList;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendMacIpAddRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendMacIpDelRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendMacIpDumpRequest;
+import static io.fd.jvpp.acl.examples.AclExpectedDumpData.verifyAclDump;
+import static io.fd.jvpp.acl.examples.AclExpectedDumpData.verifyAclInterfaceList;
+import static io.fd.jvpp.acl.examples.AclExpectedDumpData.verifyMacIpDump;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclAddRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclDelRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclDumpRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclInterfaceDeleteList;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclInterfaceListDumpRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclInterfaceSetAclList;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendMacIpAddRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendMacIpDelRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendMacIpDumpRequest;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.acl.JVppAclImpl;
-import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.acl.JVppAclImpl;
+import io.fd.jvpp.acl.future.FutureJVppAclFacade;
 
 public class FutureApiExample {
 
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/Readme.txt b/java/jvpp-acl/io/fd/jvpp/acl/examples/Readme.txt
index d17fbfc..e47b027 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/Readme.txt
+++ b/java/jvpp-acl/io/fd/jvpp/acl/examples/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.vpp.jvpp.acl.examples.FutureApiExample
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.jvpp.acl.examples.FutureApiExample
 debug version:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-debug-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.vpp.jvpp.acl.examples.FutureApiExample
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-debug-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.jvpp.acl.examples.FutureApiExample
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/CallbackApiTest.java b/java/jvpp-acl/io/fd/jvpp/acl/test/CallbackApiTest.java
index a7bbb7f..5e451e2 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/CallbackApiTest.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/test/CallbackApiTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.test;
+package io.fd.jvpp.acl.test;
 
-import io.fd.vpp.jvpp.AbstractCallbackApiTest;
-import io.fd.vpp.jvpp.acl.JVppAclImpl;
+import io.fd.jvpp.AbstractCallbackApiTest;
+import io.fd.jvpp.acl.JVppAclImpl;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java b/java/jvpp-acl/io/fd/jvpp/acl/test/FutureApiTest.java
index ff1c73c..7bba3fc 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/test/FutureApiTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.test;
-
-import io.fd.vpp.jvpp.Assertions;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.acl.JVppAclImpl;
-import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.AclDump;
-import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
+package io.fd.jvpp.acl.test;
+
+import io.fd.jvpp.Assertions;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.acl.JVppAclImpl;
+import io.fd.jvpp.acl.dto.AclDetailsReplyDump;
+import io.fd.jvpp.acl.dto.AclDump;
+import io.fd.jvpp.acl.future.FutureJVppAclFacade;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Logger;
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt b/java/jvpp-acl/io/fd/jvpp/acl/test/Readme.txt
index 1b46585..ad8757f 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt
+++ b/java/jvpp-acl/io/fd/jvpp/acl/test/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.vpp.jvpp.acl.test.[test-name]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.jvpp.acl.test.[test-name]
 debug version:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.vpp.jvpp.acl.test.[test-name]
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.jvpp.acl.test.[test-name]
diff --git a/java/jvpp-acl/jvpp_acl.c b/java/jvpp-acl/jvpp_acl.c
index 22e44f1..1e48566 100644
--- a/java/jvpp-acl/jvpp_acl.c
+++ b/java/jvpp-acl/jvpp_acl.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h"
+#include "jvpp-acl/io_fd_jvpp_acl_JVppAclImpl.h"
 #include "jvpp_acl.h"
 #include "jvpp-acl/jvpp_acl_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_acl_JVppaclImpl
+ * Class:     io_fd_jvpp_acl_JVppaclImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_acl_JVppAclImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   acl_main_t * plugin_main = &acl_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_acl_JVppAclImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
   plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_acl_JVppAclImpl_close0
 (JNIEnv *env, jclass clazz) {
   acl_main_t * plugin_main = &acl_main;
 
diff --git a/java/jvpp-common/jvpp_common.c b/java/jvpp-common/jvpp_common.c
index 2425607..4c56775 100644
--- a/java/jvpp-common/jvpp_common.c
+++ b/java/jvpp-common/jvpp_common.c
@@ -57,7 +57,7 @@ void call_on_error(const char* callName, int contextId, int retval,
         return;
     }
     jmethodID callbackExcMethod = (*env)->GetMethodID(env, callbackClass,
-            "onError", "(Lio/fd/vpp/jvpp/VppCallbackException;)V");
+            "onError", "(Lio/fd/jvpp/VppCallbackException;)V");
     if (!callbackExcMethod) {
         DEBUG_LOG("CallOnError : callbackExcMethod is null!\n");
         return;
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiExample.java
index b6558ff..6b2d893 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiExample.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.GetNodeIndexReplyCallback;
-import io.fd.vpp.jvpp.core.callback.ShowVersionReplyCallback;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceDetailsCallback;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersion;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.GetNodeIndexReplyCallback;
+import io.fd.jvpp.core.callback.ShowVersionReplyCallback;
+import io.fd.jvpp.core.callback.SwInterfaceDetailsCallback;
+import io.fd.jvpp.core.dto.GetNodeIndex;
+import io.fd.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.jvpp.core.dto.ShowVersion;
+import io.fd.jvpp.core.dto.ShowVersionReply;
+import io.fd.jvpp.core.dto.SwInterfaceDetails;
+import io.fd.jvpp.core.dto.SwInterfaceDump;
 import java.nio.charset.StandardCharsets;
 
 public class CallbackApiExample {
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiReadPerfTest.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiReadPerfTest.java
index 6ff440d..26a371e 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiReadPerfTest.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiReadPerfTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.ShowVersionReplyCallback;
-import io.fd.vpp.jvpp.core.dto.*;
+package io.fd.jvpp.core.examples;
+
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.ShowVersionReplyCallback;
+import io.fd.jvpp.core.dto.*;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiWritePerfTest.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiWritePerfTest.java
index 1940ddc..dd045fe 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiWritePerfTest.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiWritePerfTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.*;
-import io.fd.vpp.jvpp.core.callback.ClassifyAddDelTableReplyCallback;
+package io.fd.jvpp.core.examples;
+
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.*;
+import io.fd.jvpp.core.callback.ClassifyAddDelTableReplyCallback;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackCliApiExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackCliApiExample.java
index b692291..49a3f62 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackCliApiExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackCliApiExample.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.CliInbandReplyCallback;
-import io.fd.vpp.jvpp.core.dto.CliInband;
-import io.fd.vpp.jvpp.core.dto.CliInbandReply;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.CliInbandReplyCallback;
+import io.fd.jvpp.core.dto.CliInband;
+import io.fd.jvpp.core.dto.CliInbandReply;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackJVppFacadeExample.java
index a8b9186..b9409f8 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackJVppFacadeExample.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.GetNodeIndexReplyCallback;
-import io.fd.vpp.jvpp.core.callback.ShowVersionReplyCallback;
-import io.fd.vpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
+package io.fd.jvpp.core.examples;
+
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.GetNodeIndexReplyCallback;
+import io.fd.jvpp.core.callback.ShowVersionReplyCallback;
+import io.fd.jvpp.core.callfacade.CallbackJVppCoreFacade;
+import io.fd.jvpp.core.dto.GetNodeIndex;
+import io.fd.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.jvpp.core.dto.ShowVersionReply;
 import java.nio.charset.StandardCharsets;
 
 /**
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java
index 832464a..3ac2310 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCore;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.WantInterfaceEventsReplyCallback;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceEventCallback;
-import io.fd.vpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
-import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceEvent;
+package io.fd.jvpp.core.examples;
+
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCore;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.WantInterfaceEventsReplyCallback;
+import io.fd.jvpp.core.callback.SwInterfaceEventCallback;
+import io.fd.jvpp.core.callfacade.CallbackJVppCoreFacade;
+import io.fd.jvpp.core.dto.WantInterfaceEventsReply;
+import io.fd.jvpp.core.dto.SwInterfaceEvent;
 
 public class CallbackJVppFacadeNotificationExample {
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackNotificationApiExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackNotificationApiExample.java
index 9ed418e..6de0a6f 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackNotificationApiExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackNotificationApiExample.java
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getChangeInterfaceState;
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getDisableInterfaceNotificationsReq;
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getEnableInterfaceNotificationsReq;
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.printNotification;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceEventCallback;
-import io.fd.vpp.jvpp.core.callback.WantInterfaceEventsReplyCallback;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceEvent;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsReply;
-import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply;
+package io.fd.jvpp.core.examples;
+
+import static io.fd.jvpp.core.examples.NotificationUtils.getChangeInterfaceState;
+import static io.fd.jvpp.core.examples.NotificationUtils.getDisableInterfaceNotificationsReq;
+import static io.fd.jvpp.core.examples.NotificationUtils.getEnableInterfaceNotificationsReq;
+import static io.fd.jvpp.core.examples.NotificationUtils.printNotification;
+
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.SwInterfaceEventCallback;
+import io.fd.jvpp.core.callback.WantInterfaceEventsReplyCallback;
+import io.fd.jvpp.core.dto.SwInterfaceEvent;
+import io.fd.jvpp.core.dto.SwInterfaceSetFlagsReply;
+import io.fd.jvpp.core.dto.WantInterfaceEventsReply;
 
 public class CallbackNotificationApiExample {
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CreateSubInterfaceExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CreateSubInterfaceExample.java
index 3db6d30..cc07520 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CreateSubInterfaceExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CreateSubInterfaceExample.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
 import static java.util.Objects.requireNonNull;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.CreateSubif;
-import io.fd.vpp.jvpp.core.dto.CreateSubifReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.CreateSubif;
+import io.fd.jvpp.core.dto.CreateSubifReply;
+import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump;
+import io.fd.jvpp.core.dto.SwInterfaceDump;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import java.nio.charset.StandardCharsets;
 
 /**
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiExample.java
index 030e689..ff1755d 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiExample.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainDump;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersion;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.BridgeDomainDetailsReplyDump;
+import io.fd.jvpp.core.dto.BridgeDomainDump;
+import io.fd.jvpp.core.dto.GetNodeIndex;
+import io.fd.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.jvpp.core.dto.ShowVersion;
+import io.fd.jvpp.core.dto.ShowVersionReply;
+import io.fd.jvpp.core.dto.SwInterfaceDetails;
+import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump;
+import io.fd.jvpp.core.dto.SwInterfaceDump;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiNotificationExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiNotificationExample.java
index 3c84fd7..67fd05c 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiNotificationExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiNotificationExample.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getChangeInterfaceState;
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getDisableInterfaceNotificationsReq;
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getEnableInterfaceNotificationsReq;
+import static io.fd.jvpp.core.examples.NotificationUtils.getChangeInterfaceState;
+import static io.fd.jvpp.core.examples.NotificationUtils.getDisableInterfaceNotificationsReq;
+import static io.fd.jvpp.core.examples.NotificationUtils.getEnableInterfaceNotificationsReq;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceEventCallback;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceEvent;
-import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.core.callback.SwInterfaceEventCallback;
+import io.fd.jvpp.core.dto.SwInterfaceEvent;
+import io.fd.jvpp.VppCallbackException;
 
 public class FutureApiNotificationExample {
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiReadPerfTest.java b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiReadPerfTest.java
index f335b28..747a66a 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiReadPerfTest.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiReadPerfTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.ShowVersionReplyCallback;
-import io.fd.vpp.jvpp.core.dto.*;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.ShowVersionReplyCallback;
+import io.fd.jvpp.core.dto.*;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Logger;
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/L2AclExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/L2AclExample.java
index 0be85d4..7f6742a 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/L2AclExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/L2AclExample.java
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
-import io.fd.vpp.jvpp.core.dto.ClassifySessionDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.ClassifySessionDump;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableIds;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableIdsReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableInfo;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableInfoReply;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+package io.fd.jvpp.core.examples;
+
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.ClassifyAddDelSession;
+import io.fd.jvpp.core.dto.ClassifyAddDelSessionReply;
+import io.fd.jvpp.core.dto.ClassifyAddDelTable;
+import io.fd.jvpp.core.dto.ClassifyAddDelTableReply;
+import io.fd.jvpp.core.dto.ClassifySessionDetailsReplyDump;
+import io.fd.jvpp.core.dto.ClassifySessionDump;
+import io.fd.jvpp.core.dto.ClassifyTableByInterface;
+import io.fd.jvpp.core.dto.ClassifyTableByInterfaceReply;
+import io.fd.jvpp.core.dto.ClassifyTableIds;
+import io.fd.jvpp.core.dto.ClassifyTableIdsReply;
+import io.fd.jvpp.core.dto.ClassifyTableInfo;
+import io.fd.jvpp.core.dto.ClassifyTableInfoReply;
+import io.fd.jvpp.core.dto.InputAclSetInterface;
+import io.fd.jvpp.core.dto.InputAclSetInterfaceReply;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 
 /**
  * <p>Tests L2 ACL creation and read.<br> Equivalent to the following vppctl commands:<br>
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/LispAdjacencyExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/LispAdjacencyExample.java
index f637669..32addbc 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/LispAdjacencyExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/LispAdjacencyExample.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.LispAddDelAdjacency;
-import io.fd.vpp.jvpp.core.dto.LispAddDelLocalEid;
-import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSet;
-import io.fd.vpp.jvpp.core.dto.LispAddDelRemoteMapping;
-import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGet;
-import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGetReply;
-import io.fd.vpp.jvpp.core.dto.LispEnableDisable;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.LispAddDelAdjacency;
+import io.fd.jvpp.core.dto.LispAddDelLocalEid;
+import io.fd.jvpp.core.dto.LispAddDelLocatorSet;
+import io.fd.jvpp.core.dto.LispAddDelRemoteMapping;
+import io.fd.jvpp.core.dto.LispAdjacenciesGet;
+import io.fd.jvpp.core.dto.LispAdjacenciesGetReply;
+import io.fd.jvpp.core.dto.LispEnableDisable;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Logger;
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/NotificationUtils.java b/java/jvpp-core/io/fd/jvpp/core/examples/NotificationUtils.java
index e963d63..7b78389 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/NotificationUtils.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/NotificationUtils.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
 import java.io.PrintStream;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceEvent;
-import io.fd.vpp.jvpp.core.dto.WantInterfaceEvents;
+import io.fd.jvpp.core.dto.SwInterfaceSetFlags;
+import io.fd.jvpp.core.dto.SwInterfaceEvent;
+import io.fd.jvpp.core.dto.WantInterfaceEvents;
 
 final class NotificationUtils {
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/Readme.txt b/java/jvpp-core/io/fd/jvpp/core/examples/Readme.txt
index 9fe3c7a..df4dd89 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/Readme.txt
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/Readme.txt
@@ -2,8 +2,8 @@ This package contains basic examples for jvpp. To run the examples:
 
 - Make sure VPP is running
 - From VPP's build-root/ folder execute:
-  - release version: sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.vpp.jvpp.core.examples.[test name]
-  - debug version: sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.vpp.jvpp.core.examples.[test name]
+  - release version: sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.jvpp.core.examples.[test name]
+  - debug version: sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.jvpp.core.examples.[test name]
 
 Available examples:
 CallbackApiExample - Similar to ControlPingTest, invokes more complex calls (e.g. interface dump) using low level JVpp APIs
@@ -18,7 +18,7 @@ LispAdjacencyExample - Example of lisp adjacency creation and read (custom vpe.a
 
 CallbackApiReadPerfTest, FutureApiReadPerfTest, CallbackApiWritePerfTest - test provide two ways to count invocations:
 1) maximum number of invocations and received replyies within 1 sec
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.vpp.jvpp.core.examples.[test name]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.jvpp.core.examples.[test name]
 2) measure time in ns from first request to receiving last reply over set amount of requests
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.vpp.jvpp.core.examples.[test name] [number of request to send]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.jvpp.core.examples.[test name] [number of request to send]
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java b/java/jvpp-core/io/fd/jvpp/core/test/CallbackApiTest.java
index 493116c..06255a7 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
+++ b/java/jvpp-core/io/fd/jvpp/core/test/CallbackApiTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.test;
+package io.fd.jvpp.core.test;
 
-import io.fd.vpp.jvpp.AbstractCallbackApiTest;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.AbstractCallbackApiTest;
+import io.fd.jvpp.core.JVppCoreImpl;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java b/java/jvpp-core/io/fd/jvpp/core/test/FutureApiTest.java
index d3acecc..6af4a41 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
+++ b/java/jvpp-core/io/fd/jvpp/core/test/FutureApiTest.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.test;
+package io.fd.jvpp.core.test;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainDump;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersion;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.BridgeDomainDetailsReplyDump;
+import io.fd.jvpp.core.dto.BridgeDomainDump;
+import io.fd.jvpp.core.dto.GetNodeIndex;
+import io.fd.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.jvpp.core.dto.ShowVersion;
+import io.fd.jvpp.core.dto.ShowVersionReply;
+import io.fd.jvpp.core.dto.SwInterfaceDetails;
+import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump;
+import io.fd.jvpp.core.dto.SwInterfaceDump;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt b/java/jvpp-core/io/fd/jvpp/core/test/Readme.txt
index b74cf60..f7cb5fc 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
+++ b/java/jvpp-core/io/fd/jvpp/core/test/Readme.txt
@@ -2,8 +2,8 @@ This package contains basic tests for jvpp. To run the tests:
 
 - Make sure VPP is running
 - From VPP's build-root/ folder execute:
-  - release version: sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-17.10.jar io.fd.vpp.jvpp.core.test.[test name]
-  - debug version: sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-core-17.10.jar io.fd.vpp.jvpp.core.test.[test name]
+  - release version: sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-17.10.jar io.fd.jvpp.core.test.[test name]
+  - debug version: sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-core-17.10.jar io.fd.jvpp.core.test.[test name]
 
 Available tests:
 CallbackApiTest - Similar to ControlPingTest, invokes more complex calls (e.g. interface dump) using low level JVpp APIs
diff --git a/java/jvpp-core/jvpp_core.c b/java/jvpp-core/jvpp_core.c
index 2e62426..da8ab09 100644
--- a/java/jvpp-core/jvpp_core.c
+++ b/java/jvpp-core/jvpp_core.c
@@ -43,10 +43,10 @@ typedef struct {
 
 core_main_t core_main __attribute__((aligned (64)));
 
-#include "io_fd_vpp_jvpp_core_JVppCoreImpl.h"
+#include "io_fd_jvpp_core_JVppCoreImpl.h"
 #include "jvpp_core_gen.h"
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_core_JVppCoreImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_core_JVppCoreImpl_init0
 (JNIEnv * env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
     core_main_t * plugin_main = &core_main;
     plugin_main->my_client_index = my_client_index;
@@ -72,7 +72,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_core_JVppCoreImpl_init0
     #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_core_JVppCoreImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_core_JVppCoreImpl_close0
 (JNIEnv *env, jclass clazz) {
     core_main_t * plugin_main = &core_main;
 
diff --git a/java/jvpp-gtpu/jvpp_gtpu.c b/java/jvpp-gtpu/jvpp_gtpu.c
index 8e523ca..cb6bfd2 100644
--- a/java/jvpp-gtpu/jvpp_gtpu.c
+++ b/java/jvpp-gtpu/jvpp_gtpu.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-gtpu/io_fd_vpp_jvpp_gtpu_JVppGtpuImpl.h"
+#include "jvpp-gtpu/io_fd_jvpp_gtpu_JVppGtpuImpl.h"
 #include "jvpp_gtpu.h"
 #include "jvpp-gtpu/jvpp_gtpu_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_gtpu_JVppgtpuImpl
+ * Class:     io_fd_jvpp_gtpu_JVppgtpuImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_gtpu_JVppGtpuImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_gtpu_JVppGtpuImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   gtpu_main_t * plugin_main = &gtpu_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_gtpu_JVppGtpuImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_gtpu_JVppGtpuImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
   plugin_main->vl_input_queue = (svm_queue_t *)queue_address;
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_gtpu_JVppGtpuImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_gtpu_JVppGtpuImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_gtpu_JVppGtpuImpl_close0
 (JNIEnv *env, jclass clazz) {
   gtpu_main_t * plugin_main = &gtpu_main;
 
diff --git a/java/jvpp-ikev2/jvpp_ikev2.c b/java/jvpp-ikev2/jvpp_ikev2.c
index 4e6aa03..a833cd4 100755
--- a/java/jvpp-ikev2/jvpp_ikev2.c
+++ b/java/jvpp-ikev2/jvpp_ikev2.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-ikev2/io_fd_vpp_jvpp_ikev2_JVppIkev2Impl.h"
+#include "jvpp-ikev2/io_fd_jvpp_ikev2_JVppIkev2Impl.h"
 #include "jvpp_ikev2.h"
 #include "jvpp-ikev2/jvpp_ikev2_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_ikev2_JVppIkev2Impl
+ * Class:     io_fd_jvpp_ikev2_JVppIkev2Impl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ikev2_JVppIkev2Impl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_ikev2_JVppIkev2Impl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   ikev2_main_t * plugin_main = &ikev2_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_ikev2_JVppIkev2Impl_init0");
+  clib_warning ("Java_io_fd_jvpp_ikev2_JVppIkev2Impl_init0");
 
   plugin_main->my_client_index = my_client_index;
   plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ikev2_JVppIkev2Impl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ikev2_JVppIkev2Impl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_ikev2_JVppIkev2Impl_close0
 (JNIEnv *env, jclass clazz) {
   ikev2_main_t * plugin_main = &ikev2_main;
 
diff --git a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/IoamExportApiExample.java b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/examples/IoamExportApiExample.java
index 2f5b7db..eb052dd 100644
--- a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/IoamExportApiExample.java
+++ b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/examples/IoamExportApiExample.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioamexport.examples;
+package io.fd.jvpp.ioamexport.examples;
 
 import java.net.InetAddress;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.ioamexport.JVppIoamexportImpl;
-import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade;
-import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisable;
-import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.ioamexport.JVppIoamexportImpl;
+import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade;
+import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisable;
+import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply;
 
 public class IoamExportApiExample {
 
diff --git a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/Readme.txt b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/examples/Readme.txt
index f2dfe91..d28e71f 100644
--- a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/Readme.txt
+++ b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/examples/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-ioamexport-17.10.jar io.fd.vpp.jvpp.ioamexport.examples.IoamExportApiExample
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-ioamexport-17.10.jar io.fd.jvpp.ioamexport.examples.IoamExportApiExample
 debug vresion:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamexport-17.10.jar io.fd.vpp.jvpp.ioamexport.examples.IoamExportApiExample
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamexport-17.10.jar io.fd.jvpp.ioamexport.examples.IoamExportApiExample
diff --git a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/CallbackApiTest.java b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/CallbackApiTest.java
index ba49d77..14efa42 100644
--- a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/CallbackApiTest.java
+++ b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/CallbackApiTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioamexport.test;
+package io.fd.jvpp.ioamexport.test;
 
-import io.fd.vpp.jvpp.AbstractCallbackApiTest;
-import io.fd.vpp.jvpp.ioamexport.JVppIoamexportImpl;
+import io.fd.jvpp.AbstractCallbackApiTest;
+import io.fd.jvpp.ioamexport.JVppIoamexportImpl;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/FutureApiTest.java b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/FutureApiTest.java
index 048d244..b4208e7 100644
--- a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/FutureApiTest.java
+++ b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/FutureApiTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioamexport.test;
+package io.fd.jvpp.ioamexport.test;
 
 
-import io.fd.vpp.jvpp.Assertions;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.ioamexport.JVppIoamexportImpl;
-import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisable;
-import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply;
-import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade;
+import io.fd.jvpp.Assertions;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.ioamexport.JVppIoamexportImpl;
+import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisable;
+import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply;
+import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade;
 
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
diff --git a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/Readme.txt
index 820071a..78a10c1 100644
--- a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
+++ b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamexport-17.10.jar io.fd.vpp.jvpp.ioamexport.test.[test-name]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamexport-17.10.jar io.fd.jvpp.ioamexport.test.[test-name]
 debug version:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamexport-17.10.jar io.fd.vpp.jvpp.ioamexport.test.[test-name]
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamexport-17.10.jar io.fd.jvpp.ioamexport.test.[test-name]
diff --git a/java/jvpp-ioamexport/jvpp_ioam_export.c b/java/jvpp-ioamexport/jvpp_ioam_export.c
index 74ae438..6aa58e4 100644
--- a/java/jvpp-ioamexport/jvpp_ioam_export.c
+++ b/java/jvpp-ioamexport/jvpp_ioam_export.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-ioamexport/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h"
+#include "jvpp-ioamexport/io_fd_jvpp_ioamexport_JVppIoamexportImpl.h"
 #include "jvpp_ioam_export.h"
 #include "jvpp-ioamexport/jvpp_ioamexport_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl
+ * Class:     io_fd_jvpp_ioamexport_JVppIoamexportImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_ioamexport_JVppIoamexportImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   ioamexport_main_t * plugin_main = &ioamexport_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_ioamexport_JVppIoamexportImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
   plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_ioamexport_JVppIoamexportImpl_close0
 (JNIEnv *env, jclass clazz) {
   ioamexport_main_t * plugin_main = &ioamexport_main;
 
diff --git a/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/IoamPotApiExample.java b/java/jvpp-ioampot/io/fd/jvpp/ioampot/examples/IoamPotApiExample.java
index b9ed7d0..528249a 100644
--- a/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/IoamPotApiExample.java
+++ b/java/jvpp-ioampot/io/fd/jvpp/ioampot/examples/IoamPotApiExample.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioampot.examples;
+package io.fd.jvpp.ioampot.examples;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.ioampot.JVppIoampotImpl;
-import io.fd.vpp.jvpp.ioampot.callback.PotProfileAddReplyCallback;
-import io.fd.vpp.jvpp.ioampot.dto.PotProfileAdd;
-import io.fd.vpp.jvpp.ioampot.dto.PotProfileAddReply;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.ioampot.JVppIoampotImpl;
+import io.fd.jvpp.ioampot.callback.PotProfileAddReplyCallback;
+import io.fd.jvpp.ioampot.dto.PotProfileAdd;
+import io.fd.jvpp.ioampot.dto.PotProfileAddReply;
 import java.nio.charset.StandardCharsets;
 
 public class IoamPotApiExample {
diff --git a/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/Readme.txt b/java/jvpp-ioampot/io/fd/jvpp/ioampot/examples/Readme.txt
index e91550b..333fb90 100644
--- a/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/Readme.txt
+++ b/java/jvpp-ioampot/io/fd/jvpp/ioampot/examples/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-ioampot-17.10.jar io.fd.vpp.jvpp.ioampot.examples.IoamPotApiExample
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-ioampot-17.10.jar io.fd.jvpp.ioampot.examples.IoamPotApiExample
 debug vresion:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioampot-17.10.jar io.fd.vpp.jvpp.ioampot.examples.IoamPotApiExample
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioampot-17.10.jar io.fd.jvpp.ioampot.examples.IoamPotApiExample
diff --git a/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/CallbackApiTest.java b/java/jvpp-ioampot/io/fd/jvpp/ioampot/test/CallbackApiTest.java
index 20b85d8..90dce0e 100644
--- a/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/CallbackApiTest.java
+++ b/java/jvpp-ioampot/io/fd/jvpp/ioampot/test/CallbackApiTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioampot.test;
+package io.fd.jvpp.ioampot.test;
 
-import io.fd.vpp.jvpp.AbstractCallbackApiTest;
-import io.fd.vpp.jvpp.ioampot.JVppIoampotImpl;
+import io.fd.jvpp.AbstractCallbackApiTest;
+import io.fd.jvpp.ioampot.JVppIoampotImpl;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/FutureApiTest.java b/java/jvpp-ioampot/io/fd/jvpp/ioampot/test/FutureApiTest.java
index 6401c67..5b3f284 100644
--- a/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/FutureApiTest.java
+++ b/java/jvpp-ioampot/io/fd/jvpp/ioampot/test/FutureApiTest.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioampot.test;
+package io.fd.jvpp.ioampot.test;
 
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.ioampot.JVppIoampotImpl;
-import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDetailsReplyDump;
-import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDump;
-import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampotFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.ioampot.JVppIoampotImpl;
+import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDetailsReplyDump;
+import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDump;
+import io.fd.jvpp.ioampot.future.FutureJVppIoampotFacade;
 
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
 
 public class FutureApiTest {
 
-    private static final Logger LOG = Logger.getLogger(io.fd.vpp.jvpp.ioampot.test.FutureApiTest.class.getName());
+    private static final Logger LOG = Logger.getLogger(io.fd.jvpp.ioampot.test.FutureApiTest.class.getName());
 
     public static void main(String[] args) throws Exception {
         testCallbackApi(args);
diff --git a/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/Readme.txt b/java/jvpp-ioampot/io/fd/jvpp/ioampot/test/Readme.txt
index f3cae26..5d31198 100644
--- a/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/Readme.txt
+++ b/java/jvpp-ioampot/io/fd/jvpp/ioampot/test/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioampot-17.10.jar io.fd.vpp.jvpp.ioampot.test.[test-name]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioampot-17.10.jar io.fd.jvpp.ioampot.test.[test-name]
 debug version:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioampot-17.10.jar io.fd.vpp.jvpp.ioampot.test.[test-name]
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioampot-17.10.jar io.fd.jvpp.ioampot.test.[test-name]
diff --git a/java/jvpp-ioampot/jvpp_ioam_pot.c b/java/jvpp-ioampot/jvpp_ioam_pot.c
index ce1da69..0fdf147 100644
--- a/java/jvpp-ioampot/jvpp_ioam_pot.c
+++ b/java/jvpp-ioampot/jvpp_ioam_pot.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-ioampot/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h"
+#include "jvpp-ioampot/io_fd_jvpp_ioampot_JVppIoampotImpl.h"
 #include "jvpp_ioam_pot.h"
 #include "jvpp-ioampot/jvpp_ioampot_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_ioampot_JVppIoampotImpl
+ * Class:     io_fd_jvpp_ioampot_JVppIoampotImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_ioampot_JVppIoampotImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   ioampot_main_t * plugin_main = &ioampot_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_ioampot_JVppIoampotImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
   plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_ioampot_JVppIoampotImpl_close0
 (JNIEnv *env, jclass clazz) {
   ioampot_main_t * plugin_main = &ioampot_main;
 
diff --git a/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/IoamTraceApiExample.java b/java/jvpp-ioamtrace/io/fd/jvpp/ioamtrace/examples/IoamTraceApiExample.java
index d63d137..d0adc4a 100644
--- a/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/IoamTraceApiExample.java
+++ b/java/jvpp-ioamtrace/io/fd/jvpp/ioamtrace/examples/IoamTraceApiExample.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioamtrace.examples;
+package io.fd.jvpp.ioamtrace.examples;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
-import io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl;
-import io.fd.vpp.jvpp.ioamtrace.callback.TraceProfileAddReplyCallback;
-import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAdd;
-import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply;
-import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfig;
-import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfigReply;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
+import io.fd.jvpp.ioamtrace.JVppIoamtraceImpl;
+import io.fd.jvpp.ioamtrace.callback.TraceProfileAddReplyCallback;
+import io.fd.jvpp.ioamtrace.dto.TraceProfileAdd;
+import io.fd.jvpp.ioamtrace.dto.TraceProfileAddReply;
+import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfig;
+import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfigReply;
 
 public class IoamTraceApiExample {
 
diff --git a/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/Readme.txt b/java/jvpp-ioamtrace/io/fd/jvpp/ioamtrace/examples/Readme.txt
index e8c3907..3d66388 100644
--- a/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/Readme.txt
+++ b/java/jvpp-ioamtrace/io/fd/jvpp/ioamtrace/examples/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-ioamtrace-17.10.jar io.fd.vpp.jvpp.ioamtrace.examples.IoamTraceApiExample
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-ioamtrace-17.10.jar io.fd.jvpp.ioamtrace.examples.IoamTraceApiExample
 debug vresion:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamtrace-17.10.jar io.fd.vpp.jvpp.ioamtrace.examples.IoamTraceApiExample
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamtrace-17.10.jar io.fd.jvpp.ioamtrace.examples.IoamTraceApiExample
diff --git a/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/CallbackApiTest.java b/java/jvpp-ioamtrace/io/fd/jvpp/ioamtrace/test/CallbackApiTest.java
index 4a71db5..e932c29 100644
--- a/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/CallbackApiTest.java
+++ b/java/jvpp-ioamtrace/io/fd/jvpp/ioamtrace/test/CallbackApiTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioamtrace.test;
+package io.fd.jvpp.ioamtrace.test;
 
-import io.fd.vpp.jvpp.AbstractCallbackApiTest;
-import io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl;
+import io.fd.jvpp.AbstractCallbackApiTest;
+import io.fd.jvpp.ioamtrace.JVppIoamtraceImpl;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/FutureApiTest.java b/java/jvpp-ioamtrace/io/fd/jvpp/ioamtrace/test/FutureApiTest.java
index 4e13ed1..92f54c4 100644
--- a/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/FutureApiTest.java
+++ b/java/jvpp-ioamtrace/io/fd/jvpp/ioamtrace/test/FutureApiTest.java
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioamtrace.test;
+package io.fd.jvpp.ioamtrace.test;
 
 
-import io.fd.vpp.jvpp.Assertions;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl;
-import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfig;
-import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfigReply;
-import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
+import io.fd.jvpp.Assertions;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.ioamtrace.JVppIoamtraceImpl;
+import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfig;
+import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfigReply;
+import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
 
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
 
 public class FutureApiTest {
 
-    private static final Logger LOG = Logger.getLogger(io.fd.vpp.jvpp.ioamtrace.test.FutureApiTest.class.getName());
+    private static final Logger LOG = Logger.getLogger(io.fd.jvpp.ioamtrace.test.FutureApiTest.class.getName());
 
     public static void main(String[] args) throws Exception {
         testCallbackApi(args);
diff --git a/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt b/java/jvpp-ioamtrace/io/fd/jvpp/ioamtrace/test/Readme.txt
index 9a1ba82..15f3340 100644
--- a/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt
+++ b/java/jvpp-ioamtrace/io/fd/jvpp/ioamtrace/test/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamtrace-17.10.jar io.fd.vpp.jvpp.ioamtrace.test.[test-name]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamtrace-17.10.jar io.fd.jvpp.ioamtrace.test.[test-name]
 debug version:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamtrace-17.10.jar io.fd.vpp.jvpp.ioamtrace.test.[test-name]
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-ioamtrace-17.10.jar io.fd.jvpp.ioamtrace.test.[test-name]
diff --git a/java/jvpp-ioamtrace/jvpp_ioam_trace.c b/java/jvpp-ioamtrace/jvpp_ioam_trace.c
index 3532d91..e793dcd 100644
--- a/java/jvpp-ioamtrace/jvpp_ioam_trace.c
+++ b/java/jvpp-ioamtrace/jvpp_ioam_trace.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-ioamtrace/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h"
+#include "jvpp-ioamtrace/io_fd_jvpp_ioamtrace_JVppIoamtraceImpl.h"
 #include "jvpp_ioam_trace.h"
 #include "jvpp-ioamtrace/jvpp_ioamtrace_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl
+ * Class:     io_fd_jvpp_ioamtrace_JVppIoamtraceImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_ioamtrace_JVppIoamtraceImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   ioamtrace_main_t * plugin_main = &ioamtrace_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_ioamtrace_JVppIoamtraceImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
   plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_ioamtrace_JVppIoamtraceImpl_close0
 (JNIEnv *env, jclass clazz) {
   ioamtrace_main_t * plugin_main = &ioamtrace_main;
 
diff --git a/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/CallbackApiExample.java b/java/jvpp-nat/io/fd/jvpp/nat/examples/CallbackApiExample.java
index e0d93ff..93fd308 100644
--- a/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/CallbackApiExample.java
+++ b/java/jvpp-nat/io/fd/jvpp/nat/examples/CallbackApiExample.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.nat.examples;
+package io.fd.jvpp.nat.examples;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.nat.JVppNatImpl;
-import io.fd.vpp.jvpp.nat.callback.Nat44InterfaceAddDelFeatureReplyCallback;
-import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeature;
-import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeatureReply;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.nat.JVppNatImpl;
+import io.fd.jvpp.nat.callback.Nat44InterfaceAddDelFeatureReplyCallback;
+import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelFeature;
+import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelFeatureReply;
 
 public class CallbackApiExample {
 
diff --git a/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/Readme.txt b/java/jvpp-nat/io/fd/jvpp/nat/examples/Readme.txt
index ac75e04..3ae52d8 100644
--- a/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/Readme.txt
+++ b/java/jvpp-nat/io/fd/jvpp/nat/examples/Readme.txt
@@ -1 +1 @@
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-nat-17.10.jar io.fd.vpp.jvpp.nat.examples.CallbackApiExample
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-nat-17.10.jar io.fd.jvpp.nat.examples.CallbackApiExample
diff --git a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/CallbackApiTest.java b/java/jvpp-nat/io/fd/jvpp/nat/test/CallbackApiTest.java
index a6f8214..dfa3816 100644
--- a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/CallbackApiTest.java
+++ b/java/jvpp-nat/io/fd/jvpp/nat/test/CallbackApiTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.nat.test;
+package io.fd.jvpp.nat.test;
 
-import io.fd.vpp.jvpp.AbstractCallbackApiTest;
-import io.fd.vpp.jvpp.nat.JVppNatImpl;
+import io.fd.jvpp.AbstractCallbackApiTest;
+import io.fd.jvpp.nat.JVppNatImpl;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java b/java/jvpp-nat/io/fd/jvpp/nat/test/FutureApiTest.java
index 26d6b98..529dedf 100644
--- a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java
+++ b/java/jvpp-nat/io/fd/jvpp/nat/test/FutureApiTest.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.nat.test;
+package io.fd.jvpp.nat.test;
 
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.nat.JVppNatImpl;
-import io.fd.vpp.jvpp.nat.dto.Nat44AddressDetailsReplyDump;
-import io.fd.vpp.jvpp.nat.dto.Nat44AddressDump;
-import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.nat.JVppNatImpl;
+import io.fd.jvpp.nat.dto.Nat44AddressDetailsReplyDump;
+import io.fd.jvpp.nat.dto.Nat44AddressDump;
+import io.fd.jvpp.nat.future.FutureJVppNatFacade;
 
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
 
 public class FutureApiTest {
 
-    private static final Logger LOG = Logger.getLogger(io.fd.vpp.jvpp.nat.test.FutureApiTest.class.getName());
+    private static final Logger LOG = Logger.getLogger(io.fd.jvpp.nat.test.FutureApiTest.class.getName());
 
     public static void main(String[] args) throws Exception {
         testCallbackApi(args);
diff --git a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/Readme.txt b/java/jvpp-nat/io/fd/jvpp/nat/test/Readme.txt
index 6f75808..7885638 100644
--- a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/Readme.txt
+++ b/java/jvpp-nat/io/fd/jvpp/nat/test/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-nat-17.10.jar io.fd.vpp.jvpp.nat.test.[test-name]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-nat-17.10.jar io.fd.jvpp.nat.test.[test-name]
 debug version:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-nat-17.10.jar io.fd.vpp.jvpp.nat.test.[test-name]
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-nat-17.10.jar io.fd.jvpp.nat.test.[test-name]
diff --git a/java/jvpp-nat/jvpp_nat.c b/java/jvpp-nat/jvpp_nat.c
index bdae1e6..20e4244 100644
--- a/java/jvpp-nat/jvpp_nat.c
+++ b/java/jvpp-nat/jvpp_nat.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-nat/io_fd_vpp_jvpp_nat_JVppNatImpl.h"
+#include "jvpp-nat/io_fd_jvpp_nat_JVppNatImpl.h"
 #include "jvpp_nat.h"
 #include "jvpp-nat/jvpp_nat_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_nat_JVppNatImpl
+ * Class:     io_fd_jvpp_nat_JVppNatImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nat_JVppNatImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_nat_JVppNatImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   nat_main_t * plugin_main = &nat_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_nat_JVppNatImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_nat_JVppNatImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
   plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nat_JVppNatImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nat_JVppNatImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_nat_JVppNatImpl_close0
 (JNIEnv *env, jclass clazz) {
   nat_main_t * plugin_main = &nat_main;
 
diff --git a/java/jvpp-nsh/jvpp_nsh.c b/java/jvpp-nsh/jvpp_nsh.c
index 1736ce7..e220d9a 100644
--- a/java/jvpp-nsh/jvpp_nsh.c
+++ b/java/jvpp-nsh/jvpp_nsh.c
@@ -31,19 +31,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-nsh/io_fd_vpp_jvpp_nsh_JVppNshImpl.h"
+#include "jvpp-nsh/io_fd_jvpp_nsh_JVppNshImpl.h"
 #include "jvpp_nsh.h"
 #include "jvpp-nsh/jvpp_nsh_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_nsh_JVppnshImpl
+ * Class:     io_fd_jvpp_nsh_JVppnshImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nsh_JVppNshImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_nsh_JVppNshImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   nsh_main_t * plugin_main = &nsh_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_nsh_JVppNshImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_nsh_JVppNshImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
   plugin_main->vl_input_queue = (svm_queue_t *)queue_address;
@@ -68,7 +68,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nsh_JVppNshImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nsh_JVppNshImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_nsh_JVppNshImpl_close0
 (JNIEnv *env, jclass clazz) {
   nsh_main_t * plugin_main = &nsh_main;
 
diff --git a/java/jvpp-pppoe/jvpp_pppoe.c b/java/jvpp-pppoe/jvpp_pppoe.c
index 02bd20e..552ba5d 100644
--- a/java/jvpp-pppoe/jvpp_pppoe.c
+++ b/java/jvpp-pppoe/jvpp_pppoe.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h"
+#include "jvpp-pppoe/io_fd_jvpp_pppoe_JVppPppoeImpl.h"
 #include "jvpp_pppoe.h"
 #include "jvpp-pppoe/jvpp_pppoe_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_pppoe_JVpppppoeImpl
+ * Class:     io_fd_jvpp_pppoe_JVpppppoeImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_pppoe_JVppPppoeImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   pppoe_main_t * plugin_main = &pppoe_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_pppoe_JVppPppoeImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
   plugin_main->vl_input_queue = (svm_queue_t *)queue_address;
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_pppoe_JVppPppoeImpl_close0
 (JNIEnv *env, jclass clazz) {
   pppoe_main_t * plugin_main = &pppoe_main;
 
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/AbstractCallbackApiTest.java b/java/jvpp-registry/io/fd/jvpp/AbstractCallbackApiTest.java
index d221d1e..a2e38e1 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/AbstractCallbackApiTest.java
+++ b/java/jvpp-registry/io/fd/jvpp/AbstractCallbackApiTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
-import io.fd.vpp.jvpp.callback.ControlPingCallback;
-import io.fd.vpp.jvpp.dto.ControlPing;
-import io.fd.vpp.jvpp.dto.ControlPingReply;
+import io.fd.jvpp.callback.ControlPingCallback;
+import io.fd.jvpp.dto.ControlPing;
+import io.fd.jvpp.dto.ControlPingReply;
 
 public abstract class AbstractCallbackApiTest {
 
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/Assertions.java b/java/jvpp-registry/io/fd/jvpp/Assertions.java
index f8b591f..2a403ad 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/Assertions.java
+++ b/java/jvpp-registry/io/fd/jvpp/Assertions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
 public class Assertions {
 
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java b/java/jvpp-registry/io/fd/jvpp/JVpp.java
index 55f25a7..251b0a7 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java
+++ b/java/jvpp-registry/io/fd/jvpp/JVpp.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
-import io.fd.vpp.jvpp.callback.JVppCallback;
-import io.fd.vpp.jvpp.dto.ControlPing;
-import io.fd.vpp.jvpp.dto.JVppRequest;
+import io.fd.jvpp.callback.JVppCallback;
+import io.fd.jvpp.dto.ControlPing;
+import io.fd.jvpp.dto.JVppRequest;
 
 /**
  * Base interface for plugin's Java API.
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java b/java/jvpp-registry/io/fd/jvpp/JVppRegistry.java
index 6535db0..f182a0a 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java
+++ b/java/jvpp-registry/io/fd/jvpp/JVppRegistry.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
-import io.fd.vpp.jvpp.callback.JVppCallback;
+import io.fd.jvpp.callback.JVppCallback;
 
 /**
  * Manages VPP connection and stores plugin callbacks.
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java b/java/jvpp-registry/io/fd/jvpp/JVppRegistryImpl.java
index baef14c..7caa64c 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java
+++ b/java/jvpp-registry/io/fd/jvpp/JVppRegistryImpl.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
 import static java.util.Objects.requireNonNull;
 
-import io.fd.vpp.jvpp.callback.ControlPingCallback;
-import io.fd.vpp.jvpp.callback.JVppCallback;
-import io.fd.vpp.jvpp.dto.ControlPingReply;
+import io.fd.jvpp.callback.ControlPingCallback;
+import io.fd.jvpp.callback.JVppCallback;
+import io.fd.jvpp.dto.ControlPingReply;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java b/java/jvpp-registry/io/fd/jvpp/NativeLibraryLoader.java
index ce6d1bf..54097f1 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java
+++ b/java/jvpp-registry/io/fd/jvpp/NativeLibraryLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java b/java/jvpp-registry/io/fd/jvpp/VppBaseCallException.java
index 7fc1682..1fbe579 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java
+++ b/java/jvpp-registry/io/fd/jvpp/VppBaseCallException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
 
 /**
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java b/java/jvpp-registry/io/fd/jvpp/VppCallbackException.java
index adcc5d2..2cd6a45 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java
+++ b/java/jvpp-registry/io/fd/jvpp/VppCallbackException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
 /**
  * Callback Exception representing failed operation of JVpp request call
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java b/java/jvpp-registry/io/fd/jvpp/VppConnection.java
index e6fd3bd..5d7c03a 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java
+++ b/java/jvpp-registry/io/fd/jvpp/VppConnection.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
 import java.io.IOException;
 
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java b/java/jvpp-registry/io/fd/jvpp/VppInvocationException.java
index a7ccb19..8125eb6 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java
+++ b/java/jvpp-registry/io/fd/jvpp/VppInvocationException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
 /**
  * Exception thrown when Vpp jAPI method invocation failed.
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java b/java/jvpp-registry/io/fd/jvpp/VppJNIConnection.java
index 6a414f3..ff0eb1e 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java
+++ b/java/jvpp-registry/io/fd/jvpp/VppJNIConnection.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp;
+package io.fd.jvpp;
 
-import static io.fd.vpp.jvpp.NativeLibraryLoader.loadLibrary;
+import static io.fd.jvpp.NativeLibraryLoader.loadLibrary;
 import static java.lang.String.format;
 
 import java.io.IOException;
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java b/java/jvpp-registry/io/fd/jvpp/callback/ControlPingCallback.java
index efddfdb..f2cca3c 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java
+++ b/java/jvpp-registry/io/fd/jvpp/callback/ControlPingCallback.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.callback;
+package io.fd.jvpp.callback;
 
-import io.fd.vpp.jvpp.dto.ControlPingReply;
+import io.fd.jvpp.dto.ControlPingReply;
 
 /**
  * Represents callback for control_ping message.
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java b/java/jvpp-registry/io/fd/jvpp/callback/JVppCallback.java
index ae02063..00e85c9 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java
+++ b/java/jvpp-registry/io/fd/jvpp/callback/JVppCallback.java
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.callback;
-import io.fd.vpp.jvpp.VppCallbackException;
+package io.fd.jvpp.callback;
+import io.fd.jvpp.VppCallbackException;
 
 /**
  * Base JVppCallback interface
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java b/java/jvpp-registry/io/fd/jvpp/callback/JVppNotificationCallback.java
index 8ab0cb2..7193f4d 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java
+++ b/java/jvpp-registry/io/fd/jvpp/callback/JVppNotificationCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.callback;
+package io.fd.jvpp.callback;
 
 /**
 * Notification callback
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/coverity/SuppressFBWarnings.java b/java/jvpp-registry/io/fd/jvpp/coverity/SuppressFBWarnings.java
index 1e780bb..7f9724d 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/coverity/SuppressFBWarnings.java
+++ b/java/jvpp-registry/io/fd/jvpp/coverity/SuppressFBWarnings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.coverity;
+package io.fd.jvpp.coverity;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java b/java/jvpp-registry/io/fd/jvpp/dto/ControlPing.java
index 984e167..e2a7c26 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java
+++ b/java/jvpp-registry/io/fd/jvpp/dto/ControlPing.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.dto;
+package io.fd.jvpp.dto;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.VppInvocationException;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.VppInvocationException;
 
 /**
  * Represents request DTO for control_ping message.
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java b/java/jvpp-registry/io/fd/jvpp/dto/ControlPingReply.java
index 61e4d0e..68d5a2d 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java
+++ b/java/jvpp-registry/io/fd/jvpp/dto/ControlPingReply.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.dto;
+package io.fd.jvpp.dto;
 
 import java.util.Objects;
 
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java b/java/jvpp-registry/io/fd/jvpp/dto/JVppDump.java
index 60b9898..9f8db7f 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java
+++ b/java/jvpp-registry/io/fd/jvpp/dto/JVppDump.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.dto;
+package io.fd.jvpp.dto;
 
 /**
 * Base interface for all dump requests
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java b/java/jvpp-registry/io/fd/jvpp/dto/JVppReply.java
index 73f512d..9088ade 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java
+++ b/java/jvpp-registry/io/fd/jvpp/dto/JVppReply.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.dto;
+package io.fd.jvpp.dto;
 
 /**
 * Base interface for all reply DTOs
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java b/java/jvpp-registry/io/fd/jvpp/dto/JVppReplyDump.java
index 1511139..a24b120 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java
+++ b/java/jvpp-registry/io/fd/jvpp/dto/JVppReplyDump.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.dto;
+package io.fd.jvpp.dto;
 
 /**
 * Base interface for all dump replies
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java b/java/jvpp-registry/io/fd/jvpp/dto/JVppRequest.java
index 9b301da..f82f5a3 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java
+++ b/java/jvpp-registry/io/fd/jvpp/dto/JVppRequest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.dto;
+package io.fd.jvpp.dto;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.VppInvocationException;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.VppInvocationException;
 
 /**
 * Base interface for all request DTOs
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java b/java/jvpp-registry/io/fd/jvpp/future/AbstractFutureJVppInvoker.java
index ac85f53..406ccfb 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java
+++ b/java/jvpp-registry/io/fd/jvpp/future/AbstractFutureJVppInvoker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.future;
+package io.fd.jvpp.future;
 
 
 import java.util.Map;
@@ -22,13 +22,13 @@ import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.VppInvocationException;
-import io.fd.vpp.jvpp.dto.JVppDump;
-import io.fd.vpp.jvpp.dto.JVppReply;
-import io.fd.vpp.jvpp.dto.JVppReplyDump;
-import io.fd.vpp.jvpp.dto.JVppRequest;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.VppInvocationException;
+import io.fd.jvpp.dto.JVppDump;
+import io.fd.jvpp.dto.JVppReply;
+import io.fd.jvpp.dto.JVppReplyDump;
+import io.fd.jvpp.dto.JVppRequest;
 
 /**
  * Future facade on top of JVpp
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java b/java/jvpp-registry/io/fd/jvpp/future/FutureJVppInvoker.java
index 65250ed..f421f5a 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java
+++ b/java/jvpp-registry/io/fd/jvpp/future/FutureJVppInvoker.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.future;
+package io.fd.jvpp.future;
 
 
-import io.fd.vpp.jvpp.dto.JVppReply;
-import io.fd.vpp.jvpp.dto.JVppReplyDump;
-import io.fd.vpp.jvpp.dto.JVppRequest;
+import io.fd.jvpp.dto.JVppReply;
+import io.fd.jvpp.dto.JVppReplyDump;
+import io.fd.jvpp.dto.JVppRequest;
 
 import java.util.concurrent.CompletionStage;
-import io.fd.vpp.jvpp.notification.EventRegistryProvider;
+import io.fd.jvpp.notification.EventRegistryProvider;
 
 /**
 * Future facade on top of JVpp
@@ -33,7 +33,7 @@ public interface FutureJVppInvoker extends EventRegistryProvider, AutoCloseable
      * Invoke asynchronous operation on VPP
      *
      * @return CompletionStage with future result of an async VPP call
-     * @throws io.fd.vpp.jvpp.VppInvocationException when send request failed with details
+     * @throws io.fd.jvpp.VppInvocationException when send request failed with details
      */
     <REQ extends JVppRequest, REPLY extends JVppReply<REQ>> CompletionStage<REPLY> send(REQ req);
 
@@ -42,7 +42,7 @@ public interface FutureJVppInvoker extends EventRegistryProvider, AutoCloseable
      * Invoke asynchronous dump operation on VPP
      *
      * @return CompletionStage with aggregated future result of an async VPP dump call
-     * @throws io.fd.vpp.jvpp.VppInvocationException when send request failed with details
+     * @throws io.fd.jvpp.VppInvocationException when send request failed with details
      */
     <REQ extends JVppRequest, REPLY extends JVppReply<REQ>, DUMP extends JVppReplyDump<REQ, REPLY>> CompletionStage<DUMP> send(
             REQ req, DUMP emptyReplyDump);
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistry.java b/java/jvpp-registry/io/fd/jvpp/notification/EventRegistry.java
index 12515a5..f25b038 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistry.java
+++ b/java/jvpp-registry/io/fd/jvpp/notification/EventRegistry.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.notification;
+package io.fd.jvpp.notification;
 
 /**
  * Base registry for notification callbacks.
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistryProvider.java b/java/jvpp-registry/io/fd/jvpp/notification/EventRegistryProvider.java
index 1ac5d55..a1702da 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistryProvider.java
+++ b/java/jvpp-registry/io/fd/jvpp/notification/EventRegistryProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.notification;
+package io.fd.jvpp.notification;
 
 /**
  * Provides notification registry
diff --git a/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java b/java/jvpp-registry/io/fd/jvpp/test/ConnectionTest.java
index 27b4d29..b982d11 100644
--- a/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java
+++ b/java/jvpp-registry/io/fd/jvpp/test/ConnectionTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.test;
+package io.fd.jvpp.test;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
 
 /**
  * Run using:
- * sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-16.09.jar io.fd.vpp.jvpp.test.ConnectionTest
+ * sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-16.09.jar io.fd.jvpp.test.ConnectionTest
  */
 public class ConnectionTest {
 
diff --git a/java/jvpp-registry/jvpp_registry.c b/java/jvpp-registry/jvpp_registry.c
index bbe9719..a8dfa60 100644
--- a/java/jvpp-registry/jvpp_registry.c
+++ b/java/jvpp-registry/jvpp_registry.c
@@ -22,8 +22,8 @@
 
 #include <jni.h>
 #include <jvpp-common/jvpp_common.h>
-#include "io_fd_vpp_jvpp_VppJNIConnection.h"
-#include "io_fd_vpp_jvpp_JVppRegistryImpl.h"
+#include "io_fd_jvpp_VppJNIConnection.h"
+#include "io_fd_jvpp_JVppRegistryImpl.h"
 
 #include <vpp/api/vpe_msg_enum.h>
 #define vl_typedefs             /* define message structures */
@@ -145,7 +145,7 @@ static void vl_api_control_ping_reply_t_handler(
                     rm->controlPingReplyClass, "<init>", "()V");
             jmethodID callbackMethod = (*env)->GetMethodID(env,
                     rm->registryClass, "onControlPingReply",
-                    "(Lio/fd/vpp/jvpp/dto/ControlPingReply;)V");
+                    "(Lio/fd/jvpp/dto/ControlPingReply;)V");
 
             jobject dto = (*env)->NewObject(env, rm->controlPingReplyClass,
                     constructor);
@@ -276,7 +276,7 @@ static int connect_to_vpe(char *shm_prefix, char *name) {
     return send_initial_control_ping();
 }
 
-JNIEXPORT jobject JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientConnect(
+JNIEXPORT jobject JNICALL Java_io_fd_jvpp_VppJNIConnection_clientConnect(
         JNIEnv *env, jclass obj, jstring shmPrefix, jstring clientName) {
     /*
      * TODO introducing memory prefix as variable can be used in hc2vpp
@@ -291,7 +291,7 @@ JNIEXPORT jobject JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientConnect(
     jvpp_registry_main_t * rm = &jvpp_registry_main;
 
     jclass connectionInfoClass = (*env)->FindClass(env,
-            "io/fd/vpp/jvpp/VppJNIConnection$ConnectionInfo");
+            "io/fd/jvpp/VppJNIConnection$ConnectionInfo");
     jmethodID connectionInfoConstructor = (*env)->GetMethodID(env,
             connectionInfoClass, "<init>", "(JIII)V");
 
@@ -327,7 +327,7 @@ JNIEXPORT jobject JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientConnect(
             (jint) jm->my_client_index, (jint) rv, (jint) rm->vpe_pid);
 }
 
-JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_JVppRegistryImpl_controlPing0(
+JNIEXPORT jint JNICALL Java_io_fd_jvpp_JVppRegistryImpl_controlPing0(
         JNIEnv *env, jobject regstryObject) {
     jvpp_main_t * jm = &jvpp_main;
     vl_api_control_ping_t * mp;
@@ -353,7 +353,7 @@ JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_JVppRegistryImpl_controlPing0(
     return my_context_id;
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientDisconnect(
+JNIEXPORT void JNICALL Java_io_fd_jvpp_VppJNIConnection_clientDisconnect(
         JNIEnv *env, jclass clazz) {
     jvpp_registry_main_t * rm = &jvpp_registry_main;
     rm->is_connected = 0; // TODO make thread safe
@@ -380,7 +380,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     }
 
     rm->controlPingReplyClass = (jclass) (*env)->NewGlobalRef(env,
-            (*env)->FindClass(env, "io/fd/vpp/jvpp/dto/ControlPingReply"));
+            (*env)->FindClass(env, "io/fd/jvpp/dto/ControlPingReply"));
     if ((*env)->ExceptionCheck(env)) {
         (*env)->ExceptionDescribe(env);
         clib_warning("Failed to cache class references\n");
@@ -388,7 +388,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     }
 
     rm->callbackExceptionClass = (jclass) (*env)->NewGlobalRef(env,
-            (*env)->FindClass(env, "io/fd/vpp/jvpp/VppCallbackException"));
+            (*env)->FindClass(env, "io/fd/jvpp/VppCallbackException"));
     if ((*env)->ExceptionCheck(env)) {
         (*env)->ExceptionDescribe(env);
         return JNI_ERR;
diff --git a/java/jvpp/gen/jvppgen/callback_gen.py b/java/jvpp/gen/jvppgen/callback_gen.py
index b1ad201..f1cc3a1 100755
--- a/java/jvpp/gen/jvppgen/callback_gen.py
+++ b/java/jvpp/gen/jvppgen/callback_gen.py
@@ -56,7 +56,7 @@ _CALLBACK_TEMPLATE = Template("""package $plugin_package.callback;
  * <p>Represents callback for plugin's api message.
  * <br>It was generated by jvppgen/callback_gen.py based on $json_filename.
  */
-public interface ${name}Callback extends io.fd.vpp.jvpp.callback.JVppCallback {
+public interface ${name}Callback extends io.fd.jvpp.callback.JVppCallback {
 
     void on${name}(${plugin_package}.dto.${name} reply);
 }
@@ -68,6 +68,6 @@ _GLOBAL_CALLBACK_TEMPLATE = Template("""package $plugin_package.callback;
  * <p>Global aggregated callback interface.
  * <br>It was generated by jvppgen/callback_gen.py based on $json_filename.
  */
-public interface JVpp${plugin_name}GlobalCallback extends io.fd.vpp.jvpp.callback.ControlPingCallback, $callbacks {
+public interface JVpp${plugin_name}GlobalCallback extends io.fd.jvpp.callback.ControlPingCallback, $callbacks {
 }
 """)
diff --git a/java/jvpp/gen/jvppgen/dto_gen.py b/java/jvpp/gen/jvppgen/dto_gen.py
index cbd969d..c6e20fa 100755
--- a/java/jvpp/gen/jvppgen/dto_gen.py
+++ b/java/jvpp/gen/jvppgen/dto_gen.py
@@ -74,7 +74,7 @@ package $plugin_package.dto;
 $json_definition
  * </pre>
  */
-public final class $class_name implements io.fd.vpp.jvpp.dto.$base_type {
+public final class $class_name implements io.fd.jvpp.dto.$base_type {
 $fields
 $hash_code
 $equals
@@ -94,7 +94,7 @@ def _generate_send(model, msg):
 
 _SEND_TEMPLATE = Template("""
     @Override
-    public int send(final io.fd.vpp.jvpp.JVpp jvpp) throws io.fd.vpp.jvpp.VppInvocationException {
+    public int send(final io.fd.jvpp.JVpp jvpp) throws io.fd.jvpp.VppInvocationException {
         return (($plugin_package.JVpp${plugin_name})jvpp).$method_name($args);
     }""")
 
@@ -124,7 +124,7 @@ package $plugin_package.dto;
 $json_definition
  * </pre>
  */
-public final class $class_name implements io.fd.vpp.jvpp.dto.JVppReply<$plugin_package.dto.$request_name> {
+public final class $class_name implements io.fd.jvpp.dto.JVppReply<$plugin_package.dto.$request_name> {
 $fields
 $hash_code
 $equals
@@ -192,12 +192,12 @@ package $plugin_package.dto;
 $json_definition
  * </pre>
  */
-public final class ${details_class}ReplyDump implements io.fd.vpp.jvpp.dto.JVppReplyDump<${plugin_package}.dto.${dump_class}, ${plugin_package}.dto.${details_class}> {
+public final class ${details_class}ReplyDump implements io.fd.jvpp.dto.JVppReplyDump<${plugin_package}.dto.${dump_class}, ${plugin_package}.dto.${details_class}> {
 
     public java.util.List<${details_class}> ${details_field} = new java.util.ArrayList<>();
 
     @Override
-    @io.fd.vpp.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD")
+    @io.fd.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD")
     public int hashCode() {
         return java.util.Objects.hash(${details_field});
     }
diff --git a/java/jvpp/gen/jvppgen/jni_gen.py b/java/jvpp/gen/jvppgen/jni_gen.py
index ad6c261..d73f7bf 100755
--- a/java/jvpp/gen/jvppgen/jni_gen.py
+++ b/java/jvpp/gen/jvppgen/jni_gen.py
@@ -65,10 +65,10 @@ def _generate_class_cache(plugin_name, messages):
             continue
         references.append((
             msg.java_name_lower,
-            'io/fd/vpp/jvpp/%s/dto/%s' % (plugin_name, msg.java_name_upper)
+            'io/fd/jvpp/%s/dto/%s' % (plugin_name, msg.java_name_upper)
         ))
 
-    references.append(('callbackException', 'io/fd/vpp/jvpp/VppCallbackException'))
+    references.append(('callbackException', 'io/fd/jvpp/VppCallbackException'))
 
     return _CLASS_CACHE_TEMPLATE.substitute(
         class_references=_generate_class_references(references),
diff --git a/java/jvpp/gen/jvppgen/jni_impl_gen.py b/java/jvpp/gen/jvppgen/jni_impl_gen.py
index ef1bcbb..e53e5de 100755
--- a/java/jvpp/gen/jvppgen/jni_impl_gen.py
+++ b/java/jvpp/gen/jvppgen/jni_impl_gen.py
@@ -68,7 +68,7 @@ _JNI_IMPL_TEMPLATE = Template("""
  * Generated based on $json_filename:
 $json_definition
  */
-JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_${plugin_name}_JVpp${plugin_java_name}Impl_${java_method_name}0
+JNIEXPORT jint JNICALL Java_io_fd_jvpp_${plugin_name}_JVpp${plugin_java_name}Impl_${java_method_name}0
 (JNIEnv * env, jclass clazz${arguments}) {
     ${plugin_name}_main_t *plugin_main = &${plugin_name}_main;
     vl_api_${c_name}_t * mp;
@@ -98,7 +98,7 @@ $msg_initialization
 
 # TODO: cache method and field identifiers to achieve better performance
 # https://jira.fd.io/browse/HONEYCOMB-42
-_REQUEST_CLASS_TEMPLATE = Template("""    jclass requestClass = (*env)->FindClass(env, "io/fd/vpp/jvpp/${plugin_name}/dto/${java_dto_name}");
+_REQUEST_CLASS_TEMPLATE = Template("""    jclass requestClass = (*env)->FindClass(env, "io/fd/jvpp/${plugin_name}/dto/${java_dto_name}");
 """)
 
 
diff --git a/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py b/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py
index ccd3dbc..e223526 100755
--- a/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py
+++ b/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py
@@ -67,7 +67,7 @@ $err_handler
     // User does not have to provide callbacks for all VPP messages.
     // We are ignoring messages that are not supported by user.
     (*env)->ExceptionClear(env); // just in case exception occurred in different place and was not properly cleared
-    jmethodID callbackMethod = (*env)->GetMethodID(env, plugin_main->callbackClass, "on${dto_name}", "(Lio/fd/vpp/jvpp/${plugin_name}/dto/${dto_name};)V");
+    jmethodID callbackMethod = (*env)->GetMethodID(env, plugin_main->callbackClass, "on${dto_name}", "(Lio/fd/jvpp/${plugin_name}/dto/${dto_name};)V");
     exc = (*env)->ExceptionOccurred(env);
     if (exc) {
         clib_warning("Unable to extract on${dto_name} method reference from ${plugin_name} plugin's callbackClass. Ignoring message.\\n");
diff --git a/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py b/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
index ebc552b..d41080d 100644
--- a/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
+++ b/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
@@ -41,7 +41,7 @@ package $plugin_package.callfacade;
  * <p>Callback Java API representation of $plugin_package plugin.
  * <br>It was generated by jvpp_callback_facade_gen.py based on $json_filename.
  */
-public interface CallbackJVpp${plugin_name} extends io.fd.vpp.jvpp.notification.EventRegistryProvider, java.lang.AutoCloseable {
+public interface CallbackJVpp${plugin_name} extends io.fd.jvpp.notification.EventRegistryProvider, java.lang.AutoCloseable {
 
     // TODO add send
 
@@ -72,10 +72,10 @@ def _generate_ifc_methods(model):
     return "\n".join(methods)
 
 _IFC_NO_ARG_METHOD_TEMPLATE = Template(
-    """    void $name($plugin_package.callback.${reply}Callback callback) throws io.fd.vpp.jvpp.VppInvocationException;""")
+    """    void $name($plugin_package.callback.${reply}Callback callback) throws io.fd.jvpp.VppInvocationException;""")
 
 _IFC_METHOD_TEMPLATE = Template(
-    """    void $name($plugin_package.dto.$request request, $plugin_package.callback.${reply}Callback callback) throws io.fd.vpp.jvpp.VppInvocationException;""")
+    """    void $name($plugin_package.dto.$request request, $plugin_package.callback.${reply}Callback callback) throws io.fd.jvpp.VppInvocationException;""")
 
 
 def _generate_impl(work_dir, model):
@@ -97,18 +97,18 @@ package $plugin_package.callfacade;
 public final class CallbackJVpp${plugin_name}Facade implements CallbackJVpp${plugin_name} {
 
     private final $plugin_package.JVpp${plugin_name} jvpp;
-    private final java.util.Map<Integer, io.fd.vpp.jvpp.callback.JVppCallback> callbacks;
+    private final java.util.Map<Integer, io.fd.jvpp.callback.JVppCallback> callbacks;
     private final $plugin_package.notification.${plugin_name}EventRegistryImpl eventRegistry = new $plugin_package.notification.${plugin_name}EventRegistryImpl();
     /**
      * <p>Create CallbackJVpp${plugin_name}Facade object for provided JVpp instance.
      * Constructor internally creates CallbackJVppFacadeCallback class for processing callbacks
      * and then connects to provided JVpp instance
      *
-     * @param jvpp provided io.fd.vpp.jvpp.JVpp instance
+     * @param jvpp provided io.fd.jvpp.JVpp instance
      *
      * @throws java.io.IOException in case instance cannot connect to JVPP
      */
-    public CallbackJVpp${plugin_name}Facade(final io.fd.vpp.jvpp.JVppRegistry registry, final $plugin_package.JVpp${plugin_name} jvpp) throws java.io.IOException {
+    public CallbackJVpp${plugin_name}Facade(final io.fd.jvpp.JVppRegistry registry, final $plugin_package.JVpp${plugin_name} jvpp) throws java.io.IOException {
         this.jvpp = java.util.Objects.requireNonNull(jvpp,"jvpp is null");
         this.callbacks = new java.util.HashMap<>();
         java.util.Objects.requireNonNull(registry, "JVppRegistry should not be null");
@@ -154,14 +154,14 @@ def _generate_impl_methods(model):
     return "\n".join(methods)
 
 _IMPL_NO_ARG_METHOD_TEMPLATE = Template(
-    """    public final void $name($plugin_package.callback.${reply}Callback callback) throws io.fd.vpp.jvpp.VppInvocationException {
+    """    public final void $name($plugin_package.callback.${reply}Callback callback) throws io.fd.jvpp.VppInvocationException {
         synchronized (callbacks) {
             callbacks.put(jvpp.$name(), callback);
         }
     }
 """)
 
-_IMPL_METHOD_TEMPLATE = Template("""    public final void $name($plugin_package.dto.$request request, $plugin_package.callback.${reply}Callback callback) throws io.fd.vpp.jvpp.VppInvocationException {
+_IMPL_METHOD_TEMPLATE = Template("""    public final void $name($plugin_package.dto.$request request, $plugin_package.callback.${reply}Callback callback) throws io.fd.jvpp.VppInvocationException {
         synchronized (callbacks) {
             callbacks.put(jvpp.$name(request), callback);
         }
@@ -187,20 +187,20 @@ package $plugin_package.callfacade;
  */
 public final class CallbackJVpp${plugin_name}FacadeCallback implements $plugin_package.callback.JVpp${plugin_name}GlobalCallback {
 
-    private final java.util.Map<Integer, io.fd.vpp.jvpp.callback.JVppCallback> requests;
+    private final java.util.Map<Integer, io.fd.jvpp.callback.JVppCallback> requests;
     private final $plugin_package.notification.Global${plugin_name}EventCallback eventCallback;
     private static final java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(CallbackJVpp${plugin_name}FacadeCallback.class.getName());
 
-    public CallbackJVpp${plugin_name}FacadeCallback(final java.util.Map<Integer, io.fd.vpp.jvpp.callback.JVppCallback> requestMap,
+    public CallbackJVpp${plugin_name}FacadeCallback(final java.util.Map<Integer, io.fd.jvpp.callback.JVppCallback> requestMap,
                                       final $plugin_package.notification.Global${plugin_name}EventCallback eventCallback) {
         this.requests = requestMap;
         this.eventCallback = eventCallback;
     }
 
     @Override
-    public void onError(io.fd.vpp.jvpp.VppCallbackException reply) {
+    public void onError(io.fd.jvpp.VppCallbackException reply) {
 
-        io.fd.vpp.jvpp.callback.JVppCallback failedCall;
+        io.fd.jvpp.callback.JVppCallback failedCall;
         synchronized(requests) {
             failedCall = requests.remove(reply.getCtxId());
         }
@@ -217,12 +217,12 @@ public final class CallbackJVpp${plugin_name}FacadeCallback implements $plugin_p
 
     @Override
     @SuppressWarnings("unchecked")
-    public void onControlPingReply(final io.fd.vpp.jvpp.dto.ControlPingReply reply) {
+    public void onControlPingReply(final io.fd.jvpp.dto.ControlPingReply reply) {
 
-        io.fd.vpp.jvpp.callback.ControlPingCallback callback;
+        io.fd.jvpp.callback.ControlPingCallback callback;
         final int replyId = reply.context;
         synchronized(requests) {
-            callback = (io.fd.vpp.jvpp.callback.ControlPingCallback) requests.remove(replyId);
+            callback = (io.fd.jvpp.callback.ControlPingCallback) requests.remove(replyId);
         }
 
         if(callback != null) {
diff --git a/java/jvpp/gen/jvppgen/jvpp_common_gen.py b/java/jvpp/gen/jvppgen/jvpp_common_gen.py
index 499adbc..430c927 100755
--- a/java/jvpp/gen/jvppgen/jvpp_common_gen.py
+++ b/java/jvpp/gen/jvppgen/jvpp_common_gen.py
@@ -32,14 +32,14 @@ def generate_hash_code(fields):
 
 _HASH_CODE_TEMPLATE = Template("""
     @Override
-    @io.fd.vpp.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD")
+    @io.fd.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD")
     public int hashCode() {
         return java.util.Objects.hash($fields);
     }""")
 
 _HASH_CODE_SINGLE_ARRAY_TEMPLATE = Template("""
     @Override
-    @io.fd.vpp.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD")
+    @io.fd.jvpp.coverity.SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD")
     public int hashCode() {
         return java.util.Arrays.hashCode($array_field);
     }""")
diff --git a/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py b/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
index 3da367a..7585906 100644
--- a/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
+++ b/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
@@ -40,7 +40,7 @@ package $plugin_package.future;
  * <p>Async facade extension adding specific methods for each request invocation
  * <br>It was generated by jvpp_future_facade_gen.py based on $json_filename.
  */
-public interface FutureJVpp${plugin_name} extends io.fd.vpp.jvpp.future.FutureJVppInvoker {
+public interface FutureJVpp${plugin_name} extends io.fd.jvpp.future.FutureJVppInvoker {
 $methods
 
     @Override
@@ -94,7 +94,7 @@ package $plugin_package.future;
  * <p>Implementation of FutureJVpp based on AbstractFutureJVppInvoker
  * <br>It was generated by jvpp_future_facade_gen.py based on $json_filename.
  */
-public class FutureJVpp${plugin_name}Facade extends io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker implements FutureJVpp${plugin_name} {
+public class FutureJVpp${plugin_name}Facade extends io.fd.jvpp.future.AbstractFutureJVppInvoker implements FutureJVpp${plugin_name} {
 
     private final $plugin_package.notification.${plugin_name}EventRegistryImpl eventRegistry = new $plugin_package.notification.${plugin_name}EventRegistryImpl();
 
@@ -103,11 +103,11 @@ public class FutureJVpp${plugin_name}Facade extends io.fd.vpp.jvpp.future.Abstra
      * Constructor internally creates FutureJVppFacadeCallback class for processing callbacks
      * and then connects to provided JVpp instance
      *
-     * @param jvpp provided io.fd.vpp.jvpp.JVpp instance
+     * @param jvpp provided io.fd.jvpp.JVpp instance
      *
      * @throws java.io.IOException in case instance cannot connect to JVPP
      */
-    public FutureJVpp${plugin_name}Facade(final io.fd.vpp.jvpp.JVppRegistry registry, final io.fd.vpp.jvpp.JVpp jvpp) throws java.io.IOException {
+    public FutureJVpp${plugin_name}Facade(final io.fd.jvpp.JVppRegistry registry, final io.fd.jvpp.JVpp jvpp) throws java.io.IOException {
         super(jvpp, registry, new java.util.HashMap<>());
         java.util.Objects.requireNonNull(registry, "JVppRegistry should not be null");
         registry.register(jvpp, new FutureJVpp${plugin_name}FacadeCallback(getRequests(), eventRegistry));
@@ -178,12 +178,12 @@ package $plugin_package.future;
  */
 public final class FutureJVpp${plugin_name}FacadeCallback implements $plugin_package.callback.JVpp${plugin_name}GlobalCallback {
 
-    private final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends io.fd.vpp.jvpp.dto.JVppReply<?>>> requests;
+    private final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends io.fd.jvpp.dto.JVppReply<?>>> requests;
     private final $plugin_package.notification.Global${plugin_name}EventCallback notificationCallback;
     private static final java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(FutureJVpp${plugin_name}FacadeCallback.class.getName());
 
     public FutureJVpp${plugin_name}FacadeCallback(
-        final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends io.fd.vpp.jvpp.dto.JVppReply<?>>> requestMap,
+        final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends io.fd.jvpp.dto.JVppReply<?>>> requestMap,
         final $plugin_package.notification.Global${plugin_name}EventCallback notificationCallback) {
         this.requests = requestMap;
         this.notificationCallback = notificationCallback;
@@ -191,11 +191,11 @@ public final class FutureJVpp${plugin_name}FacadeCallback implements $plugin_pac
 
     @Override
     @SuppressWarnings("unchecked")
-    public void onError(io.fd.vpp.jvpp.VppCallbackException reply) {
-        final java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<?>> completableFuture;
+    public void onError(io.fd.jvpp.VppCallbackException reply) {
+        final java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<?>> completableFuture;
 
         synchronized(requests) {
-            completableFuture = (java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<?>>) requests.get(reply.getCtxId());
+            completableFuture = (java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<?>>) requests.get(reply.getCtxId());
         }
 
         if(completableFuture != null) {
@@ -209,19 +209,19 @@ public final class FutureJVpp${plugin_name}FacadeCallback implements $plugin_pac
 
     @Override
     @SuppressWarnings("unchecked")
-    public void onControlPingReply(final io.fd.vpp.jvpp.dto.ControlPingReply reply) {
-        java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<?>> completableFuture;
+    public void onControlPingReply(final io.fd.jvpp.dto.ControlPingReply reply) {
+        java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<?>> completableFuture;
 
         final int replyId = reply.context;
         synchronized(requests) {
-            completableFuture = (java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<?>>) requests.get(replyId);
+            completableFuture = (java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<?>>) requests.get(replyId);
 
             if(completableFuture != null) {
                 // Finish dump call
-                if (completableFuture instanceof io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) {
-                    completableFuture.complete(((io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getReplyDump());
+                if (completableFuture instanceof io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) {
+                    completableFuture.complete(((io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getReplyDump());
                     // Remove future mapped to dump call context id
-                    requests.remove(((io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getContextId());
+                    requests.remove(((io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getContextId());
                 } else {
                     // reply to regular control ping, complete the future
                     completableFuture.complete(reply);
@@ -277,19 +277,19 @@ _FUTURE_JVPP_FACADE_DETAILS_CALLBACK_TEMPLATE = Template("""
     @Override
     @SuppressWarnings("unchecked")
     public void on$callback_dto(final $plugin_package.dto.$callback_dto reply) {
-        io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.dto.${callback_dto}ReplyDump> completableFuture;
+        io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.dto.${callback_dto}ReplyDump> completableFuture;
         final int replyId = reply.context;
         if (LOG.isLoggable(java.util.logging.Level.FINE)) {
             LOG.fine(java.lang.String.format("Received $callback_dto event message: %s", reply));
         }
         synchronized(requests) {
-            completableFuture = (io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.dto.${callback_dto}ReplyDump>) requests.get(replyId);
+            completableFuture = (io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.dto.${callback_dto}ReplyDump>) requests.get(replyId);
 
             if(completableFuture == null) {
                 // reply received before writer created future,
                 // create new future, and put into map to notify sender that reply is already received,
                 // following details replies will add information to this future
-                completableFuture = new io.fd.vpp.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<>(replyId,
+                completableFuture = new io.fd.jvpp.future.AbstractFutureJVppInvoker.CompletableDumpFuture<>(replyId,
                     new $plugin_package.dto.${callback_dto}ReplyDump());
                 requests.put(replyId, completableFuture);
             }
@@ -302,14 +302,14 @@ _FUTURE_JVPP_FACADE_REPLY_CALLBACK_TEMPLATE = Template("""
     @Override
     @SuppressWarnings("unchecked")
     public void on$callback_dto(final $plugin_package.dto.$callback_dto reply) {
-        java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<$plugin_package.dto.$request_dto>> completableFuture;
+        java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<$plugin_package.dto.$request_dto>> completableFuture;
         final int replyId = reply.context;
         if (LOG.isLoggable(java.util.logging.Level.FINE)) {
             LOG.fine(java.lang.String.format("Received $callback_dto event message: %s", reply));
         }
         synchronized(requests) {
             completableFuture =
-            (java.util.concurrent.CompletableFuture<io.fd.vpp.jvpp.dto.JVppReply<$plugin_package.dto.$request_dto>>) requests.get(replyId);
+            (java.util.concurrent.CompletableFuture<io.fd.jvpp.dto.JVppReply<$plugin_package.dto.$request_dto>>) requests.get(replyId);
 
             if(completableFuture != null) {
                 // received reply on request, complete future created by sender and remove it from map
diff --git a/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py b/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py
index e2b2922..8350bbe 100755
--- a/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py
+++ b/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py
@@ -48,9 +48,9 @@ def _jvpp_ifc_filter(msg):
 
 
 _JVPP_IFC_METHOD_TEMPLATE = Template(
-    """    int $name($plugin_package.dto.$type request) throws io.fd.vpp.jvpp.VppInvocationException;""")
+    """    int $name($plugin_package.dto.$type request) throws io.fd.jvpp.VppInvocationException;""")
 
-_JVPP_IFC_NO_ARG_METHOD_TEMPLATE = Template("""    int $name() throws io.fd.vpp.jvpp.VppInvocationException;""")
+_JVPP_IFC_NO_ARG_METHOD_TEMPLATE = Template("""    int $name() throws io.fd.jvpp.VppInvocationException;""")
 
 _JVPP_IFC_TEMPLATE = Template("""package $plugin_package;
 
@@ -59,13 +59,13 @@ _JVPP_IFC_TEMPLATE = Template("""package $plugin_package;
  * <br>It was generated by jvpp_impl_gen.py based on $json_filename.
  * <br>(python representation of api file generated by vppapigen)
  */
-public interface JVpp${plugin_name} extends io.fd.vpp.jvpp.JVpp {
+public interface JVpp${plugin_name} extends io.fd.jvpp.JVpp {
     /**
      * Generic dispatch method for sending requests to VPP
      *
-     * @throws io.fd.vpp.jvpp.VppInvocationException if send request had failed
+     * @throws io.fd.jvpp.VppInvocationException if send request had failed
      */
-    int send(io.fd.vpp.jvpp.dto.JVppRequest request) throws io.fd.vpp.jvpp.VppInvocationException;
+    int send(io.fd.jvpp.dto.JVppRequest request) throws io.fd.jvpp.VppInvocationException;
 $methods
 }
 """)
diff --git a/java/jvpp/gen/jvppgen/jvpp_impl_gen.py b/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
index 376952b..f646efa 100755
--- a/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
+++ b/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
@@ -62,9 +62,9 @@ import java.nio.file.attribute.PosixFilePermissions;
 import java.util.Set;
 import java.util.logging.Logger;
 import java.util.logging.Level;
-import io.fd.vpp.jvpp.callback.JVppCallback;
-import io.fd.vpp.jvpp.VppConnection;
-import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.jvpp.callback.JVppCallback;
+import io.fd.jvpp.VppConnection;
+import io.fd.jvpp.JVppRegistry;
 
 /**
  * <p>Default implementation of JVpp interface.
@@ -133,12 +133,12 @@ public final class JVpp${plugin_name}Impl implements $plugin_package.JVpp${plugi
     }
 
     @Override
-    public int send(io.fd.vpp.jvpp.dto.JVppRequest request) throws io.fd.vpp.jvpp.VppInvocationException {
+    public int send(io.fd.jvpp.dto.JVppRequest request) throws io.fd.jvpp.VppInvocationException {
         return request.send(this);
     }
 
     @Override
-    public final int controlPing(final io.fd.vpp.jvpp.dto.ControlPing controlPing) throws io.fd.vpp.jvpp.VppInvocationException {
+    public final int controlPing(final io.fd.jvpp.dto.ControlPing controlPing) throws io.fd.jvpp.VppInvocationException {
         return registry.controlPing(JVpp${plugin_name}Impl.class);
     }
 $methods
@@ -147,7 +147,7 @@ $methods
 
 _JVPP_IMPL_METHOD_TEMPLATE = Template("""
     private static native int ${name}0($plugin_package.dto.$type request);
-    public final int $name($plugin_package.dto.$type request) throws io.fd.vpp.jvpp.VppInvocationException {
+    public final int $name($plugin_package.dto.$type request) throws io.fd.jvpp.VppInvocationException {
         java.util.Objects.requireNonNull(request, "Null request object");
         connection.checkActive();
         if (LOG.isLoggable(Level.FINE)) {
@@ -155,19 +155,19 @@ _JVPP_IMPL_METHOD_TEMPLATE = Template("""
         }
         int result=${name}0(request);
         if (result<0){
-            throw new io.fd.vpp.jvpp.VppInvocationException("${name}", result);
+            throw new io.fd.jvpp.VppInvocationException("${name}", result);
         }
         return result;
     }""")
 
 _JVPP_IMPL_NO_ARG_METHOD_TEMPLATE = Template("""
-    private static native int ${name}0() throws io.fd.vpp.jvpp.VppInvocationException;
-    public final int $name() throws io.fd.vpp.jvpp.VppInvocationException {
+    private static native int ${name}0() throws io.fd.jvpp.VppInvocationException;
+    public final int $name() throws io.fd.jvpp.VppInvocationException {
         connection.checkActive();
         LOG.fine("Sending $type event message");
         int result=${name}0();
         if(result<0){
-            throw new io.fd.vpp.jvpp.VppInvocationException("${name}", result);
+            throw new io.fd.jvpp.VppInvocationException("${name}", result);
         }
         return result;
     }""")
diff --git a/java/jvpp/gen/jvppgen/jvpp_model.py b/java/jvpp/gen/jvppgen/jvpp_model.py
index c5a7e74..6c599c0 100755
--- a/java/jvpp/gen/jvppgen/jvpp_model.py
+++ b/java/jvpp/gen/jvppgen/jvpp_model.py
@@ -19,7 +19,7 @@ from collections import OrderedDict
 
 import binascii
 
-BASE_PACKAGE = "io.fd.vpp.jvpp"
+BASE_PACKAGE = "io.fd.jvpp"
 
 
 class ParseException(Exception):
@@ -34,8 +34,8 @@ class Type(object):
 
         :param name: name of type as defined in .api file, e.g. u8, u32[] or mac_entry
         :param java_name: corresponding java name, e.g. byte, int[] or MacEntry
-        :param java_name_fqn: fully qualified java name, e.g. io.fd.vpp.jvpp.core.types.MacEntry
-        :param jni_signature: JNI Type signature, e.g. B, [I or Lio.fd.vpp.jvpp.core.types.MacEntry;
+        :param java_name_fqn: fully qualified java name, e.g. io.fd.jvpp.core.types.MacEntry
+        :param jni_signature: JNI Type signature, e.g. B, [I or Lio.fd.jvpp.core.types.MacEntry;
                               See https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/types.html#type_signatures
         :param jni_type: JNI reference type, e.g. jbyte jintArray, jobject
                          See https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/types.html#reference_types
@@ -121,8 +121,8 @@ class Enum(Type):
         super(Enum, self).__init__(
             name=name,
             java_name=_java_name,
-            java_name_fqn="io.fd.vpp.jvpp.%s.types.%s" % (plugin_name, _java_name),
-            jni_signature="Lio/fd/vpp/jvpp/%s/types/%s;" % (plugin_name, _java_name),
+            java_name_fqn="io.fd.jvpp.%s.types.%s" % (plugin_name, _java_name),
+            jni_signature="Lio/fd/jvpp/%s/types/%s;" % (plugin_name, _java_name),
             jni_type="jobject",
             jni_accessor="Object",
             host_to_net_function="_host_to_net_%s" % name,
@@ -136,7 +136,7 @@ class Enum(Type):
         self.vpp_name = "%s%s%s" % (_VPP_TYPE_PREFIX, name, _VPP_TYPE_SUFFIX)
         # Fully qualified class name used by FindClass function, see:
         # https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#FindClass
-        self.jni_name = "io/fd/vpp/jvpp/%s/types/%s" % (plugin_name, _java_name)
+        self.jni_name = "io/fd/jvpp/%s/types/%s" % (plugin_name, _java_name)
 
     def get_host_to_net_function(self, host_ref_name, net_ref_name):
         return "_host_to_net_%s(env, %s, &(%s))" % (self.name, host_ref_name, net_ref_name)
@@ -149,8 +149,8 @@ class EnumSet(Type):
         super(EnumSet, self).__init__(
             name=name,
             java_name=_java_name,
-            java_name_fqn="io.fd.vpp.jvpp.%s.types.%s" % (plugin_name, _java_name),
-            jni_signature="Lio/fd/vpp/jvpp/%s/types/%s;" % (plugin_name, _java_name),
+            java_name_fqn="io.fd.jvpp.%s.types.%s" % (plugin_name, _java_name),
+            jni_signature="Lio/fd/jvpp/%s/types/%s;" % (plugin_name, _java_name),
             jni_type="jobject",
             jni_accessor="Object",
             host_to_net_function="_host_to_net_%s" % name,
@@ -164,7 +164,7 @@ class EnumSet(Type):
         self.vpp_name = "%s%s%s" % (_VPP_TYPE_PREFIX, name, _VPP_TYPE_SUFFIX)
         # Fully qualified class name used by FindClass function, see:
         # https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#FindClass
-        self.jni_name = "io/fd/vpp/jvpp/%s/types/%s" % (plugin_name, _java_name)
+        self.jni_name = "io/fd/jvpp/%s/types/%s" % (plugin_name, _java_name)
 
     def get_host_to_net_function(self, host_ref_name, net_ref_name):
         return "_host_to_net_%s(env, %s, &(%s))" % (self.name, host_ref_name, net_ref_name)
@@ -177,8 +177,8 @@ class Class(Type):
         super(Class, self).__init__(
             name=name,
             java_name=_java_name,
-            java_name_fqn="io.fd.vpp.jvpp.%s.types.%s" % (plugin_name, _java_name),
-            jni_signature="Lio/fd/vpp/jvpp/%s/types/%s;" % (plugin_name, _java_name),
+            java_name_fqn="io.fd.jvpp.%s.types.%s" % (plugin_name, _java_name),
+            jni_signature="Lio/fd/jvpp/%s/types/%s;" % (plugin_name, _java_name),
             jni_type="jobject",
             jni_accessor="Object",
             host_to_net_function="_host_to_net_%s" % name,
@@ -192,7 +192,7 @@ class Class(Type):
         self.vpp_name = "%s%s%s" % (_VPP_TYPE_PREFIX, name, _VPP_TYPE_SUFFIX)
         # Fully qualified class name used by FindClass function, see:
         # https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#FindClass
-        self.jni_name = "io/fd/vpp/jvpp/%s/types/%s" % (plugin_name, _java_name)
+        self.jni_name = "io/fd/jvpp/%s/types/%s" % (plugin_name, _java_name)
 
     def get_host_to_net_function(self, host_ref_name, net_ref_name):
         return "_host_to_net_%s(env, %s, &(%s))" % (self.name, host_ref_name, net_ref_name)
@@ -205,8 +205,8 @@ class Union(Type):
         super(Union, self).__init__(
             name=name,
             java_name=_java_name,
-            java_name_fqn="io.fd.vpp.jvpp.%s.types.%s" % (plugin_name, _java_name),
-            jni_signature="Lio/fd/vpp/jvpp/%s/types/%s;" % (plugin_name, _java_name),
+            java_name_fqn="io.fd.jvpp.%s.types.%s" % (plugin_name, _java_name),
+            jni_signature="Lio/fd/jvpp/%s/types/%s;" % (plugin_name, _java_name),
             jni_type="jobject",
             jni_accessor="Object",
             host_to_net_function="_host_to_net_%s" % name,
@@ -220,7 +220,7 @@ class Union(Type):
         self.vpp_name = "%s%s%s" % (_VPP_TYPE_PREFIX, name, _VPP_TYPE_SUFFIX)
         # Fully qualified class name used by FindClass function, see:
         # https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#FindClass
-        self.jni_name = "io/fd/vpp/jvpp/%s/types/%s" % (plugin_name, _java_name)
+        self.jni_name = "io/fd/jvpp/%s/types/%s" % (plugin_name, _java_name)
 
     def get_host_to_net_function(self, host_ref_name, net_ref_name):
         return "_host_to_net_%s(env, %s, &(%s))" % (self.name, host_ref_name, net_ref_name)
diff --git a/java/jvpp/gen/jvppgen/notification_gen.py b/java/jvpp/gen/jvppgen/notification_gen.py
index fa86fe4..d2bb729 100644
--- a/java/jvpp/gen/jvppgen/notification_gen.py
+++ b/java/jvpp/gen/jvppgen/notification_gen.py
@@ -63,7 +63,7 @@ package $plugin_package.notification;
  * <p>Registry for notification callbacks defined in ${plugin_name}.
  * <br>It was generated by notification_gen.py based on $json_filename.
  */
-public interface ${plugin_name}EventRegistry extends io.fd.vpp.jvpp.notification.EventRegistry {
+public interface ${plugin_name}EventRegistry extends io.fd.jvpp.notification.EventRegistry {
 
 $register_callback_methods
 
@@ -119,7 +119,7 @@ _HANDLER_IMPL_TEMPLATE = Template("""
         if (LOG.isLoggable(java.util.logging.Level.FINE)) {
             LOG.fine(java.lang.String.format("Received $notification event message: %s", notification));
         }
-        final io.fd.vpp.jvpp.callback.JVppCallback jVppCallback = registeredCallbacks.get($plugin_package.dto.$notification.class);
+        final io.fd.jvpp.callback.JVppCallback jVppCallback = registeredCallbacks.get($plugin_package.dto.$notification.class);
         if (null != jVppCallback) {
             (($plugin_package.callback.$callback) registeredCallbacks
                 .get($plugin_package.dto.$notification.class))
@@ -138,7 +138,7 @@ package $plugin_package.notification;
 public final class ${plugin_name}EventRegistryImpl implements ${plugin_name}EventRegistry, Global${plugin_name}EventCallback {
 
     // TODO add a special NotificationCallback interface and only allow those to be registered
-    private final java.util.concurrent.ConcurrentMap<Class<?>, io.fd.vpp.jvpp.callback.JVppCallback> registeredCallbacks =
+    private final java.util.concurrent.ConcurrentMap<Class<?>, io.fd.jvpp.callback.JVppCallback> registeredCallbacks =
         new java.util.concurrent.ConcurrentHashMap<>();
     private static java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(${plugin_name}EventRegistryImpl.class.getName());
 
@@ -151,7 +151,7 @@ public final class ${plugin_name}EventRegistryImpl implements ${plugin_name}Even
     }
 
     @Override
-    public void onError(io.fd.vpp.jvpp.VppCallbackException ex) {
+    public void onError(io.fd.jvpp.VppCallbackException ex) {
         java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(${plugin_name}EventRegistryImpl.class.getName());
         LOG.log(java.util.logging.Level.WARNING, java.lang.String.format("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(),
             ex.getCtxId(), ex.getErrorCode()), ex);
@@ -210,7 +210,7 @@ package $plugin_package.notification;
  * Provides ${plugin_name}EventRegistry.
  * <br>The file was generated by notification_gen.py based on $json_filename.
  */
-public interface ${plugin_name}EventRegistryProvider extends io.fd.vpp.jvpp.notification.EventRegistryProvider {
+public interface ${plugin_name}EventRegistryProvider extends io.fd.jvpp.notification.EventRegistryProvider {
 
     @Override
     public ${plugin_name}EventRegistry getEventRegistry();