diff --git a/src/Makefile.am b/src/Makefile.am
index b03ee8c..32bd4d7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@
 
 # Libraries
 SUBDIRS = \
-	libcommon \
+	libgsupclient \
 	libvlr \
 	libmsc \
 	libcommon-cs \
diff --git a/src/libcommon/Makefile.am b/src/libgsupclient/Makefile.am
similarity index 83%
rename from src/libcommon/Makefile.am
rename to src/libgsupclient/Makefile.am
index fdd967f..a33fb38 100644
--- a/src/libcommon/Makefile.am
+++ b/src/libgsupclient/Makefile.am
@@ -10,16 +10,14 @@
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOVTY_CFLAGS) \
 	$(LIBOSMOABIS_CFLAGS) \
-	$(LIBOSMOSCCP_CFLAGS) \
-	$(LIBOSMOMGCPCLIENT_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
 
 noinst_LIBRARIES = \
-	libcommon.a \
+	libgsupclient.a \
 	$(NULL)
 
-libcommon_a_SOURCES = \
+libgsupclient_a_SOURCES = \
 	gsup_client.c \
 	oap_client.c \
 	$(NULL)
@@ -32,7 +30,7 @@
 	gsup_test_client.c \
 	$(NULL)
 gsup_test_client_LDADD = \
-	libcommon.a \
+	libgsupclient.a \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
diff --git a/src/libcommon/gsup_client.c b/src/libgsupclient/gsup_client.c
similarity index 100%
rename from src/libcommon/gsup_client.c
rename to src/libgsupclient/gsup_client.c
diff --git a/src/libcommon/gsup_test_client.c b/src/libgsupclient/gsup_test_client.c
similarity index 100%
rename from src/libcommon/gsup_test_client.c
rename to src/libgsupclient/gsup_test_client.c
diff --git a/src/libcommon/oap_client.c b/src/libgsupclient/oap_client.c
similarity index 100%
rename from src/libcommon/oap_client.c
rename to src/libgsupclient/oap_client.c
diff --git a/src/osmo-msc/Makefile.am b/src/osmo-msc/Makefile.am
index 1d8bfbd..1618fb5 100644
--- a/src/osmo-msc/Makefile.am
+++ b/src/osmo-msc/Makefile.am
@@ -35,7 +35,7 @@
 	$(top_builddir)/src/libmsc/libmsc.a \
 	$(top_builddir)/src/libvlr/libvlr.a \
 	$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-	$(top_builddir)/src/libcommon/libcommon.a \
+	$(top_builddir)/src/libgsupclient/libgsupclient.a \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
 	$(LIBOSMOCORE_LIBS) \
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index ad3ed3f..fad522d 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -40,7 +40,6 @@
 	$(NULL)
 
 smpp_mirror_LDADD = \
-	$(top_builddir)/src/libcommon/libcommon.a \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBSMPP34_LIBS) \