diff --git a/client/ui/controllers/api/apiConfigsController.cpp b/client/ui/controllers/api/apiConfigsController.cpp
index 4c39ee3c6..8fd1271b0 100644
--- a/client/ui/controllers/api/apiConfigsController.cpp
+++ b/client/ui/controllers/api/apiConfigsController.cpp
@@ -46,7 +46,7 @@ namespace
         constexpr char serviceDescription[] = "service_description";
         constexpr char subscriptionPlans[] = "subscription_plans";
         constexpr char storeProductId[] = "store_product_id";
-        constexpr char primaryRight[] = "primary_right";
+        constexpr char priceLabel[] = "price_label";
 
         constexpr char apiPayload[] = "api_payload";
         constexpr char keyPayload[] = "key_payload";
@@ -337,7 +337,7 @@ namespace
                 if (priceIt == idToDisplayPrice.cend()) {
                     continue;
                 }
-                planObject.insert(configKey::primaryRight, *priceIt);
+                planObject.insert(configKey::priceLabel, *priceIt);
                 mergedPlans.append(planObject);
             }
             plans = mergedPlans;
diff --git a/client/ui/models/api/apiSubscriptionPlansModel.cpp b/client/ui/models/api/apiSubscriptionPlansModel.cpp
index 7e536dec1..6cd1eb5ed 100644
--- a/client/ui/models/api/apiSubscriptionPlansModel.cpp
+++ b/client/ui/models/api/apiSubscriptionPlansModel.cpp
@@ -2,27 +2,21 @@
 
 #include <QJsonObject>
 #include <QJsonValue>
+#include <QModelIndex>
 #include <utility>
 
 namespace
 {
 namespace configKey
 {
-    constexpr char primaryLeft[] = "primary_left";
-    constexpr char primaryRight[] = "primary_right";
+    constexpr char billingPeriod[] = "billing_period";
+    constexpr char priceLabel[] = "price_label";
     constexpr char subtitle[] = "subtitle";
     constexpr char recommended[] = "recommended";
     constexpr char checkoutUrl[] = "checkout_url";
     constexpr char isTrial[] = "is_trial";
     constexpr char serviceProtocol[] = "service_protocol";
     constexpr char storeProductId[] = "store_product_id";
-
-    constexpr char primaryLeftCamel[] = "primaryLeft";
-    constexpr char primaryRightCamel[] = "primaryRight";
-    constexpr char checkoutUrlCamel[] = "checkoutUrl";
-    constexpr char isTrialCamel[] = "isTrial";
-    constexpr char serviceProtocolCamel[] = "serviceProtocol";
-    constexpr char storeProductIdCamel[] = "storeProductId";
 }
 }
 
@@ -46,10 +40,10 @@ QVariant ApiSubscriptionPlansModel::data(const QModelIndex &index, int role) con
     }
     const SubscriptionPlanItem &plan = m_subscriptionPlans.at(index.row());
     switch (role) {
-    case PrimaryLeftRole:
-        return plan.primaryLeft;
-    case PrimaryRightRole:
-        return plan.primaryRight;
+    case BillingPeriodRole:
+        return plan.billingPeriod;
+    case PriceLabelRole:
+        return plan.priceLabel;
     case SubtitleRole:
         return plan.subtitle;
     case RecommendedRole:
@@ -70,8 +64,8 @@ QVariant ApiSubscriptionPlansModel::data(const QModelIndex &index, int role) con
 QHash<int, QByteArray> ApiSubscriptionPlansModel::roleNames() const
 {
     return {
-        { PrimaryLeftRole, "primaryLeft" },
-        { PrimaryRightRole, "primaryRight" },
+        { BillingPeriodRole, "billingPeriod" },
+        { PriceLabelRole, "priceLabel" },
         { SubtitleRole, "subtitle" },
         { RecommendedRole, "recommended" },
         { CheckoutUrlRole, "checkoutUrl" },
@@ -92,8 +86,8 @@ void ApiSubscriptionPlansModel::updateModel(const QJsonArray &arr)
         }
         const QJsonObject planObject = planValue.toObject();
         SubscriptionPlanItem subscriptionPlan;
-        subscriptionPlan.primaryLeft = planObject.value(configKey::primaryLeft).toString();
-        subscriptionPlan.primaryRight = planObject.value(configKey::primaryRight).toString();
+        subscriptionPlan.billingPeriod = planObject.value(configKey::billingPeriod).toString();
+        subscriptionPlan.priceLabel = planObject.value(configKey::priceLabel).toString();
         subscriptionPlan.subtitle = planObject.value(configKey::subtitle).toString();
         subscriptionPlan.recommended = planObject.value(configKey::recommended).toBool();
         subscriptionPlan.checkoutUrl = planObject.value(configKey::checkoutUrl).toString();
@@ -117,16 +111,13 @@ QVariantMap ApiSubscriptionPlansModel::planAt(int row) const
     if (row < 0 || row >= m_subscriptionPlans.size()) {
         return {};
     }
-    const SubscriptionPlanItem &plan = m_subscriptionPlans.at(row);
+    const QModelIndex modelIndex = index(row, 0);
     QVariantMap planMap;
-    planMap.insert(QLatin1String(configKey::primaryLeftCamel), plan.primaryLeft);
-    planMap.insert(QLatin1String(configKey::primaryRightCamel), plan.primaryRight);
-    planMap.insert(QLatin1String(configKey::subtitle), plan.subtitle);
-    planMap.insert(QLatin1String(configKey::recommended), plan.recommended);
-    planMap.insert(QLatin1String(configKey::checkoutUrlCamel), plan.checkoutUrl);
-    planMap.insert(QLatin1String(configKey::isTrialCamel), plan.isTrial);
-    planMap.insert(QLatin1String(configKey::serviceProtocolCamel), plan.serviceProtocol);
-    planMap.insert(QLatin1String(configKey::storeProductIdCamel), plan.storeProductId);
+    const QHash<int, QByteArray> roles = roleNames();
+    planMap.reserve(roles.size());
+    for (auto roleIt = roles.cbegin(); roleIt != roles.cend(); ++roleIt) {
+        planMap.insert(QString::fromUtf8(roleIt.value()), data(modelIndex, roleIt.key()));
+    }
     return planMap;
 }
 
diff --git a/client/ui/models/api/apiSubscriptionPlansModel.h b/client/ui/models/api/apiSubscriptionPlansModel.h
index 72eb85ca6..3a26f7649 100644
--- a/client/ui/models/api/apiSubscriptionPlansModel.h
+++ b/client/ui/models/api/apiSubscriptionPlansModel.h
@@ -11,8 +11,8 @@ class ApiSubscriptionPlansModel : public QAbstractListModel
 
 public:
     enum Roles {
-        PrimaryLeftRole = Qt::UserRole + 1,
-        PrimaryRightRole,
+        BillingPeriodRole = Qt::UserRole + 1,
+        PriceLabelRole,
         SubtitleRole,
         RecommendedRole,
         CheckoutUrlRole,
@@ -37,8 +37,8 @@ public:
 private:
     struct SubscriptionPlanItem
     {
-        QString primaryLeft;
-        QString primaryRight;
+        QString billingPeriod;
+        QString priceLabel;
         QString subtitle;
         bool recommended = false;
         QString checkoutUrl;
diff --git a/client/ui/qml/Components/SubscriptionPlanCard.qml b/client/ui/qml/Components/SubscriptionPlanCard.qml
index a2bc03325..f69ece34c 100644
--- a/client/ui/qml/Components/SubscriptionPlanCard.qml
+++ b/client/ui/qml/Components/SubscriptionPlanCard.qml
@@ -9,8 +9,8 @@ Rectangle {
     id: root
 
     property bool selected: false
-    property string primaryLeft: ""
-    property string primaryRight: ""
+    property string billingPeriod: ""
+    property string priceLabel: ""
     property string subtitle: ""
     property bool showRecommendedBadge: false
     property string recommendedText: "Recommended"
@@ -39,7 +39,7 @@ Rectangle {
 
             LabelTextType {
                 Layout.fillWidth: true
-                text: root.primaryLeft
+                text: root.billingPeriod
                 color: root.selected ? AmneziaStyle.color.goldenApricot : AmneziaStyle.color.paleGray
                 font.pixelSize: 17
                 font.weight: Font.DemiBold
@@ -47,7 +47,7 @@ Rectangle {
             }
 
             LabelTextType {
-                text: root.primaryRight
+                text: root.priceLabel
                 color: root.selected ? AmneziaStyle.color.goldenApricot : AmneziaStyle.color.paleGray
                 font.pixelSize: 17
                 font.weight: Font.DemiBold
diff --git a/client/ui/qml/Pages2/PageSetupWizardApiPremiumInfo.qml b/client/ui/qml/Pages2/PageSetupWizardApiPremiumInfo.qml
index ba40e3c2c..0147a3520 100644
--- a/client/ui/qml/Pages2/PageSetupWizardApiPremiumInfo.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardApiPremiumInfo.qml
@@ -84,8 +84,8 @@ PageType {
                     Layout.bottomMargin: index === ApiSubscriptionPlansModel.rowCount() - 1 ? 24 : 12
 
                     selected: root.selectedPlanIndex === index
-                    primaryLeft: String(model.primaryLeft)
-                    primaryRight: String(model.primaryRight)
+                    billingPeriod: String(model.billingPeriod)
+                    priceLabel: String(model.priceLabel)
                     subtitle: String(model.subtitle)
                     showRecommendedBadge: !!model.recommended
                     recommendedText: qsTr("Recommended")
@@ -207,7 +207,7 @@ PageType {
             if (!plan) {
                 return qsTr("Continue")
             }
-            return qsTr("Subscribe — %1 for %2").arg(String(plan.primaryLeft)).arg(String(plan.primaryRight))
+            return qsTr("Subscribe — %1 for %2").arg(String(plan.billingPeriod)).arg(String(plan.priceLabel))
         }
 
         clickedFunc: function() {