diff --git a/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/SuperProperties.kt b/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/SuperProperties.kt
index 941db5e..e2968c0 100644
--- a/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/SuperProperties.kt
+++ b/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/SuperProperties.kt
@@ -76,7 +76,7 @@ data class SuperProperties(
         /**
          * Element Desktop platform.
          */
-        Electron_Platform("Electron Platform"),
+        ElectronPlatform("Electron Platform"),
 
         /**
          * Other Platform.
@@ -86,7 +86,7 @@ data class SuperProperties(
         /**
          * Element Deb platform.
          */
-        Web_Platform("Web Platform"),
+        WebPlatform("Web Platform"),
     }
 
     fun getProperties(): Map<String, Any>? {
diff --git a/stub-generator/matrix_analytics_stub_generator/kotlin.py b/stub-generator/matrix_analytics_stub_generator/kotlin.py
index 1cb0602..fc9554c 100644
--- a/stub-generator/matrix_analytics_stub_generator/kotlin.py
+++ b/stub-generator/matrix_analytics_stub_generator/kotlin.py
@@ -1,3 +1,4 @@
+import re
 from .schema import Schema, is_mobile_screen_event, first_letter_up, first_letter_down, split_text
 
 def compute_kotlin(schema: Schema) -> str:
@@ -86,7 +87,7 @@ def compute_kotlin(schema: Schema) -> str:
                 result += f"        /**\n"
                 result += f"{split_text('         * ', value.description)}\n"
                 result += f"         */\n"
-            validIdentifier = value.name.replace(" ", "_")
+            validIdentifier = re.sub('[^a-zA-Z0-9_]', '', value.name)
             result += f"        {validIdentifier}(\"{value.name}\"),\n"
             isFirstEnum = False
         result += "    }\n"
diff --git a/stub-generator/matrix_analytics_stub_generator/swift.py b/stub-generator/matrix_analytics_stub_generator/swift.py
index 86c1721..ac34d28 100644
--- a/stub-generator/matrix_analytics_stub_generator/swift.py
+++ b/stub-generator/matrix_analytics_stub_generator/swift.py
@@ -1,3 +1,4 @@
+import re
 from .schema import Schema, Member, is_mobile_screen_event
 
 
@@ -123,7 +124,7 @@ def compute_swift(schema: Schema) -> str:
         for value in enum.values:
             if value.description:
                 result += f"            /// {value.description}\n"
-            validIdentifier = value.name.replace(" ", "_")
+            validIdentifier = re.sub('[^a-zA-Z0-9_]', '', value.name)
             result += f"            case {validIdentifier} = \"{value.name}\"\n"
         result += "        }\n"
 
diff --git a/types/swift/SuperProperties.swift b/types/swift/SuperProperties.swift
index 8d33291..b14cef7 100644
--- a/types/swift/SuperProperties.swift
+++ b/types/swift/SuperProperties.swift
@@ -53,11 +53,11 @@ extension AnalyticsEvent {
             /// Element-X iOS platform.
             case EXI = "EXI"
             /// Element Desktop platform.
-            case Electron_Platform = "Electron Platform"
+            case ElectronPlatform = "Electron Platform"
             /// Other Platform.
             case Other = "Other"
             /// Element Deb platform.
-            case Web_Platform = "Web Platform"
+            case WebPlatform = "Web Platform"
         }
 
         public var properties: [String: Any?] {