diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am
index fef12d3..8a468a9 100644
--- a/ggsn/Makefile.am
+++ b/ggsn/Makefile.am
@@ -1,19 +1,19 @@
-bin_PROGRAMS = ggsn
+bin_PROGRAMS = osmo-ggsn
 
 AM_LDFLAGS = @EXEC_LDFLAGS@
 
 AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
-ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
+osmo_ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
 
 if ENABLE_GTP_KERNEL
 AM_CFLAGS += -DGTP_KERNEL
-ggsn_LDADD += -lgtpnl
+osmo_ggsn_LDADD += -lgtpnl
 endif
 
-ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
-ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h gtp-kernel.h icmpv6.c icmpv6.h checksum.c checksum.h
+osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
+osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h gtp-kernel.h icmpv6.c icmpv6.h checksum.c checksum.h
 
 if ENABLE_GTP_KERNEL
-ggsn_SOURCES += gtp-kernel.c
+osmo_ggsn_SOURCES += gtp-kernel.c
 endif
diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c
index ee64cb9..0b877cf 100644
--- a/ggsn/ggsn.c
+++ b/ggsn/ggsn.c
@@ -1,5 +1,5 @@
 /* 
- * OpenGGSN - Gateway GPRS Support Node
+ * OsmoGGSN - Gateway GPRS Support Node
  * Copyright (C) 2002, 2003, 2004 Mondru AB.
  * Copyright (C) 2017 by Harald Welte <laforge@gnumonks.org>
  * 
@@ -592,7 +592,7 @@
 	return tun_encaps((struct tun_t *)pdp->ipif, pack, len);
 }
 
-static char *config_file = "openggsn.cfg";
+static char *config_file = "osmo-ggsn.cfg";
 
 /* callback for tun device osmocom select loop integration */
 static int ggsn_tun_fd_cb(struct osmo_fd *fd, unsigned int what)
@@ -804,7 +804,7 @@
 	struct ggsn_ctx *ggsn;
 	int rc;
 
-	tall_ggsn_ctx = talloc_named_const(NULL, 0, "openggsn");
+	tall_ggsn_ctx = talloc_named_const(NULL, 0, "OsmoGGSN");
 	msgb_talloc_ctx_init(tall_ggsn_ctx, 0);
 
 	/* Handle keyboard interrupt SIGINT */
diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c
index f23a298..4a3e753 100644
--- a/ggsn/ggsn_vty.c
+++ b/ggsn/ggsn_vty.c
@@ -882,7 +882,7 @@
 	"There is NO WARRANTY, to the extent permitted by law.\r\n";
 
 struct vty_app_info g_vty_info = {
-	.name		= "OpenGGSN",
+	.name		= "OsmoGGSN",
 	.version	= PACKAGE_VERSION,
 	.copyright	= ggsn_copyright,
 	.go_parent_cb	= ggsn_vty_go_parent,