diff --git a/ndn-tlv-ping/Makefile b/ndn-tlv-ping/Makefile
deleted file mode 100644
index 9624e86..0000000
--- a/ndn-tlv-ping/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# URL for git clone
-GIT_URL=https://github.com/named-data/ndn-tlv-ping
-
-# Tag name or commit hash for checkout
-GIT_VERSION=d3675f528af468d59b2c505057acd21b56210c5c
-
-# Package name
-NAME=ndn-tlv-ping
-
-# Package version
-VERSION=0.1.5
-
-# PPA version
-PPA_VERSION=4
-
-include ../packaging.mk
diff --git a/ndn-tlv-ping/debian/changelog b/ndn-tlv-ping/debian/changelog
deleted file mode 100644
index 32eaed0..0000000
--- a/ndn-tlv-ping/debian/changelog
+++ /dev/null
@@ -1,110 +0,0 @@
-ndn-tlv-ping (0.1.5-ppa4~DISTRO) DISTRO; urgency=low
-
-  * New version based on d3675f528af468d59b2c505057acd21b56210c5c
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 23 Jul 2015 04:10:16 +0000
-
-ndn-tlv-ping (0.1.5-ppa3~DISTRO) DISTRO; urgency=low
-
-  * New version based on d3675f528af468d59b2c505057acd21b56210c5c
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 23 Jul 2015 04:08:07 +0000
-
-ndn-tlv-ping (0.1.5-ppa2~DISTRO) DISTRO; urgency=low
-
-  * New version based on d3675f528af468d59b2c505057acd21b56210c5c
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 13 May 2015 05:22:12 +0000
-
-ndn-tlv-ping (0.1.5-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on d3675f528af468d59b2c505057acd21b56210c5c
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Tue, 05 May 2015 22:48:03 +0000
-
-ndn-tlv-ping (0.1.4-ppa3~DISTRO) DISTRO; urgency=low
-
-  * New version based on 1283684bacb2352de38c8f0ad21a069875583d91
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 18 Dec 2014 23:22:56 -0800
-
-ndn-tlv-ping (0.1.4-ppa2~DISTRO) DISTRO; urgency=low
-
-  * New version based on 1283684bacb2352de38c8f0ad21a069875583d91
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 18 Dec 2014 23:16:46 -0800
-
-ndn-tlv-ping (0.1.3-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on 38f1ea7698108bdd1cdbdd621316f020b8d0e4dc
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Tue, 28 Oct 2014 12:30:02 -0700
-
-ndn-tlv-ping (0.1.2-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on cf4d018f0fa6b6c35af7c5c40406582b2d24e789
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Mon, 25 Aug 2014 12:12:35 -0700
-
-ndn-tlv-ping (0.1.1-ppa3~DISTRO) DISTRO; urgency=low
-
-  * New version based on d957b493b6d20416e7897f97a96c310e4cde2225
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 13 Aug 2014 18:44:23 -0700
-
-ndn-tlv-ping (0.1.1-ppa2~DISTRO) DISTRO; urgency=low
-
-  * New version based on d957b493b6d20416e7897f97a96c310e4cde2225
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 13 Aug 2014 17:45:48 -0700
-
-ndn-tlv-ping (0.1.1-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on d957b493b6d20416e7897f97a96c310e4cde2225
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Tue, 12 Aug 2014 17:34:14 -0700
-
-ndn-tlv-ping (0.1.0-ppa5~DISTRO) DISTRO; urgency=low
-
-  * New version based on ndn-tlv-ping-0.1.0 (https://github.com/named-
-    data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 30 Jul 2014 12:41:17 -0700
-
-ndn-tlv-ping (0.1.0-ppa4~DISTRO) DISTRO; urgency=low
-
-  * New version based on ndn-tlv-ping-0.1.0 (https://github.com/named-
-    data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Tue, 22 Jul 2014 10:53:23 -0700
-
-ndn-tlv-ping (0.1.0-ppa3~DISTRO) DISTRO; urgency=low
-
-  * New version based on ndn-tlv-ping-0.1.0 (https://github.com/named-
-    data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Tue, 01 Jul 2014 16:59:07 -0700
-
-ndn-tlv-ping (0.0.0-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on 3970fdbfc83cb580af75bd8219fefdbfee6c21d9
-    (https://github.com/named-data/ndn-tlv-ping)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Fri, 09 May 2014 11:03:06 -0700
-
-ndn-tlv-ping (0.0.0~ppa0~DISTRO) DISTRO; urgency=low
-
-  * Initial release
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 7 May 2014 13:58:30 -0800
diff --git a/ndn-tlv-ping/debian/compat b/ndn-tlv-ping/debian/compat
deleted file mode 100644
index 45a4fb7..0000000
--- a/ndn-tlv-ping/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/ndn-tlv-ping/debian/control b/ndn-tlv-ping/debian/control
deleted file mode 100644
index 8c2f0ed..0000000
--- a/ndn-tlv-ping/debian/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: ndn-tlv-ping
-Priority: extra
-Maintainer: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
-Build-Depends: debhelper (>= 8.0.0),
- python (>= 2.7.0),
- pkg-config (>= 0.26),
- ndn-cxx-dev (>= 0.3.0~rc0.2)
-Standards-Version: 3.9.2
-Section: net
-Homepage: http://github.com/named-data/ndn-tlv-ping
-Vcs-Git: git://github.com/named-data/ndn-tlv-ping.git
-Vcs-Browser: http://github.com/named-data/ndn-tlv-ping
-
-Package: ndn-tlv-ping
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ndn-cxx
-Description: Reachability Testing Tool for NDN
- This is a data plane reachability testing tool for NDN network.
diff --git a/ndn-tlv-ping/debian/copyright b/ndn-tlv-ping/debian/copyright
deleted file mode 100644
index 5f804fe..0000000
--- a/ndn-tlv-ping/debian/copyright
+++ /dev/null
@@ -1,33 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: ndn-tlv-ping
-Source: http://github.com/named-data/ndn-tlv-ping
-
-Files: *
-Copyright: Copyright (C) 2014 University of Arizona.
-License: GPL-3+
-
-Files: debian/*
-Copyright: Copyright (c) 2013-2014, Alexander Afanasyev <alexander.afanasyev@ucla.edu>
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-     * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-     * Neither the name of the Regents of the University of California nor
-       the names of its contributors may be used to endorse or promote
-       products derived from this software without specific prior written
-       permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL REGENTS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/ndn-tlv-ping/debian/ndn-tlv-ping.default b/ndn-tlv-ping/debian/ndn-tlv-ping.default
deleted file mode 100644
index 20bc941..0000000
--- a/ndn-tlv-ping/debian/ndn-tlv-ping.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# defaults for ndn-tlv-ping server
-
-# Prefix should be set to a valid value
-PREFIX="/localhost/ndnpingserver"
-
-FLAGS=""
diff --git a/ndn-tlv-ping/debian/ndn-tlv-ping.dirs b/ndn-tlv-ping/debian/ndn-tlv-ping.dirs
deleted file mode 100644
index e772481..0000000
--- a/ndn-tlv-ping/debian/ndn-tlv-ping.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/ndn-tlv-ping/debian/ndn-tlv-ping.install b/ndn-tlv-ping/debian/ndn-tlv-ping.install
deleted file mode 100644
index 1df36c6..0000000
--- a/ndn-tlv-ping/debian/ndn-tlv-ping.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/*
diff --git a/ndn-tlv-ping/debian/ndn-tlv-ping.postinst b/ndn-tlv-ping/debian/ndn-tlv-ping.postinst
deleted file mode 100644
index b082869..0000000
--- a/ndn-tlv-ping/debian/ndn-tlv-ping.postinst
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" != "configure" ]; then
-        exit 0
-fi
-
-APP=ndn-tlv-ping
-
-if [ ! -f /var/lib/ndn/$APP/.ndn/ndnsec-public-info.db ]; then
-    # Create HOME and generate self-signed NDN certificate
-    sudo mkdir -p /var/lib/ndn/$APP/.ndn
-    sudo chown -R ndn:ndn /var/lib/ndn/$APP
-    sudo -u ndn -g ndn HOME=/var/lib/ndn/$APP ndnsec-keygen /localhost/daemons/$APP | \
-      sudo -u ndn -g ndn HOME=/var/lib/ndn/$APP ndnsec-install-cert -
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ndn-tlv-ping/debian/ndn-tlv-ping.upstart b/ndn-tlv-ping/debian/ndn-tlv-ping.upstart
deleted file mode 100644
index f3697ab..0000000
--- a/ndn-tlv-ping/debian/ndn-tlv-ping.upstart
+++ /dev/null
@@ -1,21 +0,0 @@
-description "NDN TLV ping server"
-author      "Alexander Afanasyev <alexander.afanasyev@ucla.edu>"
-
-start on started  nfd
-stop  on stopping nfd
-
-respawn
-respawn limit unlimited
-
-setuid ndn
-setgid ndn
-
-script
-    FLAGS=""
-    PREFIX="/localhost/ndnpingserver"
-    if [ -f /etc/default/ndn-tlv-ping ]; then
-        . /etc/default/ndn-tlv-ping
-    fi
-    export HOME=/var/lib/ndn/ndn-tlv-ping
-    exec /usr/bin/ndnpingserver "$PREFIX" $FLAGS
-end script
diff --git a/ndn-tlv-ping/debian/rules b/ndn-tlv-ping/debian/rules
deleted file mode 100755
index 0d3817e..0000000
--- a/ndn-tlv-ping/debian/rules
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-CXXFLAGS += -std=c++11
-
-%:
-	dh $@ --parallel
-
-override_dh_auto_configure:
-	CXXFLAGS="$(CXXFLAGS)" LINKFLAGS="$(LDFLAGS)" ./waf configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-
-override_dh_auto_build:
-	./waf build
-
-override_dh_auto_install:
-	./waf install --destdir=debian/tmp
-
-override_dh_auto_clean:
-	./waf distclean
-
-override_dh_clean:
-	dh_clean
-	./waf distclean
-	rm -rf .waf-1*
-	rm -rf .waf3-1*
-	rm -f .waf-tools/*.pyc
-
-override_dh_auto_test:
diff --git a/ndn-tlv-ping/debian/rules.precise b/ndn-tlv-ping/debian/rules.precise
deleted file mode 100755
index 5fa0a0c..0000000
--- a/ndn-tlv-ping/debian/rules.precise
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-CXXFLAGS += -std=c++0x
-
-%:
-	dh $@ --parallel
-
-override_dh_auto_configure:
-	CXXFLAGS="$(CXXFLAGS)" LINKFLAGS="$(LDFLAGS)" ./waf configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-
-override_dh_auto_build:
-	./waf build
-
-override_dh_auto_install:
-	./waf install --destdir=debian/tmp
-
-override_dh_auto_clean:
-	./waf distclean
-
-override_dh_clean:
-	dh_clean
-	./waf distclean
-	rm -rf .waf-1*
-	rm -rf .waf3-1*
-	rm -f .waf-tools/*.pyc
-
-override_dh_auto_test:
diff --git a/ndn-tlv-ping/debian/source/format b/ndn-tlv-ping/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/ndn-tlv-ping/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ndn-tools/debian/control b/ndn-tools/debian/control
index 32797d6..485ce73 100644
--- a/ndn-tools/debian/control
+++ b/ndn-tools/debian/control
@@ -28,6 +28,11 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ndn-cxx, nfd
 Description: Reachability testing tools for Named Data Networking.
 
+Package: ndn-tlv-ping
+Architecture: i386 amd64
+Depends: ndnping
+Description: deprecated package, use ndnping instead
+
 Package: ndnpeek
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ndn-cxx