diff --git a/Makefile b/Makefile
index de5610f..1c3f26b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-BIN=mediator
+BIN=ngcp-mediator
 
 VERSION := $(shell sed -n -e '1s/^.*(\(.*\)).*$$/\1/p' debian/changelog)
 
diff --git a/debian/ngcp-mediator.conf b/debian/ngcp-mediator.conf
index dc5338a..df42aed 100644
--- a/debian/ngcp-mediator.conf
+++ b/debian/ngcp-mediator.conf
@@ -1,5 +1,5 @@
 loglevel=6
-pidfile=/run/mediator.pid
+pidfile=/run/ngcp-mediator.pid
 interval=10
 med-host=localhost
 med-port=3306
diff --git a/debian/ngcp-mediator.install b/debian/ngcp-mediator.install
index 000ae49..9d08ed8 100644
--- a/debian/ngcp-mediator.install
+++ b/debian/ngcp-mediator.install
@@ -1,2 +1,2 @@
 debian/ngcp-mediator.conf etc/ngcp-mediator/
-mediator usr/bin/
+ngcp-mediator usr/bin/
diff --git a/debian/ngcp-mediator.lintian-overrides b/debian/ngcp-mediator.lintian-overrides
index a284469..c2b7545 100644
--- a/debian/ngcp-mediator.lintian-overrides
+++ b/debian/ngcp-mediator.lintian-overrides
@@ -1,2 +1,2 @@
-ngcp-mediator: binary-without-manpage usr/bin/mediator
+ngcp-mediator: binary-without-manpage usr/bin/ngcp-mediator
 ngcp-mediator: init.d-script-not-included-in-package etc/init.d/ngcp-mediator
diff --git a/debian/ngcp-mediator.service b/debian/ngcp-mediator.service
index c5645e0..6657e0b 100644
--- a/debian/ngcp-mediator.service
+++ b/debian/ngcp-mediator.service
@@ -8,7 +8,7 @@ Wants=redis-server.service
 
 [Service]
 Type=notify
-ExecStart=/usr/bin/mediator
+ExecStart=/usr/bin/ngcp-mediator
 
 [Install]
 WantedBy=multi-user.target