16 files changed, 23 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac
index 0cd96b9d5..12335cffa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,7 +327,7 @@ AC_CONFIG_FILES([Makefile
 		 helper/Makefile
 		 helper/test/Makefile
 		 pkgconfig/libodp-dpdk.pc
-		 pkgconfig/libodphelper-linux.pc
+		 pkgconfig/libodphelper-dpdk.pc
 		 scripts/Makefile
 		 ])
 
diff --git a/example/Makefile.inc b/example/Makefile.inc
index f3674a750..a22ea5a4f 100644
--- a/example/Makefile.inc
+++ b/example/Makefile.inc
@@ -1,6 +1,6 @@
 include $(top_srcdir)/platform/@with_platform@/Makefile.inc
 LIB   = $(top_builddir)/lib
-LDADD = $(LIB)/libodp-dpdk.la $(LIB)/libodphelper-linux.la
+LDADD = $(LIB)/libodp-dpdk.la $(LIB)/libodphelper-dpdk.la
 AM_CFLAGS += \
 	-I$(srcdir) \
 	-I$(top_srcdir)/example \
diff --git a/helper/Makefile.am b/helper/Makefile.am
index 8a86eb719..99188b01a 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/platform/@with_platform@/Makefile.inc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper-linux.pc
+pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper-dpdk.pc
 
 LIB   = $(top_builddir)/lib
 AM_CFLAGS  = -I$(srcdir)/include
@@ -29,11 +29,11 @@ noinst_HEADERS = \
 		 $(srcdir)/odph_lineartable.h \
 		 $(srcdir)/odph_list_internal.h
 
-__LIB__libodphelper_linux_la_SOURCES = \
+__LIB__libodphelper_dpdk_la_SOURCES = \
 					eth.c \
 					ip.c \
 					linux.c \
 					hashtable.c \
 					lineartable.c
 
-lib_LTLIBRARIES = $(LIB)/libodphelper-linux.la
+lib_LTLIBRARIES = $(LIB)/libodphelper-dpdk.la
diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am
index 12cf97ec8..23d0d1651 100644
--- a/helper/test/Makefile.am
+++ b/helper/test/Makefile.am
@@ -26,8 +26,8 @@ bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
 
 dist_chksum_SOURCES = chksum.c
 dist_thread_SOURCES = thread.c
-thread_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
+thread_LDADD = $(LIB)/libodphelper-dpdk.la $(LIB)/libodp-dpdk.la
 dist_process_SOURCES = process.c
 dist_parse_SOURCES = parse.c
-process_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
+process_LDADD = $(LIB)/libodphelper-dpdk.la $(LIB)/libodp-dpdk.la
 dist_table_SOURCES = table.c
diff --git a/pkg/debian/control b/pkg/debian/control
index 1d0461204..1ed72d9e3 100644
--- a/pkg/debian/control
+++ b/pkg/debian/control
@@ -43,26 +43,26 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Library for OpenDataPlane
  This is the OpenDataPlane library from the reference implementation.
 
-Package: libodphelper-linux-dbg
+Package: libodphelper-dpdk-dbg
 Priority: extra
 Section: debug
 Architecture: any
 Multi-Arch: same
-Depends: libodphelper-linux (= ${binary:Version}), ${misc:Depends}
+Depends: libodphelper-dpdk (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for OpenDataPlane
  This is the OpenDataPlane helper library from the reference implementation
  with debug turned on.
 
-Package: libodphelper-linux-dev
+Package: libodphelper-dpdk-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libodphelper-linux (= ${binary:Version}), libodp-dpdk-dev,
+Depends: libodphelper-dpdk (= ${binary:Version}), libodp-dpdk-dev,
     ${misc:Depends}, ${shlibs:Depends}, libssl-dev
 Description: Helper development files for OpenDataPlane
  These are the helper source file for the OpenDataPlane reference implementation.
 
-Package: libodphelper-linux
+Package: libodphelper-dpdk
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/pkg/debian/libodphelper-linux-dev.dirs b/pkg/debian/libodphelper-dpdk-dev.dirs
index 44188162e..44188162e 100644
--- a/pkg/debian/libodphelper-linux-dev.dirs
+++ b/pkg/debian/libodphelper-dpdk-dev.dirs
diff --git a/pkg/debian/libodphelper-dpdk-dev.install b/pkg/debian/libodphelper-dpdk-dev.install
new file mode 100644
index 000000000..094b0d7cc
--- /dev/null
+++ b/pkg/debian/libodphelper-dpdk-dev.install
@@ -0,0 +1,4 @@
+usr/include/odp/helper/*
+usr/lib/*/libodphelper-dpdk.so
+usr/lib/*/libodphelper-dpdk.a
+usr/lib/*/pkgconfig/libodphelper-dpdk*
diff --git a/pkg/debian/libodphelper-linux.dirs b/pkg/debian/libodphelper-dpdk.dirs
index 68457717b..68457717b 100644
--- a/pkg/debian/libodphelper-linux.dirs
+++ b/pkg/debian/libodphelper-dpdk.dirs
diff --git a/pkg/debian/libodphelper-dpdk.install b/pkg/debian/libodphelper-dpdk.install
new file mode 100644
index 000000000..56de2f649
--- /dev/null
+++ b/pkg/debian/libodphelper-dpdk.install
@@ -0,0 +1 @@
+usr/lib/*/libodphelper-dpdk.so.*
diff --git a/pkg/debian/libodphelper-linux-dev.install b/pkg/debian/libodphelper-linux-dev.install
deleted file mode 100644
index 7d9a2a81f..000000000
--- a/pkg/debian/libodphelper-linux-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/odp/helper/*
-usr/lib/*/libodphelper-linux.so
-usr/lib/*/libodphelper-linux.a
-usr/lib/*/pkgconfig/libodphelper-linux*
diff --git a/pkg/debian/libodphelper-linux.install b/pkg/debian/libodphelper-linux.install
deleted file mode 100644
index 896feedb0..000000000
--- a/pkg/debian/libodphelper-linux.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libodphelper-linux.so.*
diff --git a/pkg/debian/rules b/pkg/debian/rules
index dbac62a98..fb439e8be 100755
--- a/pkg/debian/rules
+++ b/pkg/debian/rules
@@ -19,5 +19,5 @@ override_dh_auto_configure:
 .PHONY: override_dh_strip
 override_dh_strip:
 	dh_strip -p libodp-dpdk --dbg-package=libodp-dpdk-dbg
-	dh_strip -p libodphelper-linux --dbg-package=libodphelper-linux-dbg
+	dh_strip -p libodphelper-dpdk --dbg-package=libodphelper-dpdk-dbg
 	dh_strip --remaining-packages
diff --git a/pkgconfig/libodphelper-linux.pc.in b/pkgconfig/libodphelper-dpdk.pc.in
index 71c7d5d29..4823ba6e3 100644
--- a/pkgconfig/libodphelper-linux.pc.in
+++ b/pkgconfig/libodphelper-dpdk.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libodphelper-linux
+Name: libodphelper-dpdk
 Description: Helper for the ODP packet processing engine
 Version: @VERSION@
-Libs: -L${libdir} -lodphelper-linux
+Libs: -L${libdir} -lodphelper-dpdk
 Libs.private:
 Cflags: -I${includedir}
diff --git a/platform/linux-dpdk/test/Makefile.inc b/platform/linux-dpdk/test/Makefile.inc
index 302cacb9f..eb98e4bde 100644
--- a/platform/linux-dpdk/test/Makefile.inc
+++ b/platform/linux-dpdk/test/Makefile.inc
@@ -6,7 +6,7 @@ AM_LDFLAGS += -static
 
 LIBCUNIT_COMMON = $(top_builddir)/test/validation/common/libcunit_common.la
 LIB   = $(top_builddir)/lib
-LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
+LIBODP = $(LIB)/libodphelper-dpdk.la $(LIB)/libodp-dpdk.la
 
 INCCUNIT_COMMON = -I$(top_srcdir)/test/validation/common
 INCODP = -I$(top_srcdir)/test \
diff --git a/test/Makefile.inc b/test/Makefile.inc
index e572ae673..dfdf70f90 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -4,7 +4,7 @@ LIB   = $(top_builddir)/lib
 #in the following line, the libs using the symbols should come before
 #the libs containing them! The includer is given a chance to add things
 #before libodp by setting PRE_LDADD before the inclusion.
-LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
+LDADD = $(PRE_LDADD) $(LIB)/libodphelper-dpdk.la $(LIB)/libodp-dpdk.la
 
 INCFLAGS = -I$(top_srcdir)/test \
 	-I$(top_srcdir)/platform/@with_platform@/include \
diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc
index 88a0cc184..f7b16a647 100644
--- a/test/validation/Makefile.inc
+++ b/test/validation/Makefile.inc
@@ -13,4 +13,4 @@ AM_LDFLAGS += -static
 LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la
 LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la
 LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la
-LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
+LIBODP = $(LIB)/libodphelper-dpdk.la $(LIB)/libodp-dpdk.la