From 4c0ca278fa8b3201f8bc15b08bc06ba7c7e1d432 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Fri, 28 Mar 2014 12:20:19 -0400
Subject: [PATCH] rename mediaproxy-ng to rtpengine

---
 daemon/.gitignore                             |  3 +-
 daemon/.ycm_extra_conf.py                     |  2 +-
 daemon/Makefile                               |  8 +--
 daemon/bencode.h                              |  2 +-
 daemon/call.c                                 |  4 +-
 daemon/dtls.c                                 |  2 +-
 daemon/main.c                                 |  2 +-
 debian/changelog                              |  3 +-
 debian/control                                | 56 ++++++++++++-------
 debian/control.modules.in                     |  8 +--
 debian/dkms.conf.in                           |  2 +-
 debian/ngcp-mediaproxy-ng-daemon.install      |  1 -
 debian/ngcp-mediaproxy-ng-dev.install         |  1 -
 ....default => ngcp-rtpengine-daemon.default} |  2 +-
 ...daemon.init => ngcp-rtpengine-daemon.init} | 10 ++--
 debian/ngcp-rtpengine-daemon.install          |  1 +
 ...ostinst => ngcp-rtpengine-daemon.postinst} | 18 +++---
 ...on.postrm => ngcp-rtpengine-daemon.postrm} |  4 +-
 ...emon.prerm => ngcp-rtpengine-daemon.prerm} |  8 +--
 debian/ngcp-rtpengine-dev.install             |  1 +
 ...nstall => ngcp-rtpengine-iptables.install} |  0
 ...st => ngcp-rtpengine-kernel-dkms.postinst} |  8 +--
 ...prerm => ngcp-rtpengine-kernel-dkms.prerm} |  8 +--
 ...nks => ngcp-rtpengine-kernel-source.links} |  2 +-
 debian/rules                                  | 26 ++++-----
 debian/rules.modules                          |  6 +-
 tests/simulator-tcp.sh                        |  2 +-
 utils/patch-kernel                            |  8 +--
 28 files changed, 107 insertions(+), 91 deletions(-)
 delete mode 100644 debian/ngcp-mediaproxy-ng-daemon.install
 delete mode 100644 debian/ngcp-mediaproxy-ng-dev.install
 rename debian/{ngcp-mediaproxy-ng-daemon.default => ngcp-rtpengine-daemon.default} (87%)
 rename debian/{ngcp-mediaproxy-ng-daemon.init => ngcp-rtpengine-daemon.init} (95%)
 create mode 100644 debian/ngcp-rtpengine-daemon.install
 rename debian/{ngcp-mediaproxy-ng-daemon.postinst => ngcp-rtpengine-daemon.postinst} (62%)
 rename debian/{ngcp-mediaproxy-ng-daemon.postrm => ngcp-rtpengine-daemon.postrm} (72%)
 rename debian/{ngcp-mediaproxy-ng-daemon.prerm => ngcp-rtpengine-daemon.prerm} (62%)
 create mode 100644 debian/ngcp-rtpengine-dev.install
 rename debian/{ngcp-mediaproxy-ng-iptables.install => ngcp-rtpengine-iptables.install} (100%)
 rename debian/{ngcp-mediaproxy-ng-kernel-dkms.postinst => ngcp-rtpengine-kernel-dkms.postinst} (71%)
 rename debian/{ngcp-mediaproxy-ng-kernel-dkms.prerm => ngcp-rtpengine-kernel-dkms.prerm} (57%)
 rename debian/{ngcp-mediaproxy-ng-kernel-source.links => ngcp-rtpengine-kernel-source.links} (64%)

diff --git a/daemon/.gitignore b/daemon/.gitignore
index 6107bcfe4..999f7e326 100644
--- a/daemon/.gitignore
+++ b/daemon/.gitignore
@@ -1,5 +1,6 @@
 .depend
 *.o
-mediaproxy-ng
+rtpengine
 core
+core.*
 .ycm_extra_conf.pyc
diff --git a/daemon/.ycm_extra_conf.py b/daemon/.ycm_extra_conf.py
index dff1894df..647d8ed76 100644
--- a/daemon/.ycm_extra_conf.py
+++ b/daemon/.ycm_extra_conf.py
@@ -23,7 +23,7 @@ flags = [
 '-D_GNU_SOURCE',
 '-D__DEBUG=1',
 '-DMEDIAPROXY_VERSION="dummy"',
-'-DMP_PLUGIN_DIR="/usr/lib/mediaproxy-ng"',
+'-DMP_PLUGIN_DIR="/usr/lib/rtpengine"',
 '-O2',
 '-fstack-protector',
 '--param=ssp-buffer-size=4',
diff --git a/daemon/Makefile b/daemon/Makefile
index 93aff86b4..9763dac61 100644
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -17,7 +17,7 @@ else
     CFLAGS+=	-DMEDIAPROXY_VERSION="\"undefined\""
   endif
 endif
-CFLAGS+=	-DMP_PLUGIN_DIR="\"/usr/lib/mediaproxy-ng\""
+CFLAGS+=	-DMP_PLUGIN_DIR="\"/usr/lib/rtpengine\""
 
 #CFLAGS+=	-DSRTCP_KEY_DERIVATION_RFC_COMPLIANCE
 
@@ -54,7 +54,7 @@ OBJS=		$(SRCS:.c=.o)
 .PHONY:		all dep clean tests debug
 
 all:
-	$(MAKE) mediaproxy-ng
+	$(MAKE) rtpengine
 
 debug:
 	$(MAKE) DBG=yes all
@@ -62,12 +62,12 @@ debug:
 dep:		.depend
 
 clean:
-	rm -f $(OBJS) mediaproxy-ng .depend core
+	rm -f $(OBJS) rtpengine .depend core
 
 .depend:	$(SRCS) Makefile
 	$(CC) $(CFLAGS) -M $(SRCS) | sed -e 's/:/ .depend:/' > .depend
 
-mediaproxy-ng:	$(OBJS) .depend
+rtpengine:	$(OBJS) .depend
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 
diff --git a/daemon/bencode.h b/daemon/bencode.h
index 22defa170..fbc620c3c 100644
--- a/daemon/bencode.h
+++ b/daemon/bencode.h
@@ -13,7 +13,7 @@
 # define BENCODE_FREE pkg_free
 # endif
 #else
-/* mediaproxy-ng */
+/* rtpengine */
 # include "str.h"
 # ifndef BENCODE_MALLOC
 # define BENCODE_MALLOC malloc
diff --git a/daemon/call.c b/daemon/call.c
index 1c2c1ea0b..0ba4dd5f8 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -900,14 +900,14 @@ retry:
 		for (i = 0; i < 100; i++)
 			close(i);
 
-		openlog("mediaproxy-ng/child", LOG_PID | LOG_NDELAY, LOG_DAEMON);
+		openlog("rtpengine/child", LOG_PID | LOG_NDELAY, LOG_DAEMON);
 		ilog(LOG_INFO, "Initiating XMLRPC call for tag "STR_FORMAT"", STR_FMT(tag));
 
 		alarm(5);
 
 		xmlrpc_env_init(&e);
 		xmlrpc_client_setup_global_const(&e);
-		xmlrpc_client_create(&e, XMLRPC_CLIENT_NO_FLAGS, "ngcp-mediaproxy-ng", MEDIAPROXY_VERSION,
+		xmlrpc_client_create(&e, XMLRPC_CLIENT_NO_FLAGS, "ngcp-rtpengine", MEDIAPROXY_VERSION,
 			NULL, 0, &c);
 		if (e.fault_occurred)
 			goto fault;
diff --git a/daemon/dtls.c b/daemon/dtls.c
index 04efcc2cd..15bf26341 100644
--- a/daemon/dtls.c
+++ b/daemon/dtls.c
@@ -170,7 +170,7 @@ static int cert_init() {
 	/* common name */
 
 	if (!X509_NAME_add_entry_by_NID(name, NID_commonName, MBSTRING_UTF8,
-				(unsigned char *) "mediaproxy-ng", -1, -1, 0))
+				(unsigned char *) "rtpengine", -1, -1, 0))
 		goto err;
 
 	if (!X509_set_subject_name(x509, name))
diff --git a/daemon/main.c b/daemon/main.c
index f387ca11e..f45a23e41 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -362,7 +362,7 @@ static void init_everything() {
 #if !GLIB_CHECK_VERSION(2,32,0)
 	g_thread_init(NULL);
 #endif
-	openlog("mediaproxy-ng", LOG_PID | LOG_NDELAY, LOG_DAEMON);
+	openlog("rtpengine", LOG_PID | LOG_NDELAY, LOG_DAEMON);
 	signals();
 	resources();
 	sdp_init();
diff --git a/debian/changelog b/debian/changelog
index cca1f24d8..38be58c2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-ngcp-mediaproxy-ng (2.9.9) unstable; urgency=low
+ngcp-rtpengine (2.9.9) unstable; urgency=low
 
+  * Rename from mediaproxy-ng to rtpengine
   * Complete rewrite of internal media streams handling
   * Support for DTLS-SRTP
   * Support for unBUNDLE
diff --git a/debian/control b/debian/control
index dd229707d..453a7274b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: ngcp-mediaproxy-ng
+Source: ngcp-rtpengine
 Section: net
 Priority: extra
 Maintainer: Sipwise Development Team <support@sipwise.com>
@@ -15,69 +15,83 @@ Build-Depends: debhelper (>= 5),
 Standards-Version: 3.9.3
 Homepage: http://sipwise.com/
 
-Package: ngcp-mediaproxy-ng-daemon
+Package: ngcp-rtpengine-daemon
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: ngcp-mediaproxy-ng-daemon
+Replaces: ngcp-mediaproxy-ng-daemon
 Description: Proxy for RTP and media streams used in NGCP, userspace part.
  This daemon handles the first stages of proxying media streams and talks to
  the kernel part of the proxy for eventual high-performance packet forwarding.
 
-Package: ngcp-mediaproxy-ng-iptables
+Package: ngcp-rtpengine-iptables
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: ngcp-mediaproxy-ng-iptables
+Replaces: ngcp-mediaproxy-ng-iptables
 Description: IPtables extension module for the kernel-space NGCP media proxy.
  Provides the IPtables extension needed to configure the mediaproxy rule.
 
-Package: ngcp-mediaproxy-ng
+Package: ngcp-rtpengine
 Architecture: all
-Depends: ngcp-mediaproxy-ng-daemon (>= ${source:Version}),
-         ngcp-mediaproxy-ng-iptables (>= ${source:Version}),
-         ngcp-mediaproxy-ng-kernel-dkms (>= ${source:Version})
+Depends: ngcp-rtpengine-daemon (>= ${source:Version}),
+         ngcp-rtpengine-iptables (>= ${source:Version}),
+         ngcp-rtpengine-kernel-dkms (>= ${source:Version})
+Conflicts: ngcp-mediaproxy-ng
+Replaces: ngcp-mediaproxy-ng
 Description: NGCP RTP/media proxy - meta package.
  This is a meta package for easy installation of all three parts of the NGCP
  media proxy. It will install the user-space daemon, the kernel-space IPtables
  module, and the IPtables extension module.
 
-Package: ngcp-mediaproxy-ng-kernel-source
+Package: ngcp-rtpengine-kernel-source
 Architecture: all
 Depends: debhelper (>= 5), module-assistant, ${misc:Depends}
+Conflicts: ngcp-mediaproxy-ng-kernel-source
+Replaces: ngcp-mediaproxy-ng-kernel-source
 Description: IPtables kernel module for the NGCP media proxy - source.
  Provides the kernel-space part of the NGCP media proxy for high-
  performance packet forwarding.
  This package contains the source to be built with module-assistant or
  kernel-package.
 
-Package: ngcp-mediaproxy-ng-kernel-dkms
+Package: ngcp-rtpengine-kernel-dkms
 Architecture: all
 Depends: dkms (>= 1.95), ${misc:Depends}
+Conflicts: ngcp-mediaproxy-ng-kernel-dkms
+Replaces: ngcp-mediaproxy-ng-kernel-dkms
 Description: IPtables kernel module for the NGCP media proxy - DKMS.
  Provides the kernel-space part of the NGCP media proxy for high-
  performance packet forwarding.
  This package contains the source to be built with dkms.
 
-Package: ngcp-mediaproxy-ng-dev
+Package: ngcp-rtpengine-dev
 Architecture: all
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Development files for mediaproxy-ng
- This package provides the header files of the mediaproxy-ng
+Conflicts: ngcp-mediaproxy-ng-dev
+Replaces: ngcp-mediaproxy-ng-dev
+Description: Development files for rtpengine
+ This package provides the header files of the rtpengine
  software.
  .
  Install this package if you wish to develop your own programs using
- mediaproxy-ng.
+ rtpengine.
 
-Package: ngcp-mediaproxy-ng-dbg
+Package: ngcp-rtpengine-dbg
 Architecture: any
 Section: debug
-Depends: ngcp-mediaproxy-ng-daemon (= ${binary:Version}),
-         ngcp-mediaproxy-ng-iptables (= ${binary:Version}),
+Depends: ngcp-rtpengine-daemon (= ${binary:Version}),
+         ngcp-rtpengine-iptables (= ${binary:Version}),
          ${misc:Depends}
-Description: debugging symbols for ngcp-mediaproxy-ng
- The ngcp-mediaproxy-ng daemon handles the first stages of proxying media streams and talks to
+Conflicts: ngcp-mediaproxy-ng-dbg
+Replaces: ngcp-mediaproxy-ng-dbg
+Description: debugging symbols for ngcp-rtpengine
+ The ngcp-rtpengine daemon handles the first stages of proxying media streams and talks to
  the kernel part of the proxy for eventual high-performance packet forwarding.
  .
- ngcp-mediaproxy-ng-iptables provides the IPtables extension needed
+ ngcp-rtpengine-iptables provides the IPtables extension needed
  to configure the mediaproxy rule.
  .
- This package contains the debugging symbols for ngcp-mediaproxy-ng-daemon
- and ngcp-mediaproxy-ng-iptables
+ This package contains the debugging symbols for ngcp-rtpengine-daemon
+ and ngcp-rtpengine-iptables
diff --git a/debian/control.modules.in b/debian/control.modules.in
index 94bac4b28..d7264a207 100644
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -1,4 +1,4 @@
-Source: ngcp-mediaproxy-ng-kernel
+Source: ngcp-rtpengine-kernel
 Section: kernel
 Priority: optional
 Maintainer: Sipwise Development Team <support@sipwise.com>
@@ -6,10 +6,10 @@ Build-Depends: debhelper (>= 5)
 Standards-Version: 3.9.3
 Homepage: http://sipwise.com/
 
-Package: ngcp-mediaproxy-ng-kernel-modules-_KVERS_
+Package: ngcp-rtpengine-kernel-modules-_KVERS_
 Architecture: any
 Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
-Provides: ngcp-mediaproxy-ng-kernel
+Provides: ngcp-rtpengine-kernel
 Description: TODO
- This package provides the ngcp-mediaproxy-ng module for
+ This package provides the ngcp-rtpengine module for
  the Linux kernel version _KVERS_.
diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in
index 876955f67..3510b35d2 100644
--- a/debian/dkms.conf.in
+++ b/debian/dkms.conf.in
@@ -1,4 +1,4 @@
-PACKAGE_NAME="ngcp-mediaproxy-ng"
+PACKAGE_NAME="ngcp-rtpengine"
 PACKAGE_VERSION="__VERSION__"
 MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build MEDIAPROXY_VERSION=\"__VERSION__\""
 CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
diff --git a/debian/ngcp-mediaproxy-ng-daemon.install b/debian/ngcp-mediaproxy-ng-daemon.install
deleted file mode 100644
index 77a48e8aa..000000000
--- a/debian/ngcp-mediaproxy-ng-daemon.install
+++ /dev/null
@@ -1 +0,0 @@
-daemon/mediaproxy-ng /usr/sbin/
diff --git a/debian/ngcp-mediaproxy-ng-dev.install b/debian/ngcp-mediaproxy-ng-dev.install
deleted file mode 100644
index 48aa522e1..000000000
--- a/debian/ngcp-mediaproxy-ng-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-daemon/*.h /usr/include/mediaproxy-ng/
diff --git a/debian/ngcp-mediaproxy-ng-daemon.default b/debian/ngcp-rtpengine-daemon.default
similarity index 87%
rename from debian/ngcp-mediaproxy-ng-daemon.default
rename to debian/ngcp-rtpengine-daemon.default
index 7784d253e..ed554e141 100644
--- a/debian/ngcp-mediaproxy-ng-daemon.default
+++ b/debian/ngcp-rtpengine-daemon.default
@@ -8,7 +8,7 @@ LISTEN_NG=22222
 # ADV_ADDRESS_IPV6=...
 TIMEOUT=60
 SILENT_TIMEOUT=3600
-PIDFILE=/var/run/ngcp-mediaproxy-ng-daemon.pid
+PIDFILE=/var/run/ngcp-rtpengine-daemon.pid
 FORK=yes
 # TOS=184
 TABLE=0
diff --git a/debian/ngcp-mediaproxy-ng-daemon.init b/debian/ngcp-rtpengine-daemon.init
similarity index 95%
rename from debian/ngcp-mediaproxy-ng-daemon.init
rename to debian/ngcp-rtpengine-daemon.init
index 213f62ccb..0dccc2b9d 100755
--- a/debian/ngcp-mediaproxy-ng-daemon.init
+++ b/debian/ngcp-rtpengine-daemon.init
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          ngcp-mediaproxy-ng-daemon
+# Provides:          ngcp-rtpengine-daemon
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
@@ -11,7 +11,7 @@
 
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-NAME=ngcp-mediaproxy-ng-daemon
+NAME=ngcp-rtpengine-daemon
 DESC="RTP/media proxy"
 RUN_MEDIAPROXY=no
 TABLE=0
@@ -21,7 +21,7 @@ case $(dirname $0) in
         *)  FULLPATH=$(pwd)/$(dirname $0);;
 esac
 
-DAEMON=`which mediaproxy-ng`
+DAEMON=`which rtpengine`
 DEFAULTS=/etc/default/${NAME}
 
 test -f $DAEMON || exit 0
@@ -32,10 +32,10 @@ if [ -f $DEFAULTS ]; then
 fi
 
 if [ "$RUN_MEDIAPROXY" != "yes" ]; then
-    echo "mediaproxy-ng not yet configured. Edit $DEFAULTS first."
+    echo "rtpengine not yet configured. Edit $DEFAULTS first."
     exit 0
 fi
-[ -z "$PIDFILE" ] && PIDFILE="/var/run/mediaproxy-ng.pid"
+[ -z "$PIDFILE" ] && PIDFILE="/var/run/rtpengine.pid"
 
 set -e
 
diff --git a/debian/ngcp-rtpengine-daemon.install b/debian/ngcp-rtpengine-daemon.install
new file mode 100644
index 000000000..11a8ccb4d
--- /dev/null
+++ b/debian/ngcp-rtpengine-daemon.install
@@ -0,0 +1 @@
+daemon/rtpengine /usr/sbin/
diff --git a/debian/ngcp-mediaproxy-ng-daemon.postinst b/debian/ngcp-rtpengine-daemon.postinst
similarity index 62%
rename from debian/ngcp-mediaproxy-ng-daemon.postinst
rename to debian/ngcp-rtpengine-daemon.postinst
index 5f48c7756..adea83891 100755
--- a/debian/ngcp-mediaproxy-ng-daemon.postinst
+++ b/debian/ngcp-rtpengine-daemon.postinst
@@ -1,22 +1,22 @@
 #!/bin/sh
-# postinst script for ngcp-mediaproxy-ng-daemon
+# postinst script for ngcp-rtpengine-daemon
 
 set -e
 
 restart_handler() {
-  if [ -x "/etc/init.d/ngcp-mediaproxy-ng-daemon" ]; then
+  if [ -x "/etc/init.d/ngcp-rtpengine-daemon" ]; then
     if [ -x "$(which invoke-rc.d 2>/dev/null)" ]; then
-      invoke-rc.d ngcp-mediaproxy-ng-daemon restart || exit $?
+      invoke-rc.d ngcp-rtpengine-daemon restart || exit $?
     else
-      /etc/init.d/ngcp-mediaproxy-ng-daemon restart || exit $?
+      /etc/init.d/ngcp-rtpengine-daemon restart || exit $?
     fi
   fi
 }
 
 initscript_handler() {
-  if [ -x "/etc/init.d/ngcp-mediaproxy-ng-daemon" ]; then
-    update-rc.d ngcp-mediaproxy-ng-daemon defaults >/dev/null
-    invoke-rc.d ngcp-mediaproxy-ng-daemon start || exit $?
+  if [ -x "/etc/init.d/ngcp-rtpengine-daemon" ]; then
+    update-rc.d ngcp-rtpengine-daemon defaults >/dev/null
+    invoke-rc.d ngcp-rtpengine-daemon start || exit $?
   fi
 }
 
@@ -29,10 +29,10 @@ init_handler() {
     initscript_handler
   else # do not restart daemon on inactive node in pro systems
     if ngcp-check_active ; then
-      echo "Active node detected, restarting ngcp-mediaproxy-ng-daemon"
+      echo "Active node detected, restarting ngcp-rtpengine-daemon"
       restart_handler
     else
-      echo "Inactive node detected, ignoring request to restart ngcp-mediaproxy-ng-daemon"
+      echo "Inactive node detected, ignoring request to restart ngcp-rtpengine-daemon"
     fi
   fi
 }
diff --git a/debian/ngcp-mediaproxy-ng-daemon.postrm b/debian/ngcp-rtpengine-daemon.postrm
similarity index 72%
rename from debian/ngcp-mediaproxy-ng-daemon.postrm
rename to debian/ngcp-rtpengine-daemon.postrm
index d6a4f0acf..969412e2e 100755
--- a/debian/ngcp-mediaproxy-ng-daemon.postrm
+++ b/debian/ngcp-rtpengine-daemon.postrm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for ngcp-mediaproxy-ng-daemon
+# postrm script for ngcp-rtpengine-daemon
 
 set -e
 
@@ -7,7 +7,7 @@ removal_wrapper() {
   # remove the init script only on ce systems, as the
   # the pro system handle it inside the monitoring/HA setup
   if ! [ -x "$(which ngcp-check_active 2>/dev/null)" ]; then
-    update-rc.d ngcp-mediaproxy-ng-daemon remove >/dev/null
+    update-rc.d ngcp-rtpengine-daemon remove >/dev/null
   fi
 }
 
diff --git a/debian/ngcp-mediaproxy-ng-daemon.prerm b/debian/ngcp-rtpengine-daemon.prerm
similarity index 62%
rename from debian/ngcp-mediaproxy-ng-daemon.prerm
rename to debian/ngcp-rtpengine-daemon.prerm
index e8f3824fa..5ee99ce00 100755
--- a/debian/ngcp-mediaproxy-ng-daemon.prerm
+++ b/debian/ngcp-rtpengine-daemon.prerm
@@ -1,11 +1,11 @@
 #!/bin/sh
-# prerm script for ngcp-mediaproxy-ng-daemon
+# prerm script for ngcp-rtpengine-daemon
 
 set -e
 
 stop_handler() {
-  if [ -x "/etc/init.d/ngcp-mediaproxy-ng-daemon" ]; then
-    invoke-rc.d ngcp-mediaproxy-ng-daemon stop || exit $?
+  if [ -x "/etc/init.d/ngcp-rtpengine-daemon" ]; then
+    invoke-rc.d ngcp-rtpengine-daemon stop || exit $?
   fi
 }
 
@@ -17,7 +17,7 @@ stop_daemon() {
   else
     case "$2" in
       upgrade)
-	echo "Detected upgrade procedure, not stopping ngcp-mediaproxy-ng-daemon service."
+	echo "Detected upgrade procedure, not stopping ngcp-rtpengine-daemon service."
 	;;
       remove|purge)
         stop_handler
diff --git a/debian/ngcp-rtpengine-dev.install b/debian/ngcp-rtpengine-dev.install
new file mode 100644
index 000000000..b7eda5b59
--- /dev/null
+++ b/debian/ngcp-rtpengine-dev.install
@@ -0,0 +1 @@
+daemon/*.h /usr/include/rtpengine/
diff --git a/debian/ngcp-mediaproxy-ng-iptables.install b/debian/ngcp-rtpengine-iptables.install
similarity index 100%
rename from debian/ngcp-mediaproxy-ng-iptables.install
rename to debian/ngcp-rtpengine-iptables.install
diff --git a/debian/ngcp-mediaproxy-ng-kernel-dkms.postinst b/debian/ngcp-rtpengine-kernel-dkms.postinst
similarity index 71%
rename from debian/ngcp-mediaproxy-ng-kernel-dkms.postinst
rename to debian/ngcp-rtpengine-kernel-dkms.postinst
index e3500de2c..3ff7e8200 100644
--- a/debian/ngcp-mediaproxy-ng-kernel-dkms.postinst
+++ b/debian/ngcp-rtpengine-kernel-dkms.postinst
@@ -2,8 +2,8 @@
 
 set -e
 
-package=ngcp-mediaproxy-ng-kernel-dkms
-name=ngcp-mediaproxy-ng
+package=ngcp-rtpengine-kernel-dkms
+name=ngcp-rtpengine
 
 version=`dpkg-query -W -f='${Version}' "$package" \
         |rev|cut -d- -f2-|rev|cut -d':' -f2|tr -d "\n"`
@@ -18,8 +18,8 @@ if [ "$1" = 'configure' ] ; then
         dkms build -m "$name" -v "$version" && dkms install -m "$name" -v "$version" || true
 
         # try to start the daemon
-        if [ -x /etc/init.d/ngcp-mediaproxy-ng-daemon ] ; then
-		invoke-rc.d ngcp-mediaproxy-ng-daemon restart || true
+        if [ -x /etc/init.d/ngcp-rtpengine-daemon ] ; then
+		invoke-rc.d ngcp-rtpengine-daemon restart || true
         fi
 fi
 
diff --git a/debian/ngcp-mediaproxy-ng-kernel-dkms.prerm b/debian/ngcp-rtpengine-kernel-dkms.prerm
similarity index 57%
rename from debian/ngcp-mediaproxy-ng-kernel-dkms.prerm
rename to debian/ngcp-rtpengine-kernel-dkms.prerm
index 61a0200c6..71fb01948 100644
--- a/debian/ngcp-mediaproxy-ng-kernel-dkms.prerm
+++ b/debian/ngcp-rtpengine-kernel-dkms.prerm
@@ -2,15 +2,15 @@
 
 set -e
 
-package=ngcp-mediaproxy-ng-kernel-dkms
-name=ngcp-mediaproxy-ng
+package=ngcp-rtpengine-kernel-dkms
+name=ngcp-rtpengine
 
 version=`dpkg-query -W -f='${Version}' "$package" \
         |rev|cut -d- -f2-|rev|cut -d':' -f2|tr -d "\n"`
 
 # make sure it's not running
-if [ -x /etc/init.d/ngcp-mediaproxy-ng-daemon ] ; then
-	invoke-rc.d ngcp-mediaproxy-ng-daemon stop || true
+if [ -x /etc/init.d/ngcp-rtpengine-daemon ] ; then
+	invoke-rc.d ngcp-rtpengine-daemon stop || true
 fi
 
 dkms remove -m "$name" -v "$version" --all || true
diff --git a/debian/ngcp-mediaproxy-ng-kernel-source.links b/debian/ngcp-rtpengine-kernel-source.links
similarity index 64%
rename from debian/ngcp-mediaproxy-ng-kernel-source.links
rename to debian/ngcp-rtpengine-kernel-source.links
index e246b833c..e2fbc3dd6 100644
--- a/debian/ngcp-mediaproxy-ng-kernel-source.links
+++ b/debian/ngcp-rtpengine-kernel-source.links
@@ -1 +1 @@
-/usr/share/modass/packages/default.sh	/usr/share/modass/overrides/ngcp-mediaproxy-ng-kernel-source
+/usr/share/modass/packages/default.sh	/usr/share/modass/overrides/ngcp-rtpengine-kernel-source
diff --git a/debian/rules b/debian/rules
index 7fea8284e..2d2c58270 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,15 +13,15 @@ b=$(CURDIR)/debian
 
 ## kernel package specific stuff
 # Name of the source package
-psource:=ngcp-mediaproxy-ng-kernel-source
+psource:=ngcp-rtpengine-kernel-source
 # Name of the dkms package
-pdkms:=ngcp-mediaproxy-ng-kernel-dkms
+pdkms:=ngcp-rtpengine-kernel-dkms
 # short upstream name, used for module source directory
-sname:=ngcp-mediaproxy-ng
+sname:=ngcp-rtpengine
 # Source version
 sversion:=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
 
-PACKAGE=ngcp-mediaproxy-ng-kernel
+PACKAGE=ngcp-rtpengine-kernel
 MA_DIR ?= /usr/share/modass
 -include $(MA_DIR)/include/generic.make
 -include $(MA_DIR)/include/common-rules.make
@@ -46,7 +46,7 @@ clean:
 	cd daemon && $(MAKE) clean && cd ..
 	rm -f build-stamp
 	rm -f iptables-extension/libxt_MEDIAPROXY.so
-	rm -f daemon/mediaproxy-ng daemon/build_time.h daemon/.depend kernel-module/.xt_MEDIAPROXY.o.d
+	rm -f daemon/rtpengine daemon/build_time.h daemon/.depend kernel-module/.xt_MEDIAPROXY.o.d
 	rm -rf kernel-module/.tmp_versions
 	rm -f debian/README.html.gz debian/README.md.gz
 	dh_clean
@@ -90,7 +90,7 @@ install: build
 	dh_installchangelogs -p$@ -P$(b)/$@
 	dh_installinit       -p$@ -P$(b)/$@
 	dh_install           -p$@ -P$(b)/$@
-	dh_strip             --dbg-package=ngcp-mediaproxy-ng-dbg
+	dh_strip             --dbg-package=ngcp-rtpengine-dbg
 	dh_compress          -p$@ -P$(b)/$@
 	dh_fixperms          -p$@ -P$(b)/$@
 	dh_makeshlibs        -p$@ -P$(b)/$@ -V
@@ -103,16 +103,16 @@ install: build
 
 # Build architecture dependant packages
 binary-arch: install \
-	ngcp-mediaproxy-ng-daemon \
-	ngcp-mediaproxy-ng-dbg \
-	ngcp-mediaproxy-ng-iptables
+	ngcp-rtpengine-daemon \
+	ngcp-rtpengine-dbg \
+	ngcp-rtpengine-iptables
 
 # Build architecture independant packages
 binary-indep: build install \
-	ngcp-mediaproxy-ng \
-	ngcp-mediaproxy-ng-dev \
-	ngcp-mediaproxy-ng-kernel-dkms \
-	ngcp-mediaproxy-ng-kernel-source
+	ngcp-rtpengine \
+	ngcp-rtpengine-dev \
+	ngcp-rtpengine-kernel-dkms \
+	ngcp-rtpengine-kernel-source
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install kdist kdist_configure kdist_image kdist_clean
diff --git a/debian/rules.modules b/debian/rules.modules
index e6edfd923..b96aa4ddf 100644
--- a/debian/rules.modules
+++ b/debian/rules.modules
@@ -12,17 +12,17 @@ else
 endif
 
 # Name of the source package
-psource:=ngcp-mediaproxy-ng-kernel-source
+psource:=ngcp-rtpengine-kernel-source
 
 # The short upstream name, used for the module source directory
-sname:=ngcp-mediaproxy-ng
+sname:=ngcp-rtpengine
 
 ### KERNEL SETUP
 ### Setup the stuff needed for making kernel module packages
 ### taken from /usr/share/kernel-package/sample.module.rules
 
 # prefix of the target package name
-PACKAGE=ngcp-mediaproxy-ng-kernel-modules
+PACKAGE=ngcp-rtpengine-kernel-modules
 # modifieable for experiments or debugging m-a
 MA_DIR ?= /usr/share/modass
 # load generic variable handling
diff --git a/tests/simulator-tcp.sh b/tests/simulator-tcp.sh
index 3867904d5..ed29e1d47 100755
--- a/tests/simulator-tcp.sh
+++ b/tests/simulator-tcp.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # # ulimit -n 100000
-# # G_SLICE=always-malloc valgrind --leak-check=full --track-origins=yes --show-possibly-lost=yes ./mediaproxy-ng -t 0 -i $IP -l 25060 -f
+# # G_SLICE=always-malloc valgrind --leak-check=full --track-origins=yes --show-possibly-lost=yes ./rtpengine -t 0 -i $IP -l 25060 -f
 
 pipe_o() {
 	nc localhost 25060
diff --git a/utils/patch-kernel b/utils/patch-kernel
index 5d9e79cfd..6804267fd 100755
--- a/utils/patch-kernel
+++ b/utils/patch-kernel
@@ -38,15 +38,15 @@ if ! grep -q CONFIG_NETFILTER_XT_TARGET_MEDIAPROXY "$KERN"/net/netfilter/Makefil
 	) >> "$KERN"/net/netfilter/Makefile
 fi
 
-if ! grep -q Kconfig\\.mediaproxy-ng "$KERN"/net/netfilter/Kconfig; then
-	cat >> "$KERN"/net/netfilter/Kconfig.mediaproxy-ng << \__EOF
+if ! grep -q Kconfig\\.rtpengine "$KERN"/net/netfilter/Kconfig; then
+	cat >> "$KERN"/net/netfilter/Kconfig.rtpengine << \__EOF
 config NETFILTER_XT_TARGET_MEDIAPROXY
 	tristate "Sipwise NGCP MEDIAPROXY target support"
 	depends on IP_NF_FILTER
 	help
-	  Sipwise NGCP mediaproxy-ng kernel support
+	  Sipwise NGCP rtpengine kernel support
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 __EOF
-	echo 'source "net/netfilter/Kconfig.mediaproxy-ng"' >> "$KERN"/net/netfilter/Kconfig
+	echo 'source "net/netfilter/Kconfig.rtpengine"' >> "$KERN"/net/netfilter/Kconfig
 fi