diff --git a/mms-ofono/Makefile b/mms-connman-ofono/Makefile
similarity index 96%
rename from mms-ofono/Makefile
rename to mms-connman-ofono/Makefile
index 1c19e0e..80d3802 100644
--- a/mms-ofono/Makefile
+++ b/mms-connman-ofono/Makefile
@@ -16,8 +16,8 @@ all: debug release
 #
 
 SRC = \
-  mms_ofono_connection.c \
-  mms_ofono_connman.c
+  mms_connection_ofono.c \
+  mms_connman_ofono.c
 
 #
 # Directories
@@ -82,7 +82,7 @@ $(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
 #
 # Rules
 #
-LIB = libmms-ofono.a
+LIB = libmms-connman-ofono.a
 DEBUG_LIB = $(DEBUG_BUILD_DIR)/$(LIB)
 RELEASE_LIB = $(RELEASE_BUILD_DIR)/$(LIB)
 
diff --git a/mms-ofono/include/mms_ofono_connman.h b/mms-connman-ofono/include/mms_connman_ofono.h
similarity index 95%
rename from mms-ofono/include/mms_ofono_connman.h
rename to mms-connman-ofono/include/mms_connman_ofono.h
index 3425d2d..4b32198 100644
--- a/mms-ofono/include/mms_ofono_connman.h
+++ b/mms-connman-ofono/include/mms_connman_ofono.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Jolla Ltd.
+ * Copyright (C) 2013-2016 Jolla Ltd.
  * Contact: Slava Monich <slava.monich@jolla.com>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/mms-ofono/include/mms_ofono_log.h b/mms-connman-ofono/include/mms_connman_ofono_log.h
similarity index 72%
rename from mms-ofono/include/mms_ofono_log.h
rename to mms-connman-ofono/include/mms_connman_ofono_log.h
index 3a30de9..e5052cf 100644
--- a/mms-ofono/include/mms_ofono_log.h
+++ b/mms-connman-ofono/include/mms_connman_ofono_log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Jolla Ltd.
+ * Copyright (C) 2013-2016 Jolla Ltd.
  * Contact: Slava Monich <slava.monich@jolla.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -13,17 +13,17 @@
  *
  */
 
-#ifndef JOLLA_MMS_OFONO_LOG_H
-#define JOLLA_MMS_OFONO_LOG_H
+#ifndef JOLLA_MMS_CONNMAN_OFONO_LOG_H
+#define JOLLA_MMS_CONNMAN_OFONO_LOG_H
 
 #include "mms_log.h"
 
-#define MMS_OFONO_LOG_MODULES(log) \
+#define MMS_CONNMAN_LOG_MODULES(log) \
     log(gofono_log)
 
-MMS_OFONO_LOG_MODULES(GLOG_MODULE_DECL)
+MMS_CONNMAN_LOG_MODULES(GLOG_MODULE_DECL)
 
-#endif /* JOLLA_MMS_OFONO_LOG_H */
+#endif /* JOLLA_MMS_CONNMAN_OFONO_LOG_H */
 
 /*
  * Local Variables:
diff --git a/mms-ofono/mms-ofono.pro b/mms-connman-ofono/mms-connman-ofono.pro
similarity index 72%
rename from mms-ofono/mms-ofono.pro
rename to mms-connman-ofono/mms-connman-ofono.pro
index 0f4863d..a0f07f3 100644
--- a/mms-ofono/mms-ofono.pro
+++ b/mms-connman-ofono/mms-connman-ofono.pro
@@ -16,13 +16,12 @@ CONFIG(debug, debug|release) {
 }
 
 SOURCES += \
-  src/mms_ofono_connection.c \
-  src/mms_ofono_connman.c
+  src/mms_connection_ofono.c \
+  src/mms_connman_ofono.c
 
 HEADERS += \
-  src/mms_ofono_connection.h \
-  src/mms_ofono_context.h
+  src/mms_connection_ofono.h
 
 HEADERS += \
-  include/mms_ofono_connman.h \
-  include/mms_ofono_log.h
+  include/mms_connman_ofono.h \
+  include/mms_connman_ofono_log.h
diff --git a/mms-ofono/src/mms_ofono_connection.c b/mms-connman-ofono/src/mms_connection_ofono.c
similarity index 70%
rename from mms-ofono/src/mms_ofono_connection.c
rename to mms-connman-ofono/src/mms_connection_ofono.c
index 5dedebc..5ba6ec1 100644
--- a/mms-ofono/src/mms_ofono_connection.c
+++ b/mms-connman-ofono/src/mms_connection_ofono.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Jolla Ltd.
+ * Copyright (C) 2013-2016 Jolla Ltd.
  * Contact: Slava Monich <slava.monich@jolla.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -13,15 +13,15 @@
  *
  */
 
-#include "mms_ofono_connection.h"
+#include "mms_connection_ofono.h"
 
 #include <gofono_connctx.h>
 #include <gofono_simmgr.h>
 
 /* Logging */
 #define MMS_LOG_MODULE_NAME mms_connection_log
-#include "mms_ofono_log.h"
-MMS_LOG_MODULE_DEFINE("mms-ofono-connection");
+#include "mms_connman_ofono_log.h"
+MMS_LOG_MODULE_DEFINE("mms-connection-ofono");
 
 enum context_handler_id {
     CONTEXT_HANDLER_ACTIVATE_FAILED,
@@ -38,25 +38,25 @@ enum sim_handler_id {
     SIM_HANDLER_COUNT
 };
 
-typedef struct mms_ofono_connection {
+typedef struct mms_connection_ofono {
     MMSConnection connection;
     OfonoSimMgr* sim;
     OfonoConnCtx* context;
     gulong context_handler_id[CONTEXT_HANDLER_COUNT];
     gulong sim_handler_id[SIM_HANDLER_COUNT];
     char* imsi;
-} MMSOfonoConnection;
+} MMSConnectionOfono;
 
-typedef MMSConnectionClass MMSOfonoConnectionClass;
-G_DEFINE_TYPE(MMSOfonoConnection, mms_ofono_connection, MMS_TYPE_CONNECTION)
-#define MMS_TYPE_OFONO_CONNECTION (mms_ofono_connection_get_type())
-#define MMS_OFONO_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
-   MMS_TYPE_OFONO_CONNECTION, MMSOfonoConnection))
+typedef MMSConnectionClass MMSConnectionOfonoClass;
+G_DEFINE_TYPE(MMSConnectionOfono, mms_connection_ofono, MMS_TYPE_CONNECTION)
+#define MMS_TYPE_CONNECTION_OFONO (mms_connection_ofono_get_type())
+#define MMS_CONNECTION_OFONO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
+   MMS_TYPE_CONNECTION_OFONO, MMSConnectionOfono))
 
 static
 void
-mms_connection_desconnect_handlers(
-    MMSOfonoConnection* self)
+mms_connection_ofono_disconnect(
+    MMSConnectionOfono* self)
 {
     ofono_connctx_remove_handlers(self->context,
         self->context_handler_id, CONTEXT_HANDLER_COUNT);
@@ -66,8 +66,8 @@ mms_connection_desconnect_handlers(
 
 static
 gboolean
-mms_ofono_connection_set_state(
-    MMSOfonoConnection* self,
+mms_connection_ofono_set_state(
+    MMSConnectionOfono* self,
     MMS_CONNECTION_STATE state)
 {
     if (self->connection.state != state) {
@@ -82,7 +82,7 @@ mms_ofono_connection_set_state(
         if (state == MMS_CONNECTION_STATE_FAILED ||
             state == MMS_CONNECTION_STATE_CLOSED) {
             /* Stop listening for property changes */
-            mms_connection_desconnect_handlers(self);
+            mms_connection_ofono_disconnect(self);
         }
         self->connection.state = state;
         mms_connection_signal_state_change(&self->connection);
@@ -92,39 +92,39 @@ mms_ofono_connection_set_state(
 
 static
 void
-mms_ofono_connection_cancel(
-    MMSOfonoConnection* self)
+mms_connection_ofono_cancel(
+    MMSConnectionOfono* self)
 {
     if (self->connection.state <= MMS_CONNECTION_STATE_OPENING) {
-        mms_ofono_connection_set_state(self, MMS_CONNECTION_STATE_FAILED);
+        mms_connection_ofono_set_state(self, MMS_CONNECTION_STATE_FAILED);
     } else {
-        mms_ofono_connection_set_state(self, MMS_CONNECTION_STATE_CLOSED);
+        mms_connection_ofono_set_state(self, MMS_CONNECTION_STATE_CLOSED);
     }
 }
 
 static
 void
-mms_ofono_connection_active_changed(
+mms_connection_ofono_active_changed(
     OfonoConnCtx* context,
     void* arg)
 {
-    MMSOfonoConnection* self = MMS_OFONO_CONNECTION(arg);
+    MMSConnectionOfono* self = MMS_CONNECTION_OFONO(arg);
     MMS_ASSERT(self->context == context);
     if (context->active) {
         MMS_DEBUG("Connection %s opened", self->connection.imsi);
-        mms_ofono_connection_set_state(self, MMS_CONNECTION_STATE_OPEN);
+        mms_connection_ofono_set_state(self, MMS_CONNECTION_STATE_OPEN);
     } else {
-        mms_ofono_connection_set_state(self, MMS_CONNECTION_STATE_CLOSED);
+        mms_connection_ofono_set_state(self, MMS_CONNECTION_STATE_CLOSED);
     }
 }
 
 static
 void
-mms_ofono_connection_interface_changed(
+mms_connection_ofono_interface_changed(
     OfonoConnCtx* context,
     void* arg)
 {
-    MMSOfonoConnection* self = MMS_OFONO_CONNECTION(arg);
+    MMSConnectionOfono* self = MMS_CONNECTION_OFONO(arg);
     MMS_ASSERT(self->context == context);
     if (context->ifname) {
         self->connection.netif = context->ifname;
@@ -136,11 +136,11 @@ mms_ofono_connection_interface_changed(
 
 static
 void
-mms_ofono_connection_mms_proxy_changed(
+mms_connection_ofono_mms_proxy_changed(
     OfonoConnCtx* context,
     void* arg)
 {
-    MMSOfonoConnection* self = MMS_OFONO_CONNECTION(arg);
+    MMSConnectionOfono* self = MMS_CONNECTION_OFONO(arg);
     MMS_ASSERT(self->context == context);
     if (context->mms_proxy) {
         self->connection.mmsproxy = context->mms_proxy;
@@ -152,11 +152,11 @@ mms_ofono_connection_mms_proxy_changed(
 
 static
 void
-mms_ofono_connection_mms_center_changed(
+mms_connection_ofono_mms_center_changed(
     OfonoConnCtx* context,
     void* arg)
 {
-    MMSOfonoConnection* self = MMS_OFONO_CONNECTION(arg);
+    MMSConnectionOfono* self = MMS_CONNECTION_OFONO(arg);
     MMS_ASSERT(self->context == context);
     if (context->mms_center) {
         self->connection.mmsc = context->mms_center;
@@ -168,52 +168,52 @@ mms_ofono_connection_mms_center_changed(
 
 static
 void
-mms_ofono_connection_imsi_changed(
+mms_connection_ofono_imsi_changed(
     OfonoSimMgr* sim,
     void* arg)
 {
-    MMSOfonoConnection* self = MMS_OFONO_CONNECTION(arg);
+    MMSConnectionOfono* self = MMS_CONNECTION_OFONO(arg);
     MMS_ASSERT(self->sim == sim);
     if (g_strcmp0(sim->imsi, self->connection.imsi)) {
         MMS_DEBUG_("%s", sim->imsi);
-        mms_ofono_connection_cancel(self);
+        mms_connection_ofono_cancel(self);
     }
 }
 
 static
 void
-mms_ofono_connection_present_changed(
+mms_connection_ofono_present_changed(
     OfonoSimMgr* sim,
     void* arg)
 {
-    MMSOfonoConnection* self = MMS_OFONO_CONNECTION(arg);
+    MMSConnectionOfono* self = MMS_CONNECTION_OFONO(arg);
     MMS_ASSERT(self->sim == sim);
     MMS_DEBUG_("%s", sim->present ? "true" : "false");
     if (!sim->present) {
         MMS_DEBUG_("%s", sim->imsi);
-        mms_ofono_connection_cancel(self);
+        mms_connection_ofono_cancel(self);
     }
 }
 
 static
 void
-mms_ofono_connection_activate_failed(
+mms_connection_ofono_activate_failed(
     OfonoConnCtx* context,
     const GError* error,
     void* arg)
 {
-    MMSOfonoConnection* self = MMS_OFONO_CONNECTION(arg);
+    MMSConnectionOfono* self = MMS_CONNECTION_OFONO(arg);
     MMS_ASSERT(self->context == context);
-    mms_ofono_connection_cancel(self);
+    mms_connection_ofono_cancel(self);
 }
 
 MMSConnection*
-mms_ofono_connection_new(
+mms_connection_ofono_new(
     OfonoSimMgr* sim,
     OfonoConnCtx* context,
     gboolean user_request)
 {
-    MMSOfonoConnection* self = g_object_new(MMS_TYPE_OFONO_CONNECTION, NULL);
+    MMSConnectionOfono* self = g_object_new(MMS_TYPE_CONNECTION_OFONO, NULL);
     MMSConnection* conn = &self->connection;
 
     MMS_ASSERT(ofono_simmgr_valid(sim));
@@ -243,36 +243,36 @@ mms_ofono_connection_new(
     /* Listen for property changes */
     self->context_handler_id[CONTEXT_HANDLER_ACTIVATE_FAILED] =
         ofono_connctx_add_activate_failed_handler(context,
-        mms_ofono_connection_activate_failed, self);
+        mms_connection_ofono_activate_failed, self);
     self->context_handler_id[CONTEXT_HANDLER_ACTIVE_CHANGED] =
         ofono_connctx_add_active_changed_handler(context,
-        mms_ofono_connection_active_changed, self);
+        mms_connection_ofono_active_changed, self);
     self->context_handler_id[CONTEXT_HANDLER_INTERFACE_CHANGED] =
         ofono_connctx_add_interface_changed_handler(context,
-        mms_ofono_connection_interface_changed, self);
+        mms_connection_ofono_interface_changed, self);
     self->context_handler_id[CONTEXT_HANDLER_MMS_PROXY] =
         ofono_connctx_add_mms_proxy_changed_handler(context,
-        mms_ofono_connection_mms_proxy_changed, self);
+        mms_connection_ofono_mms_proxy_changed, self);
     self->context_handler_id[CONTEXT_HANDLER_MMS_CENTER] =
         ofono_connctx_add_mms_center_changed_handler(context,
-        mms_ofono_connection_mms_center_changed, self);
+        mms_connection_ofono_mms_center_changed, self);
 
     self->sim_handler_id[SIM_HANDLER_IMSI_CHANGED] =
         ofono_simmgr_add_imsi_changed_handler(sim,
-        mms_ofono_connection_imsi_changed, self);
+        mms_connection_ofono_imsi_changed, self);
     self->sim_handler_id[SIM_HANDLER_PRESENT_CHANGED] =
         ofono_simmgr_add_present_changed_handler(sim,
-        mms_ofono_connection_present_changed, self);
+        mms_connection_ofono_present_changed, self);
 
     return &self->connection;
 }
 
 static
 void
-mms_ofono_connection_close(
+mms_connection_ofono_close(
     MMSConnection* connection)
 {
-    MMSOfonoConnection* self = MMS_OFONO_CONNECTION(connection);
+    MMSConnectionOfono* self = MMS_CONNECTION_OFONO(connection);
     ofono_connctx_deactivate(self->context);
 }
 
@@ -282,13 +282,13 @@ mms_ofono_connection_close(
  */
 static
 void
-mms_ofono_connection_dispose(
+mms_connection_ofono_dispose(
     GObject* object)
 {
-    MMSOfonoConnection* self = MMS_OFONO_CONNECTION(object);
+    MMSConnectionOfono* self = MMS_CONNECTION_OFONO(object);
     MMS_VERBOSE_("%p %s", self, self->imsi);
     MMS_ASSERT(!mms_connection_is_active(&self->connection));
-    mms_connection_desconnect_handlers(self);
+    mms_connection_ofono_disconnect(self);
     if (self->sim) {
         ofono_simmgr_unref(self->sim);
         self->sim = NULL;
@@ -302,7 +302,7 @@ mms_ofono_connection_dispose(
         self->context = NULL;
     }
     self->connection.netif = NULL;
-    G_OBJECT_CLASS(mms_ofono_connection_parent_class)->dispose(object);
+    G_OBJECT_CLASS(mms_connection_ofono_parent_class)->dispose(object);
 }
 
 /**
@@ -310,13 +310,13 @@ mms_ofono_connection_dispose(
  */
 static
 void
-mms_ofono_connection_finalize(
+mms_connection_ofono_finalize(
     GObject* object)
 {
-    MMSOfonoConnection* self = MMS_OFONO_CONNECTION(object);
+    MMSConnectionOfono* self = MMS_CONNECTION_OFONO(object);
     MMS_VERBOSE_("%p %s", self, self->imsi);
     g_free(self->imsi);
-    G_OBJECT_CLASS(mms_ofono_connection_parent_class)->finalize(object);
+    G_OBJECT_CLASS(mms_connection_ofono_parent_class)->finalize(object);
 }
 
 /**
@@ -324,13 +324,13 @@ mms_ofono_connection_finalize(
  */
 static
 void
-mms_ofono_connection_class_init(
-    MMSOfonoConnectionClass* klass)
+mms_connection_ofono_class_init(
+    MMSConnectionOfonoClass* klass)
 {
     GObjectClass* object_class = G_OBJECT_CLASS(klass);
-    klass->fn_close = mms_ofono_connection_close;
-    object_class->dispose = mms_ofono_connection_dispose;
-    object_class->finalize = mms_ofono_connection_finalize;
+    klass->fn_close = mms_connection_ofono_close;
+    object_class->dispose = mms_connection_ofono_dispose;
+    object_class->finalize = mms_connection_ofono_finalize;
 }
 
 /**
@@ -338,8 +338,8 @@ mms_ofono_connection_class_init(
  */
 static
 void
-mms_ofono_connection_init(
-    MMSOfonoConnection* self)
+mms_connection_ofono_init(
+    MMSConnectionOfono* self)
 {
     MMS_VERBOSE_("%p", self);
 }
diff --git a/mms-ofono/src/mms_ofono_connection.h b/mms-connman-ofono/src/mms_connection_ofono.h
similarity index 93%
rename from mms-ofono/src/mms_ofono_connection.h
rename to mms-connman-ofono/src/mms_connection_ofono.h
index bcfc359..6d35efa 100644
--- a/mms-ofono/src/mms_ofono_connection.h
+++ b/mms-connman-ofono/src/mms_connection_ofono.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Jolla Ltd.
+ * Copyright (C) 2013-2016 Jolla Ltd.
  * Contact: Slava Monich <slava.monich@jolla.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 #include <gofono_types.h>
 
 MMSConnection*
-mms_ofono_connection_new(
+mms_connection_ofono_new(
     OfonoSimMgr* sim,
     OfonoConnCtx* context,
     gboolean user_request);
diff --git a/mms-ofono/src/mms_ofono_connman.c b/mms-connman-ofono/src/mms_connman_ofono.c
similarity index 77%
rename from mms-ofono/src/mms_ofono_connman.c
rename to mms-connman-ofono/src/mms_connman_ofono.c
index 03de748..a3407d4 100644
--- a/mms-ofono/src/mms_ofono_connman.c
+++ b/mms-connman-ofono/src/mms_connman_ofono.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Jolla Ltd.
+ * Copyright (C) 2013-2016 Jolla Ltd.
  * Contact: Slava Monich <slava.monich@jolla.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -13,8 +13,8 @@
  *
  */
 
-#include "mms_ofono_connman.h"
-#include "mms_ofono_connection.h"
+#include "mms_connman_ofono.h"
+#include "mms_connection_ofono.h"
 
 #include <gofono_manager.h>
 #include <gofono_connmgr.h>
@@ -24,8 +24,8 @@
 
 /* Logging */
 #define MMS_LOG_MODULE_NAME mms_connman_log
-#include "mms_ofono_log.h"
-MMS_LOG_MODULE_DEFINE("mms-ofono-connman");
+#include "mms_connman_ofono_log.h"
+MMS_LOG_MODULE_DEFINE("mms-connman-ofono");
 
 enum manager_handler_id {
     MANAGER_HANDLER_VALID_CHANGED,
@@ -48,19 +48,19 @@ typedef struct mms_ofono_modem {
     gulong simmgr_handler_id[SIMMGR_HANDLER_COUNT];
 } MMSOfonoModem;
 
-typedef MMSConnManClass MMSOfonoConnManClass;
-typedef struct mms_ofono_connman {
+typedef MMSConnManClass MMSConnManOfonoClass;
+typedef struct mms_connman_ofono {
     MMSConnMan cm;
     GHashTable* modems;
     MMSOfonoModem* default_modem;
     OfonoManager* manager;
     gulong manager_handler_id[MANAGER_HANDLER_COUNT];
-} MMSOfonoConnMan;
+} MMSConnManOfono;
 
-G_DEFINE_TYPE(MMSOfonoConnMan, mms_ofono_connman, MMS_TYPE_CONNMAN)
-#define MMS_TYPE_OFONO_CONNMAN (mms_ofono_connman_get_type())
-#define MMS_OFONO_CONNMAN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
-    MMS_TYPE_OFONO_CONNMAN, MMSOfonoConnMan))
+G_DEFINE_TYPE(MMSConnManOfono, mms_connman_ofono, MMS_TYPE_CONNMAN)
+#define MMS_TYPE_CONNMAN_OFONO (mms_connman_ofono_get_type())
+#define MMS_CONNMAN_OFONO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
+    MMS_TYPE_CONNMAN_OFONO, MMSConnManOfono))
 
 #define MMS_OFONO_TIMEOUT (30000)
 
@@ -69,8 +69,8 @@ G_DEFINE_TYPE(MMSOfonoConnMan, mms_ofono_connman, MMS_TYPE_CONNMAN)
  */
 static
 void
-mms_ofono_connman_wait_valid(
-    MMSOfonoConnMan* self)
+mms_connman_ofono_wait_valid(
+    MMSConnManOfono* self)
 {
     GError* error = NULL;
     if (ofono_manager_wait_valid(self->manager, MMS_OFONO_TIMEOUT, &error)) {
@@ -107,11 +107,11 @@ mms_ofono_connman_wait_valid(
  */
 static
 MMSOfonoModem*
-mms_ofono_connman_modem_for_imsi(
-    MMSOfonoConnMan* self,
+mms_connman_ofono_modem_for_imsi(
+    MMSConnManOfono* self,
     const char* imsi)
 {
-    mms_ofono_connman_wait_valid(self);
+    mms_connman_ofono_wait_valid(self);
     if (imsi) {
         GHashTableIter iter;
         gpointer key, value;
@@ -147,11 +147,11 @@ mms_ofono_connman_modem_for_imsi(
  */
 static
 char*
-mms_ofono_connman_default_imsi(
+mms_connman_ofono_default_imsi(
     MMSConnMan* cm)
 {
-    MMSOfonoConnMan* self = MMS_OFONO_CONNMAN(cm);
-    mms_ofono_connman_wait_valid(self);
+    MMSConnManOfono* self = MMS_CONNMAN_OFONO(cm);
+    mms_connman_ofono_wait_valid(self);
     if (self->default_modem &&
         self->default_modem->simmgr &&
         self->default_modem->simmgr->imsi &&
@@ -166,11 +166,11 @@ mms_ofono_connman_default_imsi(
  */
 static
 void
-mms_ofono_connman_connection_gone(
+mms_connman_ofono_connection_gone(
     gpointer arg,
     GObject* connection)
 {
-    MMSOfonoConnMan* self = MMS_OFONO_CONNMAN(arg);
+    MMSConnManOfono* self = MMS_CONNMAN_OFONO(arg);
     GHashTableIter it;
     gpointer value;
     g_hash_table_iter_init(&it, self->modems);
@@ -191,13 +191,13 @@ mms_ofono_connman_connection_gone(
  */
 static
 MMSConnection*
-mms_ofono_connman_open_connection(
+mms_connman_ofono_open_connection(
     MMSConnMan* cm,
     const char* imsi,
     gboolean user_request)
 {
-    MMSOfonoConnMan* self = MMS_OFONO_CONNMAN(cm);
-    MMSOfonoModem* modem = mms_ofono_connman_modem_for_imsi(self, imsi);
+    MMSConnManOfono* self = MMS_CONNMAN_OFONO(cm);
+    MMSOfonoModem* modem = mms_connman_ofono_modem_for_imsi(self, imsi);
     if (modem) {
         OfonoConnCtx* ctx = ofono_connmgr_get_context_for_type(modem->connmgr,
             OFONO_CONNCTX_TYPE_MMS);
@@ -205,10 +205,10 @@ mms_ofono_connman_open_connection(
             if (modem->conn) {
                 mms_connection_ref(modem->conn);
             } else {
-                modem->conn = mms_ofono_connection_new(modem->simmgr, ctx,
+                modem->conn = mms_connection_ofono_new(modem->simmgr, ctx,
                     user_request);
                 g_object_weak_ref(G_OBJECT(modem->conn),
-                    mms_ofono_connman_connection_gone, self);
+                    mms_connman_ofono_connection_gone, self);
             }
             if (!ctx->active) {
                 ofono_connctx_activate(ctx);
@@ -223,8 +223,8 @@ mms_ofono_connman_open_connection(
 
 static
 void
-mms_ofono_connman_select_default_modem(
-    MMSOfonoConnMan* self)
+mms_connman_ofono_select_default_modem(
+    MMSConnManOfono* self)
 {
     MMSOfonoModem* context = NULL;
     GHashTableIter iter;
@@ -257,13 +257,13 @@ mms_ofono_simmgr_changed(
     OfonoSimMgr* sender,
     void* arg)
 {
-    mms_ofono_connman_select_default_modem(MMS_OFONO_CONNMAN(arg));
+    mms_connman_ofono_select_default_modem(MMS_CONNMAN_OFONO(arg));
 }
 
 static
 void
-mms_ofono_connman_add_modem(
-    MMSOfonoConnMan* self,
+mms_connman_ofono_add_modem(
+    MMSConnManOfono* self,
     OfonoModem* modem)
 {
     MMSOfonoModem* context = g_new0(MMSOfonoModem,1);
@@ -282,58 +282,58 @@ mms_ofono_connman_add_modem(
 
 static
 void
-mms_ofono_connman_modem_added(
+mms_connman_ofono_modem_added(
     OfonoManager* manager,
     OfonoModem* modem,
     void* arg)
 {
     if (manager->valid) {
-        MMSOfonoConnMan* self = MMS_OFONO_CONNMAN(arg);
+        MMSConnManOfono* self = MMS_CONNMAN_OFONO(arg);
         MMS_ASSERT(manager == self->manager);
-        mms_ofono_connman_add_modem(self, modem);
-        mms_ofono_connman_select_default_modem(self);
+        mms_connman_ofono_add_modem(self, modem);
+        mms_connman_ofono_select_default_modem(self);
     }
 }
 
 static
 void
-mms_ofono_connman_modem_removed(
+mms_connman_ofono_modem_removed(
     OfonoManager* manager,
     const char* path,
     void* arg)
 {
     if (manager->valid) {
-        MMSOfonoConnMan* self = MMS_OFONO_CONNMAN(arg);
+        MMSConnManOfono* self = MMS_CONNMAN_OFONO(arg);
         MMS_ASSERT(manager == self->manager);
         g_hash_table_remove(self->modems, path);
-        mms_ofono_connman_select_default_modem(self);
+        mms_connman_ofono_select_default_modem(self);
     }
 }
 
 static
 void
-mms_ofono_connman_init_modems(
-    MMSOfonoConnMan* self)
+mms_connman_ofono_init_modems(
+    MMSConnManOfono* self)
 {
     guint i;
     GPtrArray* modems = ofono_manager_get_modems(self->manager);
     for (i=0; i<modems->len; i++) {
-        mms_ofono_connman_add_modem(self, OFONO_MODEM(modems->pdata[i]));
+        mms_connman_ofono_add_modem(self, OFONO_MODEM(modems->pdata[i]));
     }
-    mms_ofono_connman_select_default_modem(self);
+    mms_connman_ofono_select_default_modem(self);
     g_ptr_array_unref(modems);
 }
 
 static
 void
-mms_ofono_connman_valid_changed(
+mms_connman_ofono_valid_changed(
     OfonoManager* manager,
     void* arg)
 {
-    MMSOfonoConnMan* self = MMS_OFONO_CONNMAN(arg);
+    MMSConnManOfono* self = MMS_CONNMAN_OFONO(arg);
     MMS_ASSERT(manager == self->manager);
     if (manager->valid) {
-        mms_ofono_connman_init_modems(self);
+        mms_connman_ofono_init_modems(self);
     } else {
         self->default_modem = NULL;
         g_hash_table_remove_all(self->modems);
@@ -346,18 +346,18 @@ mms_ofono_connman_valid_changed(
 MMSConnMan*
 mms_connman_ofono_new()
 {
-    MMSOfonoConnMan* self = g_object_new(MMS_TYPE_OFONO_CONNMAN, NULL);
+    MMSConnManOfono* self = g_object_new(MMS_TYPE_CONNMAN_OFONO, NULL);
     self->manager = ofono_manager_new();
     self->manager_handler_id[MANAGER_HANDLER_VALID_CHANGED] =
         ofono_manager_add_valid_changed_handler(self->manager,
-            mms_ofono_connman_valid_changed, self);
+            mms_connman_ofono_valid_changed, self);
     self->manager_handler_id[MANAGER_HANDLER_MODEM_ADDED] =
         ofono_manager_add_modem_added_handler(self->manager,
-            mms_ofono_connman_modem_added, self);
+            mms_connman_ofono_modem_added, self);
     self->manager_handler_id[MANAGER_HANDLER_MODEM_REMOVED] =
         ofono_manager_add_modem_removed_handler(self->manager,
-            mms_ofono_connman_modem_removed, self);
-    if (self->manager->valid) mms_ofono_connman_init_modems(self);
+            mms_connman_ofono_modem_removed, self);
+    if (self->manager->valid) mms_connman_ofono_init_modems(self);
     return &self->cm;
 }
 
@@ -388,10 +388,10 @@ mms_ofono_modem_cleanup(
  */
 static
 void
-mms_ofono_connman_dispose(
+mms_connman_ofono_dispose(
     GObject* object)
 {
-    MMSOfonoConnMan* self = MMS_OFONO_CONNMAN(object);
+    MMSConnManOfono* self = MMS_CONNMAN_OFONO(object);
     MMS_VERBOSE_("");
     self->default_modem = NULL;
     g_hash_table_remove_all(self->modems);
@@ -401,7 +401,7 @@ mms_ofono_connman_dispose(
         ofono_manager_unref(self->manager);
         self->manager = NULL;
     }
-    G_OBJECT_CLASS(mms_ofono_connman_parent_class)->dispose(object);
+    G_OBJECT_CLASS(mms_connman_ofono_parent_class)->dispose(object);
 }
 
 /**
@@ -409,13 +409,13 @@ mms_ofono_connman_dispose(
  */
 static
 void
-mms_ofono_connman_finalize(
+mms_connman_ofono_finalize(
     GObject* object)
 {
-    MMSOfonoConnMan* self = MMS_OFONO_CONNMAN(object);
+    MMSConnManOfono* self = MMS_CONNMAN_OFONO(object);
     MMS_VERBOSE_("");
     g_hash_table_destroy(self->modems);
-    G_OBJECT_CLASS(mms_ofono_connman_parent_class)->finalize(object);
+    G_OBJECT_CLASS(mms_connman_ofono_parent_class)->finalize(object);
 }
 
 /**
@@ -423,14 +423,14 @@ mms_ofono_connman_finalize(
  */
 static
 void
-mms_ofono_connman_class_init(
-    MMSOfonoConnManClass* klass)
+mms_connman_ofono_class_init(
+    MMSConnManOfonoClass* klass)
 {
     GObjectClass* object_class = G_OBJECT_CLASS(klass);
-    klass->fn_default_imsi = mms_ofono_connman_default_imsi;
-    klass->fn_open_connection = mms_ofono_connman_open_connection;
-    object_class->dispose = mms_ofono_connman_dispose;
-    object_class->finalize = mms_ofono_connman_finalize;
+    klass->fn_default_imsi = mms_connman_ofono_default_imsi;
+    klass->fn_open_connection = mms_connman_ofono_open_connection;
+    object_class->dispose = mms_connman_ofono_dispose;
+    object_class->finalize = mms_connman_ofono_finalize;
 }
 
 /**
@@ -438,8 +438,8 @@ mms_ofono_connman_class_init(
  */
 static
 void
-mms_ofono_connman_init(
-    MMSOfonoConnMan* self)
+mms_connman_ofono_init(
+    MMSConnManOfono* self)
 {
     self->modems = g_hash_table_new_full(g_str_hash, g_str_equal,
         g_free, mms_ofono_modem_cleanup);
diff --git a/mms-engine/Makefile b/mms-engine/Makefile
index baeb6e3..131f819 100644
--- a/mms-engine/Makefile
+++ b/mms-engine/Makefile
@@ -2,7 +2,7 @@
 
 .PHONY: all debug release clean cleaner
 .PHONY: mms_lib_debug_lib mms_lib_release_lib
-.PHONY: mms_ofono_debug_lib mms_ofono_release_lib
+.PHONY: mms_connman_debug_lib mms_connman_release_lib
 .PHONY: mms_handler_debug_lib mms_handler_release_lib
 .PHONY: mms_settings_debug_lib mms_settings_release_lib
 
@@ -55,14 +55,14 @@ MMS_LIB_DEBUG_LIB = $(MMS_LIB_BUILD_DIR)/debug/$(MMS_LIB_LIB)
 MMS_LIB_RELEASE_LIB = $(MMS_LIB_BUILD_DIR)/release/$(MMS_LIB_LIB)
 
 #
-# mms-ofono
+# mms-connman
 #
 
-MMS_OFONO_LIB = libmms-ofono.a
-MMS_OFONO_DIR = ../mms-ofono
-MMS_OFONO_BUILD_DIR = $(MMS_OFONO_DIR)/build
-MMS_OFONO_DEBUG_LIB = $(MMS_OFONO_BUILD_DIR)/debug/$(MMS_OFONO_LIB)
-MMS_OFONO_RELEASE_LIB = $(MMS_OFONO_BUILD_DIR)/release/$(MMS_OFONO_LIB)
+MMS_CONNMAN_LIB = libmms-connman-ofono.a
+MMS_CONNMAN_DIR = ../mms-connman-ofono
+MMS_CONNMAN_BUILD_DIR = $(MMS_CONNMAN_DIR)/build
+MMS_CONNMAN_DEBUG_LIB = $(MMS_CONNMAN_BUILD_DIR)/debug/$(MMS_CONNMAN_LIB)
+MMS_CONNMAN_RELEASE_LIB = $(MMS_CONNMAN_BUILD_DIR)/release/$(MMS_CONNMAN_LIB)
 
 #
 # mms-handler-dbus
@@ -96,7 +96,7 @@ DEBUG_DEFS = -DDEBUG
 RELEASE_DEFS =
 WARN = -Wall
 CFLAGS = -fPIC $(shell pkg-config --cflags $(PKGS)) -I. -I$(GEN_DIR) \
- -I$(MMS_LIB_DIR)/include -I$(MMS_OFONO_DIR)/include \
+ -I$(MMS_LIB_DIR)/include -I$(MMS_CONNMAN_DIR)/include \
  -I$(MMS_HANDLER_DIR)/include -I$(MMS_SETTINGS_DIR)/include -MMD
 
 ifndef KEEP_SYMBOLS
@@ -117,13 +117,13 @@ RELEASE_CFLAGS = $(RELEASE_FLAGS) $(RELEASE_DEFS) $(CFLAGS)
 
 LIBS = $(shell pkg-config --libs $(LIB_PKGS)) -lmagic -ljpeg $(RESIZE_LIBS)
 DEBUG_LIBS = \
-  $(MMS_OFONO_DEBUG_LIB) \
+  $(MMS_CONNMAN_DEBUG_LIB) \
   $(MMS_HANDLER_DEBUG_LIB) \
   $(MMS_SETTINGS_DEBUG_LIB) \
   $(MMS_LIB_DEBUG_LIB) \
   $(LIBS)
 RELEASE_LIBS = \
-  $(MMS_OFONO_RELEASE_LIB) \
+  $(MMS_CONNMAN_RELEASE_LIB) \
   $(MMS_HANDLER_RELEASE_LIB) \
   $(MMS_SETTINGS_RELEASE_LIB) \
   $(MMS_LIB_RELEASE_LIB) \
@@ -148,22 +148,22 @@ GEN_FILES = $(GEN_SRC:%=$(GEN_DIR)/%)
 
 DEBUG_DEPS = \
   mms_lib_debug_lib \
-  mms_ofono_debug_lib \
+  mms_connman_debug_lib \
   mms_handler_debug_lib \
   mms_settings_debug_lib
 RELEASE_DEPS = \
   mms_lib_release_lib \
-  mms_ofono_release_lib \
+  mms_connman_release_lib \
   mms_handler_release_lib \
   mms_settings_release_lib
 DEBUG_EXE_DEPS = \
   $(MMS_LIB_DEBUG_LIB) \
-  $(MMS_OFONO_DEBUG_LIB) \
+  $(MMS_CONNMAN_DEBUG_LIB) \
   $(MMS_HANDLER_DEBUG_LIB) \
   $(MMS_SETTINGS_DEBUG_LIB)
 RELEASE_EXE_DEPS = \
   $(MMS_LIB_RELEASE_LIB) \
-  $(MMS_OFONO_RELEASE_LIB) \
+  $(MMS_CONNMAN_RELEASE_LIB) \
   $(MMS_HANDLER_RELEASE_LIB) \
   $(MMS_SETTINGS_RELEASE_LIB)
 DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
@@ -194,7 +194,7 @@ clean:
 
 cleaner: clean
 	make -C $(MMS_LIB_DIR) $(SUBMAKE_OPTS) clean
-	make -C $(MMS_OFONO_DIR) $(SUBMAKE_OPTS) clean
+	make -C $(MMS_CONNMAN_DIR) $(SUBMAKE_OPTS) clean
 	make -C $(MMS_HANDLER_DIR) $(SUBMAKE_OPTS) clean
 	make -C $(MMS_SETTINGS_DIR) $(SUBMAKE_OPTS) clean
 
@@ -213,11 +213,11 @@ mms_lib_debug_lib:
 mms_lib_release_lib:
 	make -C $(MMS_LIB_DIR) $(SUBMAKE_OPTS) release
 
-mms_ofono_debug_lib:
-	make -C $(MMS_OFONO_DIR) $(SUBMAKE_OPTS) debug
+mms_connman_debug_lib:
+	make -C $(MMS_CONNMAN_DIR) $(SUBMAKE_OPTS) debug
 
-mms_ofono_release_lib:
-	make -C $(MMS_OFONO_DIR) $(SUBMAKE_OPTS) release
+mms_connman_release_lib:
+	make -C $(MMS_CONNMAN_DIR) $(SUBMAKE_OPTS) release
 
 mms_handler_debug_lib:
 	make -C $(MMS_HANDLER_DIR) $(SUBMAKE_OPTS) debug
@@ -235,9 +235,9 @@ $(MMS_LIB_DEBUG_LIB): mms_lib_debug_lib
 
 $(MMS_LIB_RELEASE_LIB): mms_lib_release_lib
 
-$(MMS_OFONO_DEBUG_LIB): mms_ofono_debug_lib
+$(MMS_CONNMAN_DEBUG_LIB): mms_connman_debug_lib
 
-$(MMS_OFONO_RELEASE_LIB): mms_ofono_release_lib
+$(MMS_CONNMAN_RELEASE_LIB): mms_connman_release_lib
 
 $(MMS_HANDLER_DEBUG_LIB): mms_handler_debug_lib
 
diff --git a/mms-engine/main.c b/mms-engine/main.c
index a1467da..375ebd9 100644
--- a/mms-engine/main.c
+++ b/mms-engine/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Jolla Ltd.
+ * Copyright (C) 2013-2016 Jolla Ltd.
  * Contact: Slava Monich <slava.monich@jolla.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 #include <glib-unix.h>
 
 #include "mms_engine.h"
-#include "mms_ofono_log.h"
+#include "mms_connman_ofono_log.h"
 #include "mms_lib_log.h"
 #include "mms_lib_util.h"
 #include "mms_settings.h"
@@ -41,7 +41,7 @@ static MMSLogModule* mms_app_log_modules[] = {
     &mms_log_default,
 #define MMS_LIB_LOG_MODULE(m) &(m),
     MMS_LIB_LOG_MODULES(MMS_LIB_LOG_MODULE)
-    MMS_OFONO_LOG_MODULES(MMS_LIB_LOG_MODULE)
+    MMS_CONNMAN_LOG_MODULES(MMS_LIB_LOG_MODULE)
 #undef MMS_LIB_LOG_MODULE
 };
 
diff --git a/mms-engine/mms-engine.pro b/mms-engine/mms-engine.pro
index 0bb0df4..566255a 100644
--- a/mms-engine/mms-engine.pro
+++ b/mms-engine/mms-engine.pro
@@ -4,10 +4,11 @@ PKGCONFIG += gmime-2.6 gio-unix-2.0 gio-2.0 glib-2.0 libsoup-2.4 dconf
 PKGCONFIG += libwspcodec libgofono libglibutil
 DBUS_INTERFACE_DIR = $$_PRO_FILE_PWD_
 MMS_LIB_DIR = $$_PRO_FILE_PWD_/../mms-lib
-MMS_OFONO_DIR = $$_PRO_FILE_PWD_/../mms-ofono
+MMS_CONNMAN = mms-connman-ofono
+MMS_CONNMAN_DIR = $$_PRO_FILE_PWD_/../$$MMS_CONNMAN
 MMS_HANDLER_DIR = $$_PRO_FILE_PWD_/../mms-handler-dbus
 MMS_SETTINGS_DIR = $$_PRO_FILE_PWD_/../mms-settings-dconf
-INCLUDEPATH += $$MMS_OFONO_DIR/include
+INCLUDEPATH += $$MMS_CONNMAN_DIR/include
 INCLUDEPATH += $$MMS_LIB_DIR/include
 INCLUDEPATH += $$MMS_HANDLER_DIR/include
 INCLUDEPATH += $$MMS_SETTINGS_DIR/include
@@ -34,13 +35,13 @@ OTHER_FILES += \
 CONFIG(debug, debug|release) {
     DEFINES += DEBUG
     DESTDIR = $$_PRO_FILE_PWD_/build/debug
-    LIBS += $$MMS_OFONO_DIR/build/debug/libmms-ofono.a
+    LIBS += $$MMS_CONNMAN_DIR/build/debug/lib$${MMS_CONNMAN}.a
     LIBS += $$MMS_HANDLER_DIR/build/debug/libmms-handler-dbus.a
     LIBS += $$MMS_LIB_DIR/build/debug/libmms-lib.a
     LIBS += $$MMS_SETTINGS_DIR/build/debug/libmms-settings-dconf.a
 } else {
     DESTDIR = $$_PRO_FILE_PWD_/build/release
-    LIBS += $$MMS_OFONO_DIR/build/release/libmms-ofono.a
+    LIBS += $$MMS_CONNMAN_DIR/build/release/lib$${MMS_CONNMAN}.a
     LIBS += $$MMS_HANDLER_DIR/build/release/libmms-handler-dbus.a
     LIBS += $$MMS_LIB_DIR/build/release/libmms-lib.a
     LIBS += $$MMS_SETTINGS_DIR/build/release/libmms-settings-dconf.a
diff --git a/mms-engine/mms_engine.c b/mms-engine/mms_engine.c
index 0f681af..e9dc005 100644
--- a/mms-engine/mms_engine.c
+++ b/mms-engine/mms_engine.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Jolla Ltd.
+ * Copyright (C) 2013-2016 Jolla Ltd.
  * Contact: Slava Monich <slava.monich@jolla.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 #include "mms_dispatcher.h"
 #include "mms_settings.h"
 #include "mms_lib_util.h"
-#include "mms_ofono_connman.h"
+#include "mms_connman_ofono.h"
 #include "mms_handler_dbus.h"
 #include "mms_settings_dconf.h"
 #include "mms_log.h"
diff --git a/mms.pro b/mms.pro
index 8ddbf2f..a607659 100644
--- a/mms.pro
+++ b/mms.pro
@@ -2,8 +2,8 @@ TEMPLATE = subdirs
 CONFIG += ordered
 SUBDIRS += \
   mms-lib \
+  mms-connman-ofono \
   mms-handler-dbus \
-  mms-ofono \
   mms-settings-dconf \
   mms-engine \
   mms-dump \