ms-basic-connect-extensions: rename servicealeksander/rename-basic-connect-extensions

This service is not a generic service, it is defined by Microsoft, so
rename it to follow the same naming scheme as for other services also
defined by Microsoft.

We do not provide compatibility symbols, as this is a NEW service to
be first released in libmbim 1.18.0.

We do bump the micro versionto 1.17.4, so that applications relying
on the git version of libmbim can bump their minimum required version
accordingly.

19 files changed, 163 insertions, 151 deletions

diff --git a/configure.ac b/configure.ac
index c6c27b3..04c884a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ([2.68])
 dnl The libmbim version number
 m4_define([mbim_major_version], [1])
 m4_define([mbim_minor_version], [17])
-m4_define([mbim_micro_version], [3])
+m4_define([mbim_micro_version], [4])
 m4_define([mbim_version],
           [mbim_major_version.mbim_minor_version.mbim_micro_version])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 8be274b..1c325f2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = . pkg-config
 
 EXTRA_DIST = \
 	mbim-service-basic-connect.json \
-	mbim-service-basic-connect-extensions.json \
 	mbim-service-sms.json \
 	mbim-service-ussd.json \
 	mbim-service-auth.json \
@@ -14,4 +13,5 @@ EXTRA_DIST = \
 	mbim-service-proxy-control.json \
 	mbim-service-qmi.json \
 	mbim-service-atds.json \
-	mbim-service-intel-firmware-update.json
+	mbim-service-intel-firmware-update.json \
+	mbim-service-ms-basic-connect-extensions.json
diff --git a/data/mbim-service-basic-connect-extensions.json b/data/mbim-service-ms-basic-connect-extensions.json
index 64aacb8..a079088 100644
--- a/data/mbim-service-basic-connect-extensions.json
+++ b/data/mbim-service-ms-basic-connect-extensions.json
@@ -1,7 +1,7 @@
 [
   // *********************************************************************************
   { "type" : "Service",
-    "name" : "Basic Connect Extensions" },
+    "name" : "Ms Basic Connect Extensions" },
 
   // *********************************************************************************
   { "name"     : "MbimPcoValue",
@@ -18,7 +18,7 @@
                      "array-size-field" : "PcoDataSize" } ] },
 
   { "name"         : "PCO",
-    "service"      : "Basic Connect Extensions",
+    "service"      : "Ms Basic Connect Extensions",
     "type"         : "Command",
     "query"        : [ { "name"        : "PcoValue",
                          "format"      : "struct",
diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am
index 53648f5..f31c336 100644
--- a/docs/man/Makefile.am
+++ b/docs/man/Makefile.am
@@ -7,7 +7,7 @@ dist_man_MANS = \
 MBIMCLI_SOURCES_WITH_HELP = \
 	$(top_srcdir)/src/mbimcli/mbimcli-atds.c \
 	$(top_srcdir)/src/mbimcli/mbimcli-basic-connect.c \
-	$(top_srcdir)/src/mbimcli/mbimcli-basic-connect-extensions.c \
+	$(top_srcdir)/src/mbimcli/mbimcli-ms-basic-connect-extensions.c \
 	$(top_srcdir)/src/mbimcli/mbimcli-dss.c \
 	$(top_srcdir)/src/mbimcli/mbimcli-ms-firmware-id.c \
 	$(top_srcdir)/src/mbimcli/mbimcli-ms-host-shutdown.c \
diff --git a/docs/reference/libmbim-glib/Makefile.am b/docs/reference/libmbim-glib/Makefile.am
index 4bef3b6..4bf727a 100644
--- a/docs/reference/libmbim-glib/Makefile.am
+++ b/docs/reference/libmbim-glib/Makefile.am
@@ -9,7 +9,6 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 ALL_SECTIONS = \
 	$(srcdir)/libmbim-glib-common.sections \
 	$(top_builddir)/src/libmbim-glib/generated/mbim-basic-connect.sections \
-	$(top_builddir)/src/libmbim-glib/generated/mbim-basic-connect-extensions.sections \
 	$(top_builddir)/src/libmbim-glib/generated/mbim-sms.sections \
 	$(top_builddir)/src/libmbim-glib/generated/mbim-ussd.sections \
 	$(top_builddir)/src/libmbim-glib/generated/mbim-auth.sections \
@@ -20,7 +19,8 @@ ALL_SECTIONS = \
 	$(top_builddir)/src/libmbim-glib/generated/mbim-ms-host-shutdown.sections \
 	$(top_builddir)/src/libmbim-glib/generated/mbim-qmi.sections \
 	$(top_builddir)/src/libmbim-glib/generated/mbim-atds.sections \
-	$(top_builddir)/src/libmbim-glib/generated/mbim-intel-firmware-update.sections
+	$(top_builddir)/src/libmbim-glib/generated/mbim-intel-firmware-update.sections \
+	$(top_builddir)/src/libmbim-glib/generated/mbim-ms-basic-connect-extensions.sections
 
 $(DOC_MODULE)-sections.mstamp: $(ALL_SECTIONS)
 	$(AM_V_GEN) \
diff --git a/docs/reference/libmbim-glib/libmbim-glib-common.sections b/docs/reference/libmbim-glib/libmbim-glib-common.sections
index 69356fb..fbe44aa 100644
--- a/docs/reference/libmbim-glib/libmbim-glib-common.sections
+++ b/docs/reference/libmbim-glib/libmbim-glib-common.sections
@@ -15,7 +15,6 @@ MbimUuid
 MBIM_UUID_INVALID
 MBIM_UUID_ATDS
 MBIM_UUID_BASIC_CONNECT
-MBIM_UUID_BASIC_CONNECT_EXTENSIONS
 MBIM_UUID_SMS
 MBIM_UUID_USSD
 MBIM_UUID_PHONEBOOK
@@ -27,6 +26,7 @@ MBIM_UUID_MS_HOST_SHUTDOWN
 MBIM_UUID_PROXY_CONTROL
 MBIM_UUID_QMI
 MBIM_UUID_INTEL_FIRMWARE_UPDATE
+MBIM_UUID_MS_BASIC_CONNECT_EXTENSIONS
 <SUBSECTION Methods>
 mbim_service_get_string
 mbim_service_lookup_name
@@ -51,7 +51,6 @@ mbim_context_type_build_string_from_mask
 <FILE>mbim-cid</FILE>
 MbimCidAtds
 MbimCidBasicConnect
-MbimCidBasicConnectExtensions
 MbimCidSms
 MbimCidUssd
 MbimCidPhonebook
@@ -63,6 +62,7 @@ MbimCidMsHostShutdown
 MbimCidProxyControl
 MbimCidQmi
 MbimCidIntelFirmwareUpdate
+MbimCidMsBasicConnectExtensions
 <SUBSECTION Methods>
 mbim_cid_can_set
 mbim_cid_can_query
@@ -70,7 +70,6 @@ mbim_cid_can_notify
 mbim_cid_get_printable
 mbim_cid_atds_get_string
 mbim_cid_basic_connect_get_string
-mbim_cid_basic_connect_extensions_get_string
 mbim_cid_sms_get_string
 mbim_cid_ussd_get_string
 mbim_cid_phonebook_get_string
@@ -82,10 +81,10 @@ mbim_cid_ms_host_shutdown_get_string
 mbim_cid_proxy_control_get_string
 mbim_cid_qmi_get_string
 mbim_cid_intel_firmware_update_get_string
+mbim_cid_ms_basic_connect_extensions_get_string
 <SUBSECTION Private>
 mbim_cid_atds_build_string_from_mask
 mbim_cid_basic_connect_build_string_from_mask
-mbim_cid_basic_connect_extensions_build_string_from_mask
 mbim_cid_sms_build_string_from_mask
 mbim_cid_ussd_build_string_from_mask
 mbim_cid_phonebook_build_string_from_mask
@@ -97,11 +96,11 @@ mbim_cid_ms_host_shutdown_build_string_from_mask
 mbim_cid_proxy_control_build_string_from_mask
 mbim_cid_qmi_build_string_from_mask
 mbim_cid_intel_firmware_update_build_string_from_mask
+mbim_cid_ms_basic_connect_extensions_build_string_from_mask
 <SUBSECTION Standard>
 MBIM_TYPE_CID_ATDS
 MBIM_TYPE_CID_AUTH
 MBIM_TYPE_CID_BASIC_CONNECT
-MBIM_TYPE_CID_BASIC_CONNECT_EXTENSIONS
 MBIM_TYPE_CID_DSS
 MBIM_TYPE_CID_PHONEBOOK
 MBIM_TYPE_CID_SMS
@@ -112,10 +111,10 @@ MBIM_TYPE_CID_MS_HOST_SHUTDOWN
 MBIM_TYPE_CID_PROXY_CONTROL
 MBIM_TYPE_CID_QMI
 MBIM_TYPE_CID_INTEL_FIRMWARE_UPDATE
+MBIM_TYPE_CID_MS_BASIC_CONNECT_EXTENSIONS
 mbim_cid_atds_get_type
 mbim_cid_auth_get_type
 mbim_cid_basic_connect_get_type
-mbim_cid_basic_connect_extensions_get_type
 mbim_cid_dss_get_type
 mbim_cid_phonebook_get_type
 mbim_cid_sms_get_type
@@ -126,6 +125,7 @@ mbim_cid_ms_host_shutdown_get_type
 mbim_cid_proxy_control_get_type
 mbim_cid_qmi_get_type
 mbim_cid_intel_firmware_update_get_type
+mbim_cid_ms_basic_connect_extensions_get_type
 </SECTION>
 
 <SECTION>
diff --git a/docs/reference/libmbim-glib/libmbim-glib-docs.xml b/docs/reference/libmbim-glib/libmbim-glib-docs.xml
index 6dcf312..a13b68a 100644
--- a/docs/reference/libmbim-glib/libmbim-glib-docs.xml
+++ b/docs/reference/libmbim-glib/libmbim-glib-docs.xml
@@ -67,12 +67,24 @@
   </chapter>
 
   <chapter>
-    <title>Other Services</title>
-    <xi:include href="xml/mbim-basic-connect-extensions.xml"/>
+    <title>Microsoft-defined services</title>
+    <xi:include href="xml/mbim-ms-basic-connect-extensions.xml"/>
     <xi:include href="xml/mbim-ms-firmware-id.xml"/>
     <xi:include href="xml/mbim-ms-host-shutdown.xml"/>
+  </chapter>
+
+  <chapter>
+    <title>Qualcomm-defined services</title>
     <xi:include href="xml/mbim-qmi.xml"/>
+  </chapter>
+
+  <chapter>
+    <title>AT&amp;T-defined services</title>
     <xi:include href="xml/mbim-atds.xml"/>
+  </chapter>
+
+  <chapter>
+    <title>Intel-defined Services</title>
     <xi:include href="xml/mbim-intel-firmware-update.xml"/>
   </chapter>
 
diff --git a/src/libmbim-glib/generated/Makefile.am b/src/libmbim-glib/generated/Makefile.am
index d534d6b..d0c45cc 100644
--- a/src/libmbim-glib/generated/Makefile.am
+++ b/src/libmbim-glib/generated/Makefile.am
@@ -4,7 +4,6 @@ GENERATED_H = \
 	mbim-error-types.h \
 	mbim-enum-types.h \
 	mbim-basic-connect.h \
-	mbim-basic-connect-extensions.h \
 	mbim-sms.h \
 	mbim-ussd.h \
 	mbim-auth.h \
@@ -16,14 +15,14 @@ GENERATED_H = \
 	mbim-proxy-control.h \
 	mbim-qmi.h \
 	mbim-atds.h \
-	mbim-intel-firmware-update.h
+	mbim-intel-firmware-update.h \
+	mbim-ms-basic-connect-extensions.h
 
 GENERATED_C = \
 	mbim-error-types.c \
 	mbim-error-quarks.c \
 	mbim-enum-types.c \
 	mbim-basic-connect.c \
-	mbim-basic-connect-extensions.c \
 	mbim-sms.c \
 	mbim-ussd.c \
 	mbim-auth.c \
@@ -35,11 +34,11 @@ GENERATED_C = \
 	mbim-proxy-control.c \
 	mbim-qmi.c \
 	mbim-atds.c \
-	mbim-intel-firmware-update.c
+	mbim-intel-firmware-update.c \
+	mbim-ms-basic-connect-extensions.c
 
 GENERATED_SECTIONS = \
 	mbim-basic-connect.sections \
-	mbim-basic-connect-extensions.sections \
 	mbim-sms.sections \
 	mbim-ussd.sections \
 	mbim-auth.sections \
@@ -51,7 +50,8 @@ GENERATED_SECTIONS = \
 	mbim-proxy-control.sections \
 	mbim-qmi.sections \
 	mbim-atds.sections \
-	mbim-intel-firmware-update.sections
+	mbim-intel-firmware-update.sections \
+	mbim-ms-basic-connect-extensions.sections
 
 # Error types
 mbim-error-types.h: $(top_srcdir)/src/libmbim-glib/mbim-errors.h $(top_srcdir)/build-aux/templates/mbim-error-types-template.h
@@ -101,15 +101,6 @@ mbim-basic-connect.h mbim-basic-connect.c mbim-basic-connect.sections: $(top_src
 			--input $(top_srcdir)/data/mbim-service-basic-connect.json \
 			--output mbim-basic-connect
 
-# Basic Connect Extensions service
-mbim-basic-connect-extensions.h mbim-basic-connect-extensions.c mbim-basic-connect-extensions.sections: $(top_srcdir)/data/mbim-service-basic-connect-extensions.json $(top_srcdir)/build-aux/mbim-codegen/*.py $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen
-	$(AM_V_GEN)  \
-		rm -f mbim-basic-connect-extensions.h && \
-		rm -f mbim-basic-connect-extensions.c && \
-		$(PYTHON) $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen \
-			--input $(top_srcdir)/data/mbim-service-basic-connect-extensions.json \
-			--output mbim-basic-connect-extensions
-
 # SMS service
 mbim-sms.h mbim-sms.c mbim-sms.sections: $(top_srcdir)/data/mbim-service-sms.json $(top_srcdir)/build-aux/mbim-codegen/*.py $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen
 	$(AM_V_GEN)  \
@@ -218,6 +209,15 @@ mbim-intel-firmware-update.h mbim-intel-firmware-update.c mbim-intel-firmware-up
 			--input $(top_srcdir)/data/mbim-service-intel-firmware-update.json \
 			--output mbim-intel-firmware-update
 
+# Microsoft Basic Connect Extensions service
+mbim-ms-basic-connect-extensions.h mbim-ms-basic-connect-extensions.c mbim-ms-basic-connect-extensions.sections: $(top_srcdir)/data/mbim-service-ms-basic-connect-extensions.json $(top_srcdir)/build-aux/mbim-codegen/*.py $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen
+	$(AM_V_GEN)  \
+		rm -f mbim-ms-basic-connect-extensions.h && \
+		rm -f mbim-ms-basic-connect-extensions.c && \
+		$(PYTHON) $(top_srcdir)/build-aux/mbim-codegen/mbim-codegen \
+			--input $(top_srcdir)/data/mbim-service-ms-basic-connect-extensions.json \
+			--output mbim-ms-basic-connect-extensions
+
 BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C)
 
 nodist_libmbim_glib_generated_la_SOURCES = \
diff --git a/src/libmbim-glib/libmbim-glib.h b/src/libmbim-glib/libmbim-glib.h
index c900ee7..6af2953 100644
--- a/src/libmbim-glib/libmbim-glib.h
+++ b/src/libmbim-glib/libmbim-glib.h
@@ -40,7 +40,6 @@
 #include "mbim-enum-types.h"
 #include "mbim-error-types.h"
 #include "mbim-basic-connect.h"
-#include "mbim-basic-connect-extensions.h"
 #include "mbim-sms.h"
 #include "mbim-ussd.h"
 #include "mbim-auth.h"
@@ -52,6 +51,7 @@
 #include "mbim-qmi.h"
 #include "mbim-atds.h"
 #include "mbim-intel-firmware-update.h"
+#include "mbim-ms-basic-connect-extensions.h"
 
 /* backwards compatibility */
 #include "mbim-compat.h"
diff --git a/src/libmbim-glib/mbim-cid.c b/src/libmbim-glib/mbim-cid.c
index a677a92..82ab61e 100644
--- a/src/libmbim-glib/mbim-cid.c
+++ b/src/libmbim-glib/mbim-cid.c
@@ -164,18 +164,18 @@ static const CidConfig cid_intel_firmware_update_config [MBIM_CID_INTEL_FIRMWARE
 };
 
 /* Note: index of the array is CID-1 */
-#define MBIM_CID_BASIC_CONNECT_EXTENSIONS_LAST MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_DEVICE_RESET
-static const CidConfig cid_basic_connect_extensions_config [MBIM_CID_BASIC_CONNECT_EXTENSIONS_LAST] = {
-    { SET,    QUERY,    NOTIFY    }, /* MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_PROVISIONED_CONTEXT_V2 */
-    { SET,    QUERY,    NOTIFY    }, /* MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_NETWORK_BLACKLIST */
-    { SET,    QUERY,    NOTIFY    }, /* MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_LTE_ATTACH_CONFIG */
-    { SET,    QUERY,    NOTIFY    }, /* MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_LTE_ATTACH_STATUS */
-    { NO_SET, QUERY,    NO_NOTIFY }, /* MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_SYS_CAPS */
-    { NO_SET, QUERY,    NO_NOTIFY }, /* MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_DEVICE_CAPS_V2 */
-    { SET,    QUERY,    NO_NOTIFY }, /* MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_DEVICE_SLOT_MAPPINGS */
-    { NO_SET, QUERY,    NOTIFY    }, /* MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_SLOT_INFO_STATUS */
-    { NO_SET, QUERY,    NOTIFY    }, /* MBIM_CID_BASIC_CONNECT_EXTENSIONS_PCO */
-    { SET,    NO_QUERY, NO_NOTIFY }, /* MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_DEVICE_RESET */
+#define MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LAST MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_RESET
+static const CidConfig cid_ms_basic_connect_extensions_config [MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LAST] = {
+    { SET,    QUERY,    NOTIFY    }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_PROVISIONED_CONTEXTS */
+    { SET,    QUERY,    NOTIFY    }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_BLACKLIST */
+    { SET,    QUERY,    NOTIFY    }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_CONFIG */
+    { SET,    QUERY,    NOTIFY    }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_STATUS */
+    { NO_SET, QUERY,    NO_NOTIFY }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SYS_CAPS */
+    { NO_SET, QUERY,    NO_NOTIFY }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_CAPS */
+    { SET,    QUERY,    NO_NOTIFY }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_SLOT_MAPPINGS */
+    { NO_SET, QUERY,    NOTIFY    }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SLOT_INFO_STATUS */
+    { NO_SET, QUERY,    NOTIFY    }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_PCO */
+    { SET,    NO_QUERY, NO_NOTIFY }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_RESET */
 };
 
 /**
@@ -224,8 +224,8 @@ mbim_cid_can_set (MbimService service,
         return cid_atds_config[cid - 1].set;
     case MBIM_SERVICE_INTEL_FIRMWARE_UPDATE:
         return cid_intel_firmware_update_config[cid - 1].set;
-    case MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS:
-        return cid_basic_connect_extensions_config[cid - 1].set;
+    case MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS:
+        return cid_ms_basic_connect_extensions_config[cid - 1].set;
     default:
         g_assert_not_reached ();
         return FALSE;
@@ -278,8 +278,8 @@ mbim_cid_can_query (MbimService service,
         return cid_atds_config[cid - 1].query;
     case MBIM_SERVICE_INTEL_FIRMWARE_UPDATE:
         return cid_intel_firmware_update_config[cid - 1].query;
-    case MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS:
-        return cid_basic_connect_extensions_config[cid - 1].query;
+    case MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS:
+        return cid_ms_basic_connect_extensions_config[cid - 1].query;
     default:
         g_assert_not_reached ();
         return FALSE;
@@ -332,8 +332,8 @@ mbim_cid_can_notify (MbimService service,
         return cid_atds_config[cid - 1].notify;
     case MBIM_SERVICE_INTEL_FIRMWARE_UPDATE:
         return cid_intel_firmware_update_config[cid - 1].notify;
-    case MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS:
-        return cid_basic_connect_extensions_config[cid - 1].notify;
+    case MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS:
+        return cid_ms_basic_connect_extensions_config[cid - 1].notify;
     default:
         g_assert_not_reached ();
         return FALSE;
@@ -389,8 +389,8 @@ mbim_cid_get_printable (MbimService service,
         return mbim_cid_atds_get_string (cid);
     case MBIM_SERVICE_INTEL_FIRMWARE_UPDATE:
         return mbim_cid_intel_firmware_update_get_string (cid);
-    case MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS:
-        return mbim_cid_basic_connect_extensions_get_string (cid);
+    case MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS:
+        return mbim_cid_ms_basic_connect_extensions_get_string (cid);
     default:
         g_assert_not_reached ();
         return NULL;
diff --git a/src/libmbim-glib/mbim-cid.h b/src/libmbim-glib/mbim-cid.h
index 65eb7d3..6c51e3a 100644
--- a/src/libmbim-glib/mbim-cid.h
+++ b/src/libmbim-glib/mbim-cid.h
@@ -18,7 +18,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * Copyright (C) 2013 - 2014 Aleksander Morgado <aleksander@aleksander.es>
+ * Copyright (C) 2013 - 2018 Aleksander Morgado <aleksander@aleksander.es>
  */
 
 #ifndef _LIBMBIM_GLIB_MBIM_CID_H_
@@ -90,36 +90,6 @@ typedef enum {
 } MbimCidBasicConnect;
 
 /**
- * MbimCidBasicConnectExtensions:
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_UNKNOWN: Unknown command.
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_PROVISIONED_CONTEXT_V2: Provisioned contexts.
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_NETWORK_BLACKLIST: Network blacklist.
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_LTE_ATTACH_CONFIG: LTE attach configuration.
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_LTE_ATTACH_STATUS: LTE attach status.
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_SYS_CAPS: System capabilities.
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_DEVICE_CAPS_V2: Device capabilities.
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_DEVICE_SLOT_MAPPINGS: Device slot mappings.
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_SLOT_INFO_STATUS: Slot info status.
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_PCO: Protocol configuration operations (PCO).
- * @MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_DEVICE_RESET: Device reset.
- *
- * MBIM commands in the %MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS service.
- */
-typedef enum {
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_UNKNOWN                   = 0,
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_PROVISIONED_CONTEXT_V2 = 1,
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_NETWORK_BLACKLIST      = 2,
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_LTE_ATTACH_CONFIG      = 3,
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_LTE_ATTACH_STATUS      = 4,
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_SYS_CAPS               = 5,
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_DEVICE_CAPS_V2         = 6,
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_DEVICE_SLOT_MAPPINGS   = 7,
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_SLOT_INFO_STATUS       = 8,
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_PCO                       = 9,
-    MBIM_CID_BASIC_CONNECT_EXTENSIONS_MS_DEVICE_RESET           = 10,
-} MbimCidBasicConnectExtensions;
-
-/**
  * MbimCidSms:
  * @MBIM_CID_SMS_UNKNOWN: Unknown command.
  * @MBIM_CID_SMS_CONFIGURATION: SMS configuration.
@@ -293,6 +263,36 @@ typedef enum {
     MBIM_CID_INTEL_FIRMWARE_UPDATE_MODEM_REBOOT = 1,
 } MbimCidIntelFirmwareUpdate;
 
+/**
+ * MbimCidMsBasicConnectExtensions:
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_UNKNOWN: Unknown command.
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_PROVISIONED_CONTEXTS: Provisioned contexts (v2).
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_BLACKLIST: Network blacklist.
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_CONFIGURATION: LTE attach configuration.
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_STATUS: LTE attach status.
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SYS_CAPS: System capabilities.
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_CAPS: Device capabilities (v2).
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_SLOT_MAPPINGS: Device slot mappings.
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SLOT_INFO_STATUS: Slot info status.
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_PCO: Protocol configuration operations (PCO).
+ * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_RESET: Device reset.
+ *
+ * MBIM commands in the %MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS service.
+ */
+typedef enum {
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_UNKNOWN                  = 0,
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_PROVISIONED_CONTEXTS     = 1,
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_BLACKLIST        = 2,
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_CONFIGURATION = 3,
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_STATUS        = 4,
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SYS_CAPS                 = 5,
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_CAPS              = 6,
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_SLOT_MAPPINGS     = 7,
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SLOT_INFO_STATUS         = 8,
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_PCO                      = 9,
+    MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_RESET             = 10,
+} MbimCidMsBasicConnectExtensions;
+
 /* Command helpers */
 
 gboolean     mbim_cid_can_set       (MbimService service,
diff --git a/src/libmbim-glib/mbim-message.c b/src/libmbim-glib/mbim-message.c
index 99cb1fd..6a0d1ab 100644
--- a/src/libmbim-glib/mbim-message.c
+++ b/src/libmbim-glib/mbim-message.c
@@ -32,20 +32,20 @@
 #include "mbim-error-types.h"
 #include "mbim-enum-types.h"
 
-#include "mbim-atds.h"
-#include "mbim-auth.h"
 #include "mbim-basic-connect.h"
-#include "mbim-basic-connect-extensions.h"
+#include "mbim-auth.h"
 #include "mbim-dss.h"
-#include "mbim-intel-firmware-update.h"
-#include "mbim-ms-firmware-id.h"
-#include "mbim-ms-host-shutdown.h"
 #include "mbim-phonebook.h"
-#include "mbim-proxy-control.h"
-#include "mbim-qmi.h"
 #include "mbim-sms.h"
 #include "mbim-stk.h"
 #include "mbim-ussd.h"
+#include "mbim-proxy-control.h"
+#include "mbim-qmi.h"
+#include "mbim-ms-firmware-id.h"
+#include "mbim-ms-host-shutdown.h"
+#include "mbim-atds.h"
+#include "mbim-intel-firmware-update.h"
+#include "mbim-ms-basic-connect-extensions.h"
 
 /**
  * SECTION:mbim-message
@@ -1351,8 +1351,8 @@ mbim_message_get_printable (const MbimMessage *self,
         case MBIM_SERVICE_INTEL_FIRMWARE_UPDATE:
             fields_printable = __mbim_message_intel_firmware_update_get_printable_fields (self, line_prefix, &error);
             break;
-        case MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS:
-            fields_printable = __mbim_message_basic_connect_extensions_get_printable_fields (self, line_prefix, &error);
+        case MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS:
+            fields_printable = __mbim_message_ms_basic_connect_extensions_get_printable_fields (self, line_prefix, &error);
             break;
         default:
             break;
diff --git a/src/libmbim-glib/mbim-uuid.c b/src/libmbim-glib/mbim-uuid.c
index 376eeb7..a7066e5 100644
--- a/src/libmbim-glib/mbim-uuid.c
+++ b/src/libmbim-glib/mbim-uuid.c
@@ -252,7 +252,7 @@ static const MbimUuid uuid_intel_firmware_update = {
     .e = { 0x3b, 0x3f, 0xd7, 0x6f, 0x56, 0x41 }
 };
 
-static const MbimUuid uuid_basic_connect_extensions = {
+static const MbimUuid uuid_ms_basic_connect_extensions = {
     .a = { 0x3d, 0x01, 0xdc, 0xc5 },
     .b = { 0xfe, 0xf5 },
     .c = { 0x4d, 0x05 },
@@ -431,8 +431,8 @@ mbim_uuid_from_service (MbimService service)
         return &uuid_atds;
     case MBIM_SERVICE_INTEL_FIRMWARE_UPDATE:
         return &uuid_intel_firmware_update;
-    case MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS:
-        return &uuid_basic_connect_extensions;
+    case MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS:
+        return &uuid_ms_basic_connect_extensions;
     default:
         for (l = mbim_custom_service_list; l != NULL; l = l->next) {
             if (service == ((MbimCustomService *)l->data)->service_id)
@@ -494,8 +494,8 @@ mbim_uuid_to_service (const MbimUuid *uuid)
     if (mbim_uuid_cmp (uuid, &uuid_intel_firmware_update))
         return MBIM_SERVICE_INTEL_FIRMWARE_UPDATE;
 
-    if (mbim_uuid_cmp (uuid, &uuid_basic_connect_extensions))
-        return MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS;
+    if (mbim_uuid_cmp (uuid, &uuid_ms_basic_connect_extensions))
+        return MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS;
 
     for (l = mbim_custom_service_list; l != NULL; l = l->next) {
         if (mbim_uuid_cmp (&((MbimCustomService *)l->data)->uuid, uuid))
diff --git a/src/libmbim-glib/mbim-uuid.h b/src/libmbim-glib/mbim-uuid.h
index d8224a9..b0541f6 100644
--- a/src/libmbim-glib/mbim-uuid.h
+++ b/src/libmbim-glib/mbim-uuid.h
@@ -74,27 +74,27 @@ gboolean  mbim_uuid_from_printable (const gchar *str,
  * @MBIM_SERVICE_QMI: QMI-over-MBIM service.
  * @MBIM_SERVICE_ATDS: ATT Device service.
  * @MBIM_SERVICE_INTEL_FIRMWARE_UPDATE: Intel firmware update service.
- * @MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS: Basic connectivity extensions service.
+ * @MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS: Microsoft basic connectivity extensions service.
  * @MBIM_SERVICE_LAST: Internal value.
  *
  * Enumeration of the generic MBIM services.
  */
 typedef enum {
-    MBIM_SERVICE_INVALID          = 0,
-    MBIM_SERVICE_BASIC_CONNECT    = 1,
-    MBIM_SERVICE_SMS              = 2,
-    MBIM_SERVICE_USSD             = 3,
-    MBIM_SERVICE_PHONEBOOK        = 4,
-    MBIM_SERVICE_STK              = 5,
-    MBIM_SERVICE_AUTH             = 6,
-    MBIM_SERVICE_DSS              = 7,
-    MBIM_SERVICE_MS_FIRMWARE_ID   = 8,
-    MBIM_SERVICE_MS_HOST_SHUTDOWN = 9,
-    MBIM_SERVICE_PROXY_CONTROL    = 10,
-    MBIM_SERVICE_QMI              = 11,
-    MBIM_SERVICE_ATDS             = 12,
-    MBIM_SERVICE_INTEL_FIRMWARE_UPDATE = 13,
-    MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS = 14,
+    MBIM_SERVICE_INVALID                     = 0,
+    MBIM_SERVICE_BASIC_CONNECT               = 1,
+    MBIM_SERVICE_SMS                         = 2,
+    MBIM_SERVICE_USSD                        = 3,
+    MBIM_SERVICE_PHONEBOOK                   = 4,
+    MBIM_SERVICE_STK                         = 5,
+    MBIM_SERVICE_AUTH                        = 6,
+    MBIM_SERVICE_DSS                         = 7,
+    MBIM_SERVICE_MS_FIRMWARE_ID              = 8,
+    MBIM_SERVICE_MS_HOST_SHUTDOWN            = 9,
+    MBIM_SERVICE_PROXY_CONTROL               = 10,
+    MBIM_SERVICE_QMI                         = 11,
+    MBIM_SERVICE_ATDS                        = 12,
+    MBIM_SERVICE_INTEL_FIRMWARE_UPDATE       = 13,
+    MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS = 14,
 #if defined LIBMBIM_GLIB_COMPILATION
     MBIM_SERVICE_LAST /*< skip >*/
 #endif
@@ -227,13 +227,13 @@ typedef enum {
 #define MBIM_UUID_INTEL_FIRMWARE_UPDATE mbim_uuid_from_service (MBIM_SERVICE_INTEL_FIRMWARE_UPDATE)
 
 /**
- * MBIM_UUID_BASIC_CONNECT_EXTENSIONS:
+ * MBIM_UUID_MS_BASIC_CONNECT_EXTENSIONS:
  *
- * Get the UUID of the %MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS service.
+ * Get the UUID of the %MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS service.
  *
  * Returns: (transfer none): a #MbimUuid.
  */
-#define MBIM_UUID_BASIC_CONNECT_EXTENSIONS mbim_uuid_from_service (MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS)
+#define MBIM_UUID_MS_BASIC_CONNECT_EXTENSIONS mbim_uuid_from_service (MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS)
 
 const gchar *mbim_service_lookup_name (guint service);
 
diff --git a/src/libmbim-glib/test/test-uuid.c b/src/libmbim-glib/test/test-uuid.c
index 8cf9781..6048495 100644
--- a/src/libmbim-glib/test/test-uuid.c
+++ b/src/libmbim-glib/test/test-uuid.c
@@ -99,9 +99,9 @@ test_uuid_intel_firmware_update (void)
 }
 
 static void
-test_uuid_basic_connect_extensions (void)
+test_uuid_ms_basic_connect_extensions (void)
 {
-    compare_uuid_strings (MBIM_UUID_BASIC_CONNECT_EXTENSIONS,
+    compare_uuid_strings (MBIM_UUID_MS_BASIC_CONNECT_EXTENSIONS,
                           "3d01dcc5-fef5-4d05-0d3a-bef7058e9aaf");
 }
 
@@ -205,17 +205,17 @@ int main (int argc, char **argv)
 {
     g_test_init (&argc, &argv, NULL);
 
-    g_test_add_func ("/libmbim-glib/uuid/basic-connect",    test_uuid_basic_connect);
-    g_test_add_func ("/libmbim-glib/uuid/sms",              test_uuid_sms);
-    g_test_add_func ("/libmbim-glib/uuid/ussd",             test_uuid_ussd);
-    g_test_add_func ("/libmbim-glib/uuid/phonebook",        test_uuid_phonebook);
-    g_test_add_func ("/libmbim-glib/uuid/stk",              test_uuid_stk);
-    g_test_add_func ("/libmbim-glib/uuid/auth",             test_uuid_auth);
-    g_test_add_func ("/libmbim-glib/uuid/dss",              test_uuid_dss);
-    g_test_add_func ("/libmbim-glib/uuid/ms-firmware-id",   test_uuid_ms_firmware_id);
-    g_test_add_func ("/libmbim-glib/uuid/ms-host-shutdown", test_uuid_ms_host_shutdown);
-    g_test_add_func ("/libmbim-glib/uuid/intel-firmware-update", test_uuid_intel_firmware_update);
-    g_test_add_func ("/libmbim-glib/uuid/basic-connect-extensions", test_uuid_basic_connect_extensions);
+    g_test_add_func ("/libmbim-glib/uuid/basic-connect",               test_uuid_basic_connect);
+    g_test_add_func ("/libmbim-glib/uuid/sms",                         test_uuid_sms);
+    g_test_add_func ("/libmbim-glib/uuid/ussd",                        test_uuid_ussd);
+    g_test_add_func ("/libmbim-glib/uuid/phonebook",                   test_uuid_phonebook);
+    g_test_add_func ("/libmbim-glib/uuid/stk",                         test_uuid_stk);
+    g_test_add_func ("/libmbim-glib/uuid/auth",                        test_uuid_auth);
+    g_test_add_func ("/libmbim-glib/uuid/dss",                         test_uuid_dss);
+    g_test_add_func ("/libmbim-glib/uuid/ms-firmware-id",              test_uuid_ms_firmware_id);
+    g_test_add_func ("/libmbim-glib/uuid/ms-host-shutdown",            test_uuid_ms_host_shutdown);
+    g_test_add_func ("/libmbim-glib/uuid/intel-firmware-update",       test_uuid_intel_firmware_update);
+    g_test_add_func ("/libmbim-glib/uuid/ms-basic-connect-extensions", test_uuid_ms_basic_connect_extensions);
 
     g_test_add_func ("/libmbim-glib/uuid/valid",           test_uuid_valid);
     g_test_add_func ("/libmbim-glib/uuid/valid/camelcase", test_uuid_valid_camelcase);
diff --git a/src/mbimcli/Makefile.am b/src/mbimcli/Makefile.am
index ee213cc..3839a45 100644
--- a/src/mbimcli/Makefile.am
+++ b/src/mbimcli/Makefile.am
@@ -14,13 +14,13 @@ mbimcli_SOURCES = \
 	mbimcli.h mbimcli.c \
 	mbimcli-helpers.h mbimcli-helpers.c \
 	mbimcli-basic-connect.c \
-	mbimcli-basic-connect-extensions.c \
 	mbimcli-phonebook.c \
 	mbimcli-dss.c \
 	mbimcli-ms-firmware-id.c \
 	mbimcli-ms-host-shutdown.c \
 	mbimcli-atds.c \
-	mbimcli-intel-firmware-update.c
+	mbimcli-intel-firmware-update.c \
+	mbimcli-ms-basic-connect-extensions.c
 
 mbimcli_LDADD = \
 	$(MBIMCLI_LIBS) \
diff --git a/src/mbimcli/mbimcli-basic-connect-extensions.c b/src/mbimcli/mbimcli-ms-basic-connect-extensions.c
index 112905c..db44ec3 100644
--- a/src/mbimcli/mbimcli-basic-connect-extensions.c
+++ b/src/mbimcli/mbimcli-ms-basic-connect-extensions.c
@@ -50,7 +50,7 @@ static gboolean query_pco_arg_parse (const char *option_name,
                                      GError **error);
 
 static GOptionEntry entries[] = {
-    { "query-pco", 0, G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, G_CALLBACK (query_pco_arg_parse),
+    { "ms-query-pco", 0, G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, G_CALLBACK (query_pco_arg_parse),
       "Query PCO value (SessionID is optional, defaults to 0)",
       "[SessionID]"
     },
@@ -68,13 +68,13 @@ query_pco_arg_parse (const char *option_name,
 }
 
 GOptionGroup *
-mbimcli_basic_connect_extensions_get_option_group (void)
+mbimcli_ms_basic_connect_extensions_get_option_group (void)
 {
    GOptionGroup *group;
 
-   group = g_option_group_new ("basic-connect-extensions",
-                               "Basic Connect Extensions options",
-                               "Show Basic Connect Extensions Service options",
+   group = g_option_group_new ("ms-basic-connect-extensions",
+                               "Microsoft Basic Connect Extensions options",
+                               "Show Microsoft Basic Connect Extensions Service options",
                                NULL,
                                NULL);
    g_option_group_add_entries (group, entries);
@@ -114,7 +114,7 @@ session_id_parse (const gchar  *str,
 }
 
 gboolean
-mbimcli_basic_connect_extensions_options_enabled (void)
+mbimcli_ms_basic_connect_extensions_options_enabled (void)
 {
     static guint n_actions = 0;
     static gboolean checked = FALSE;
@@ -125,7 +125,7 @@ mbimcli_basic_connect_extensions_options_enabled (void)
     n_actions = !!query_pco_str;
 
     if (n_actions > 1) {
-        g_printerr ("error: too many Basic Connect Extensions Service actions requested\n");
+        g_printerr ("error: too many Microsoft Basic Connect Extensions Service actions requested\n");
         exit (EXIT_FAILURE);
     }
 
@@ -175,7 +175,7 @@ query_pco_ready (MbimDevice   *device,
 
     g_print ("[%s] Successfully queried PCO\n\n",
              mbim_device_get_path_display (device));
-    if (!mbim_message_basic_connect_extensions_pco_response_parse (
+    if (!mbim_message_ms_basic_connect_extensions_pco_response_parse (
             response,
             &pco_value,
             &error)) {
@@ -205,8 +205,8 @@ query_pco_ready (MbimDevice   *device,
 }
 
 void
-mbimcli_basic_connect_extensions_run (MbimDevice   *device,
-                                      GCancellable *cancellable)
+mbimcli_ms_basic_connect_extensions_run (MbimDevice   *device,
+                                         GCancellable *cancellable)
 {
     /* Initialize context */
     ctx = g_slice_new (Context);
@@ -231,7 +231,7 @@ mbimcli_basic_connect_extensions_run (MbimDevice   *device,
         pco_value.pco_data_buffer = NULL;
 
         g_debug ("Asynchronously querying PCO...");
-        request = mbim_message_basic_connect_extensions_pco_query_new (&pco_value, NULL);
+        request = mbim_message_ms_basic_connect_extensions_pco_query_new (&pco_value, NULL);
         mbim_device_command (ctx->device,
                              request,
                              10,
diff --git a/src/mbimcli/mbimcli.c b/src/mbimcli/mbimcli.c
index abf5757..5ee03b7 100644
--- a/src/mbimcli/mbimcli.c
+++ b/src/mbimcli/mbimcli.c
@@ -278,8 +278,8 @@ device_open_ready (MbimDevice   *dev,
     case MBIM_SERVICE_INTEL_FIRMWARE_UPDATE:
         mbimcli_intel_firmware_update_run (dev, cancellable);
         return;
-    case MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS:
-        mbimcli_basic_connect_extensions_run (dev, cancellable);
+    case MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS:
+        mbimcli_ms_basic_connect_extensions_run (dev, cancellable);
         return;
     default:
         g_assert_not_reached ();
@@ -358,8 +358,8 @@ parse_actions (void)
     } else if (mbimcli_intel_firmware_update_options_enabled ()) {
         service = MBIM_SERVICE_INTEL_FIRMWARE_UPDATE;
         actions_enabled++;
-    } else if (mbimcli_basic_connect_extensions_options_enabled ()) {
-        service = MBIM_SERVICE_BASIC_CONNECT_EXTENSIONS;
+    } else if (mbimcli_ms_basic_connect_extensions_options_enabled ()) {
+        service = MBIM_SERVICE_MS_BASIC_CONNECT_EXTENSIONS;
         actions_enabled++;
     }
 
@@ -407,7 +407,7 @@ int main (int argc, char **argv)
     g_option_context_add_group (context,
                                 mbimcli_intel_firmware_update_get_option_group ());
     g_option_context_add_group (context,
-                                mbimcli_basic_connect_extensions_get_option_group ());
+                                mbimcli_ms_basic_connect_extensions_get_option_group ());
     g_option_context_add_main_entries (context, main_entries, NULL);
     if (!g_option_context_parse (context, &argc, &argv, &error)) {
         g_printerr ("error: %s\n",
diff --git a/src/mbimcli/mbimcli.h b/src/mbimcli/mbimcli.h
index 5033b4e..ceb8599 100644
--- a/src/mbimcli/mbimcli.h
+++ b/src/mbimcli/mbimcli.h
@@ -36,7 +36,7 @@ GOptionGroup *mbimcli_ms_firmware_id_get_option_group   (void);
 GOptionGroup *mbimcli_ms_host_shutdown_get_option_group (void);
 GOptionGroup *mbimcli_atds_get_option_group             (void);
 GOptionGroup *mbimcli_intel_firmware_update_get_option_group (void);
-GOptionGroup *mbimcli_basic_connect_extensions_get_option_group (void);
+GOptionGroup *mbimcli_ms_basic_connect_extensions_get_option_group (void);
 
 gboolean      mbimcli_basic_connect_options_enabled     (void);
 gboolean      mbimcli_phonebook_options_enabled         (void);
@@ -45,7 +45,7 @@ gboolean      mbimcli_ms_firmware_id_options_enabled    (void);
 gboolean      mbimcli_ms_host_shutdown_options_enabled  (void);
 gboolean      mbimcli_atds_options_enabled              (void);
 gboolean      mbimcli_intel_firmware_update_options_enabled (void);
-gboolean      mbimcli_basic_connect_extensions_options_enabled (void);
+gboolean      mbimcli_ms_basic_connect_extensions_options_enabled (void);
 
 void          mbimcli_basic_connect_run                 (MbimDevice *device,
                                                          GCancellable *cancellable);
@@ -61,7 +61,7 @@ void          mbimcli_atds_run                          (MbimDevice *device,
                                                          GCancellable *cancellable);
 void          mbimcli_intel_firmware_update_run         (MbimDevice *device,
                                                          GCancellable *cancellable);
-void          mbimcli_basic_connect_extensions_run      (MbimDevice *device,
+void          mbimcli_ms_basic_connect_extensions_run   (MbimDevice *device,
                                                          GCancellable *cancellable);
 
 #endif /* __MBIMCLI_H__ */