diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
index 80947013d5..3128ac766d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
@@ -86,10 +86,10 @@ class ProfileFunctionImplementation @Inject constructor(
         }
         if (activeTreatments.profileSwitchesFromHistory.size() > 0) {
             val bundle = Bundle()
-            bundle.putString(FirebaseAnalytics.Param.ITEM_ID, "CatchedError")
+            bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_ID, "CatchedError")
             bundle.putString(FirebaseAnalytics.Param.ITEM_CATEGORY, BuildConfig.BUILDVERSION)
             bundle.putString(FirebaseAnalytics.Param.START_DATE, time.toString())
-            bundle.putString(FirebaseAnalytics.Param.VALUE, activeTreatments.profileSwitchesFromHistory.toString())
+            bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_NAME, activeTreatments.profileSwitchesFromHistory.toString())
             fabricPrivacy.logCustom(bundle)
         }
         aapsLogger.error("getProfile at the end: returning null")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index c3de444efd..9ac6aa4df5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -652,8 +652,8 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             context.startActivity(i);
 
             Bundle bundle = new Bundle();
-            bundle.putString(FirebaseAnalytics.Param.ITEM_ID, "TreatmentClash");
-            bundle.putString(FirebaseAnalytics.Param.VALUE, status);
+            bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_ID, "TreatmentClash");
+            bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_NAME, status);
             fabricPrivacy.logCustom(bundle);
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt b/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
index 19d25e008b..41eb2464f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
@@ -48,7 +48,7 @@ class FabricPrivacy @Inject constructor(
     fun logCustom(event: Bundle) {
         try {
             if (fabricEnabled()) {
-                mainApp.firebaseAnalytics.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, event)
+                mainApp.firebaseAnalytics.logEvent(FirebaseAnalytics.Event.SELECT_ITEM, event)
             } else {
                 aapsLogger.debug(LTag.CORE, "Ignoring recently opted-out event: $event")
             }