diff --git a/debian/osmo-pcap-client.init b/debian/osmo-pcap-client.init
index 29a51e6..6bfee7a 100755
--- a/debian/osmo-pcap-client.init
+++ b/debian/osmo-pcap-client.init
@@ -15,7 +15,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC=osmo-pcap-client             # Introduce a short description here
 NAME=osmo-pcap-client             # Introduce the short server's name here
-DAEMON=/usr/bin/osmo_pcap_client # Introduce the server's location here
+DAEMON=/usr/bin/osmo-pcap-client # Introduce the server's location here
 DAEMON_ARGS="-c /etc/osmo-pcap/osmo-pcap-client.cfg"  # Arguments to run the daemon with
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
diff --git a/debian/osmo-pcap-client.install b/debian/osmo-pcap-client.install
index a1f9f59..f149b14 100644
--- a/debian/osmo-pcap-client.install
+++ b/debian/osmo-pcap-client.install
@@ -1 +1 @@
-usr/bin/osmo_pcap_client
+usr/bin/osmo-pcap-client
diff --git a/debian/osmo-pcap-server.install b/debian/osmo-pcap-server.install
index 1157484..ad58c8e 100644
--- a/debian/osmo-pcap-server.install
+++ b/debian/osmo-pcap-server.install
@@ -1 +1 @@
-usr/bin/osmo_pcap_server
+usr/bin/osmo-pcap-server
diff --git a/osmoappdesc.py b/osmoappdesc.py
index 6f66702..2be96db 100644
--- a/osmoappdesc.py
+++ b/osmoappdesc.py
@@ -20,11 +20,11 @@ app_configs = {
 }
 
 apps = [
-    (4238, "src/osmo_pcap_server", "OsmoPCAPServer", "osmo-pcap-server"),
-    (4237, "src/osmo_pcap_client", "OsmoPCAPClient", "osmo-pcap-client"),
+    (4238, "src/osmo-pcap-server", "OsmoPCAPServer", "osmo-pcap-server"),
+    (4237, "src/osmo-pcap-client", "OsmoPCAPClient", "osmo-pcap-client"),
         ]
 
-vty_command = ["src/osmo_pcap_server", "-c", "contrib/osmo-pcap-server.cfg"]
+vty_command = ["src/osmo-pcap-server", "-c", "contrib/osmo-pcap-server.cfg"]
 vty_app = apps[0]
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0532acf..17ed4e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/
 AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(PCAP_CFLAGS) $(LIBGNUTLS_CFLAGS)
 
-bin_PROGRAMS = osmo_pcap_client osmo_pcap_server
+bin_PROGRAMS = osmo-pcap-client osmo-pcap-server
 
 osmo_pcap_client_SOURCES = osmo_client_main.c osmo_common.c \
 			   osmo_client_core.c osmo_client_vty.c \