diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index e4b2b96..1a8ec64 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -2,17 +2,12 @@
 AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
 AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
 
-SUBDIRS = common abis mgcp bsc trau osmo-nitb utils ipaccess gprs
+SUBDIRS = common abis mgcp bsc trau osmo-nitb osmo-bsc_mgcp utils ipaccess gprs
 
 # Conditional modules
 if BUILD_NAT
-SUBDIRS += nat
+SUBDIRS += osmo-bsc_nat
 endif
 if BUILD_BSC
 SUBDIRS += osmo-bsc
 endif
-
-bin_PROGRAMS = bsc_mgcp
-
-bsc_mgcp_SOURCES = mgcp/mgcp_main.c
-bsc_mgcp_LDADD = common/libcommon.a mgcp/libmgcp.a $(LIBOSMOVTY_LIBS)
diff --git a/openbsc/src/osmo-bsc_mgcp/Makefile.am b/openbsc/src/osmo-bsc_mgcp/Makefile.am
new file mode 100644
index 0000000..b72c46c
--- /dev/null
+++ b/openbsc/src/osmo-bsc_mgcp/Makefile.am
@@ -0,0 +1,9 @@
+INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
+AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
+AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
+
+bin_PROGRAMS = bsc_mgcp
+
+bsc_mgcp_SOURCES = mgcp_main.c
+bsc_mgcp_LDADD = $(top_srcdir)/src/common/libcommon.a $(top_srcdir)/src/mgcp/libmgcp.a \
+		$(LIBOSMOVTY_LIBS)
diff --git a/openbsc/src/mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
similarity index 100%
rename from openbsc/src/mgcp/mgcp_main.c
rename to openbsc/src/osmo-bsc_mgcp/mgcp_main.c
diff --git a/openbsc/src/nat/Makefile.am b/openbsc/src/osmo-bsc_nat/Makefile.am
similarity index 72%
rename from openbsc/src/nat/Makefile.am
rename to openbsc/src/osmo-bsc_nat/Makefile.am
index 7ee587d..c7905ce 100644
--- a/openbsc/src/nat/Makefile.am
+++ b/openbsc/src/osmo-bsc_nat/Makefile.am
@@ -2,12 +2,12 @@
 AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS)
 AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
 
-bin_PROGRAMS = bsc_nat
+bin_PROGRAMS = osmo-bsc_nat
 
 
-bsc_nat_SOURCES = bsc_filter.c bsc_mgcp_utils.c bsc_nat.c bsc_nat_utils.c \
+osmo_bsc_nat_SOURCES = bsc_filter.c bsc_mgcp_utils.c bsc_nat.c bsc_nat_utils.c \
 		  bsc_nat_vty.c bsc_sccp.c bsc_ussd.c
-bsc_nat_LDADD = $(top_builddir)/src/common/libcommon.a \
+osmo_bsc_nat_LDADD = $(top_builddir)/src/common/libcommon.a \
 		$(top_builddir)/src/mgcp/libmgcp.a $(top_builddir)/src/bsc/libbsc.a \
 		$(top_builddir)/src/abis/libabis.a $(top_builddir)/src/trau/libtrau.a \
 		-lrt $(LIBOSMOSCCP_LIBS)
diff --git a/openbsc/src/nat/bsc_filter.c b/openbsc/src/osmo-bsc_nat/bsc_filter.c
similarity index 100%
rename from openbsc/src/nat/bsc_filter.c
rename to openbsc/src/osmo-bsc_nat/bsc_filter.c
diff --git a/openbsc/src/nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
similarity index 100%
rename from openbsc/src/nat/bsc_mgcp_utils.c
rename to openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
diff --git a/openbsc/src/nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c
similarity index 100%
rename from openbsc/src/nat/bsc_nat.c
rename to openbsc/src/osmo-bsc_nat/bsc_nat.c
diff --git a/openbsc/src/nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
similarity index 100%
rename from openbsc/src/nat/bsc_nat_utils.c
rename to openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
diff --git a/openbsc/src/nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
similarity index 100%
rename from openbsc/src/nat/bsc_nat_vty.c
rename to openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
diff --git a/openbsc/src/nat/bsc_sccp.c b/openbsc/src/osmo-bsc_nat/bsc_sccp.c
similarity index 100%
rename from openbsc/src/nat/bsc_sccp.c
rename to openbsc/src/osmo-bsc_nat/bsc_sccp.c
diff --git a/openbsc/src/nat/bsc_ussd.c b/openbsc/src/osmo-bsc_nat/bsc_ussd.c
similarity index 100%
rename from openbsc/src/nat/bsc_ussd.c
rename to openbsc/src/osmo-bsc_nat/bsc_ussd.c