ublox,helpers: rename enum

We're not going to use CFUN/COPS just for bands, but also for modes,
so use more generic names.

3 files changed, 70 insertions, 70 deletions

diff --git a/plugins/ublox/mm-broadband-modem-ublox.c b/plugins/ublox/mm-broadband-modem-ublox.c
index a51db02c8..dc8d89d2e 100644
--- a/plugins/ublox/mm-broadband-modem-ublox.c
+++ b/plugins/ublox/mm-broadband-modem-ublox.c
@@ -91,20 +91,20 @@ preload_support_config (MMBroadbandModemUblox *self)
         g_error_free (error);
 
         /* default to NOT SUPPORTED if unknown model */
-        self->priv->support_config.method = BAND_UPDATE_NEEDS_UNKNOWN;
+        self->priv->support_config.method = SETTINGS_UPDATE_METHOD_UNKNOWN;
         self->priv->support_config.uact = FEATURE_UNSUPPORTED;
         self->priv->support_config.ubandsel = FEATURE_UNSUPPORTED;
     } else
         mm_dbg ("support configuration found for '%s'", model);
 
     switch (self->priv->support_config.method) {
-        case BAND_UPDATE_NEEDS_CFUN:
+        case SETTINGS_UPDATE_METHOD_CFUN:
             mm_dbg ("  band update requires low-power mode");
             break;
-        case BAND_UPDATE_NEEDS_COPS:
+        case SETTINGS_UPDATE_METHOD_COPS:
             mm_dbg ("  band update requires explicit unregistration");
             break;
-        case BAND_UPDATE_NEEDS_UNKNOWN:
+        case SETTINGS_UPDATE_METHOD_UNKNOWN:
             /* not an error, this just means we don't need anything special */
             break;
     }
@@ -458,7 +458,7 @@ set_current_modes_bands_step (GTask *task)
     case SET_CURRENT_MODES_BANDS_STEP_POWER_DOWN:
         if (ctx->initial_state != MM_MODEM_POWER_STATE_LOW) {
             mm_dbg ("powering down and deregistering from the network for configuration change...");
-            if (ctx->self->priv->support_config.method == BAND_UPDATE_NEEDS_COPS) {
+            if (ctx->self->priv->support_config.method == SETTINGS_UPDATE_METHOD_COPS) {
                 mm_base_modem_at_command (
                     MM_BASE_MODEM (ctx->self),
                     "+COPS=2",
@@ -469,7 +469,7 @@ set_current_modes_bands_step (GTask *task)
                 return;
             }
 
-            if (ctx->self->priv->support_config.method == BAND_UPDATE_NEEDS_CFUN) {
+            if (ctx->self->priv->support_config.method == SETTINGS_UPDATE_METHOD_CFUN) {
                 mm_base_modem_at_command (
                     MM_BASE_MODEM (ctx->self),
                     "+CFUN=4",
@@ -497,7 +497,7 @@ set_current_modes_bands_step (GTask *task)
     case SET_CURRENT_MODES_BANDS_STEP_RECOVER_CURRENT_POWER:
         if (ctx->initial_state != MM_MODEM_POWER_STATE_LOW) {
             mm_dbg ("recovering power state after configuration change...");
-            if (ctx->self->priv->support_config.method == BAND_UPDATE_NEEDS_COPS) {
+            if (ctx->self->priv->support_config.method == SETTINGS_UPDATE_METHOD_COPS) {
                 gchar *command;
 
                 /* If the user sent a specific network to use, lock it in. */
@@ -518,7 +518,7 @@ set_current_modes_bands_step (GTask *task)
             }
 
             /* Use this to register if CFUN is needed */
-            if (ctx->self->priv->support_config.method == BAND_UPDATE_NEEDS_CFUN) {
+            if (ctx->self->priv->support_config.method == SETTINGS_UPDATE_METHOD_CFUN) {
                 mm_base_modem_at_command (
                     MM_BASE_MODEM (ctx->self),
                     "+CFUN=1",
@@ -1379,7 +1379,7 @@ mm_broadband_modem_ublox_init (MMBroadbandModemUblox *self)
     self->priv->mode = MM_UBLOX_NETWORKING_MODE_UNKNOWN;
     self->priv->any_allowed = MM_MODEM_MODE_NONE;
     self->priv->support_config.loaded   = FALSE;
-    self->priv->support_config.method   = BAND_UPDATE_NEEDS_UNKNOWN;
+    self->priv->support_config.method   = SETTINGS_UPDATE_METHOD_UNKNOWN;
     self->priv->support_config.uact     = FEATURE_SUPPORT_UNKNOWN;
     self->priv->support_config.ubandsel = FEATURE_SUPPORT_UNKNOWN;
     self->priv->pbready_regex = g_regex_new ("\\r\\n\\+PBREADY\\r\\n",
diff --git a/plugins/ublox/mm-modem-helpers-ublox.c b/plugins/ublox/mm-modem-helpers-ublox.c
index 702992b3d..ce0336de2 100644
--- a/plugins/ublox/mm-modem-helpers-ublox.c
+++ b/plugins/ublox/mm-modem-helpers-ublox.c
@@ -473,20 +473,20 @@ out:
 }
 
 typedef struct {
-    const gchar    *model;
-    UpdateMethod    method;
-    FeatureSupport  uact;
-    FeatureSupport  ubandsel;
-    MMModemMode     mode;
-    MMModemBand     bands_2g[4];
-    MMModemBand     bands_3g[6];
-    MMModemBand     bands_4g[12];
+    const gchar          *model;
+    SettingsUpdateMethod  method;
+    FeatureSupport        uact;
+    FeatureSupport        ubandsel;
+    MMModemMode           mode;
+    MMModemBand           bands_2g[4];
+    MMModemBand           bands_3g[6];
+    MMModemBand           bands_4g[12];
 } BandConfiguration;
 
 static const BandConfiguration band_configuration[] = {
     {
         .model    = "SARA-G300",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G,
@@ -494,7 +494,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-G310",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G,
@@ -502,7 +502,7 @@ static const BandConfiguration band_configuration[] = {
     },
      {
         .model    = "SARA-G340",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G,
@@ -510,7 +510,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-G350",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G,
@@ -518,7 +518,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-G450",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G,
@@ -526,7 +526,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LISA-U200",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G,
@@ -536,7 +536,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LISA-U201",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G,
@@ -546,7 +546,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LISA-U230",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G,
@@ -556,7 +556,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LISA-U260",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G,
@@ -565,7 +565,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LISA-U270",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G,
@@ -574,7 +574,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-U201",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G,
@@ -584,7 +584,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-U260",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G,
@@ -593,7 +593,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-U270",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G,
@@ -602,7 +602,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-U280",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_3G,
@@ -610,7 +610,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "MPCI-L201",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -620,7 +620,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "MPCI-L200",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -632,7 +632,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "MPCI-L210",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -644,7 +644,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "MPCI-L220",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -654,7 +654,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "MPCI-L280",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -666,7 +666,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-L200",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -678,7 +678,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-L201",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -688,7 +688,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-L210",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -700,7 +700,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-L220",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -711,7 +711,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-L280",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -723,7 +723,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-L4006",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_SUPPORTED,
         .ubandsel = FEATURE_UNSUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -735,7 +735,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-L4106",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_SUPPORTED,
         .ubandsel = FEATURE_UNSUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -746,7 +746,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-L4206",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_SUPPORTED,
         .ubandsel = FEATURE_UNSUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -758,7 +758,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-L4906",
-        .method   = BAND_UPDATE_NEEDS_CFUN,
+        .method   = SETTINGS_UPDATE_METHOD_CFUN,
         .uact     = FEATURE_SUPPORTED,
         .ubandsel = FEATURE_UNSUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -769,7 +769,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-R200",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -781,7 +781,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "TOBY-R202",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -791,7 +791,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LARA-R202",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -801,7 +801,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LARA-R203",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_4G,
@@ -809,7 +809,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LARA-R204",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_4G,
@@ -817,7 +817,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LARA-R211",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_4G,
@@ -826,7 +826,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LARA-R280",
-        .method   = BAND_UPDATE_NEEDS_COPS,
+        .method   = SETTINGS_UPDATE_METHOD_COPS,
         .uact     = FEATURE_UNSUPPORTED,
         .ubandsel = FEATURE_SUPPORTED,
         .mode     = MM_MODEM_MODE_3G | MM_MODEM_MODE_4G,
@@ -835,7 +835,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "LARA-R3121",
-        .method   = BAND_UPDATE_NEEDS_UNKNOWN,
+        .method   = SETTINGS_UPDATE_METHOD_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .mode     = MM_MODEM_MODE_4G,
@@ -843,7 +843,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-N200",
-        .method   = BAND_UPDATE_NEEDS_UNKNOWN,
+        .method   = SETTINGS_UPDATE_METHOD_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .mode     = MM_MODEM_MODE_4G,
@@ -851,7 +851,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-N201",
-        .method   = BAND_UPDATE_NEEDS_UNKNOWN,
+        .method   = SETTINGS_UPDATE_METHOD_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .mode     = MM_MODEM_MODE_4G,
@@ -859,7 +859,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-N210",
-        .method   = BAND_UPDATE_NEEDS_UNKNOWN,
+        .method   = SETTINGS_UPDATE_METHOD_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .mode     = MM_MODEM_MODE_4G,
@@ -867,7 +867,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-N211",
-        .method   = BAND_UPDATE_NEEDS_UNKNOWN,
+        .method   = SETTINGS_UPDATE_METHOD_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .mode     = MM_MODEM_MODE_4G,
@@ -875,7 +875,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-N280",
-        .method   = BAND_UPDATE_NEEDS_UNKNOWN,
+        .method   = SETTINGS_UPDATE_METHOD_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .mode     = MM_MODEM_MODE_4G,
@@ -883,7 +883,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-R410M-52B",
-        .method   = BAND_UPDATE_NEEDS_UNKNOWN,
+        .method   = SETTINGS_UPDATE_METHOD_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .mode     = MM_MODEM_MODE_4G,
@@ -892,7 +892,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-R410M-02B",
-        .method   = BAND_UPDATE_NEEDS_UNKNOWN,
+        .method   = SETTINGS_UPDATE_METHOD_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .mode     = MM_MODEM_MODE_4G,
@@ -903,7 +903,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-R412M-02B",
-        .method   = BAND_UPDATE_NEEDS_UNKNOWN,
+        .method   = SETTINGS_UPDATE_METHOD_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .mode     = MM_MODEM_MODE_2G | MM_MODEM_MODE_4G,
@@ -915,7 +915,7 @@ static const BandConfiguration band_configuration[] = {
     },
     {
         .model    = "SARA-N410-02B",
-        .method   = BAND_UPDATE_NEEDS_UNKNOWN,
+        .method   = SETTINGS_UPDATE_METHOD_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .uact     = FEATURE_SUPPORT_UNKNOWN,
         .mode     = MM_MODEM_MODE_4G,
diff --git a/plugins/ublox/mm-modem-helpers-ublox.h b/plugins/ublox/mm-modem-helpers-ublox.h
index 1531552cd..cdbddd0ed 100644
--- a/plugins/ublox/mm-modem-helpers-ublox.h
+++ b/plugins/ublox/mm-modem-helpers-ublox.h
@@ -29,16 +29,16 @@ typedef enum {
 } FeatureSupport;
 
 typedef enum {
-    BAND_UPDATE_NEEDS_UNKNOWN,
-    BAND_UPDATE_NEEDS_CFUN,
-    BAND_UPDATE_NEEDS_COPS,
-} UpdateMethod;
+    SETTINGS_UPDATE_METHOD_UNKNOWN,
+    SETTINGS_UPDATE_METHOD_CFUN,
+    SETTINGS_UPDATE_METHOD_COPS,
+} SettingsUpdateMethod;
 
 typedef struct UbloxSupportConfig {
-    gboolean       loaded;
-    UpdateMethod   method;
-    FeatureSupport uact;
-    FeatureSupport ubandsel;
+    gboolean             loaded;
+    SettingsUpdateMethod method;
+    FeatureSupport       uact;
+    FeatureSupport       ubandsel;
 } UbloxSupportConfig;
 
 /*****************************************************************************/