diff --git a/configure.ac b/configure.ac
index e8ae88c0b..3d0028230 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ AC_OUTPUT(
     src/Makefile
     src/libmsc/Makefile
     src/libvlr/Makefile
-    src/libcommon/Makefile
+    src/libgsupclient/Makefile
     src/libcommon-cs/Makefile
     src/osmo-msc/Makefile
     src/utils/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index b03ee8c93..32bd4d79b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ AM_LDFLAGS = \
 
 # 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 fdd967fb7..a33fb38fa 100644
--- a/src/libcommon/Makefile.am
+++ b/src/libgsupclient/Makefile.am
@@ -10,16 +10,14 @@ AM_CFLAGS = \
 	$(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_SOURCES = \
 	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 1d8bfbd59..1618fb54a 100644
--- a/src/osmo-msc/Makefile.am
+++ b/src/osmo-msc/Makefile.am
@@ -35,7 +35,7 @@ osmo_msc_LDADD = \
 	$(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 ad3ed3fb1..fad522df1 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -40,7 +40,6 @@ smpp_mirror_CFLAGS = \
 	$(NULL)
 
 smpp_mirror_LDADD = \
-	$(top_builddir)/src/libcommon/libcommon.a \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBSMPP34_LIBS) \
diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am
index 720e00506..d6b162218 100644
--- a/tests/db/Makefile.am
+++ b/tests/db/Makefile.am
@@ -35,7 +35,6 @@ db_test_LDADD = \
 	$(top_builddir)/src/libmsc/libmsc.a \
 	$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
 	$(top_builddir)/src/libtrau/libtrau.a \
-	$(top_builddir)/src/libcommon/libcommon.a \
 	$(top_builddir)/tests/libiudummy/libiudummy.a \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOABIS_LIBS) \
diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am
index 8194f222b..ab2139be4 100644
--- a/tests/msc_vlr/Makefile.am
+++ b/tests/msc_vlr/Makefile.am
@@ -40,7 +40,7 @@ LDADD = \
 	$(top_builddir)/src/libmsc/libmsc.a \
 	$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
 	$(top_builddir)/src/libvlr/libvlr.a \
-	$(top_builddir)/src/libcommon/libcommon.a \
+	$(top_builddir)/src/libgsupclient/libgsupclient.a \
 	$(LIBSMPP34_LIBS) \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
diff --git a/tests/smpp/Makefile.am b/tests/smpp/Makefile.am
index 508270753..8d631198c 100644
--- a/tests/smpp/Makefile.am
+++ b/tests/smpp/Makefile.am
@@ -34,7 +34,6 @@ smpp_test_SOURCES = \
 	$(NULL)
 
 smpp_test_LDADD = \
-	$(top_builddir)/src/libcommon/libcommon.a \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(NULL)
diff --git a/tests/sms_queue/Makefile.am b/tests/sms_queue/Makefile.am
index 8c538b00a..02bc3f207 100644
--- a/tests/sms_queue/Makefile.am
+++ b/tests/sms_queue/Makefile.am
@@ -32,7 +32,7 @@ sms_queue_test_SOURCES = \
 sms_queue_test_LDADD = \
 	$(top_builddir)/src/libmsc/libmsc.a \
 	$(top_builddir)/src/libvlr/libvlr.a \
-	$(top_builddir)/src/libcommon/libcommon.a \
+	$(top_builddir)/src/libgsupclient/libgsupclient.a \
 	$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
 	$(LIBSMPP34_LIBS) \
 	$(LIBOSMOCORE_LIBS) \