diff --git a/Podfile b/Podfile
index f908e3884..9e9c5451c 100644
--- a/Podfile
+++ b/Podfile
@@ -69,6 +69,7 @@ abstract_target 'RiotPods' do
 
   # PostHog for analytics
   pod 'PostHog', '~> 1.4.4'
+  pod 'AnalyticsEvents', :path => '../matrix-analytics-events/AnalyticsEvents.podspec'
 
   # Remove warnings from "bad" pods
   pod 'OLMKit', :inhibit_warnings => true
diff --git a/Podfile.lock b/Podfile.lock
index 21da4f99d..f356c62a3 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -14,6 +14,7 @@ PODS:
   - AFNetworking/Serialization (4.0.1)
   - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
+  - AnalyticsEvents (0.1.0)
   - BlueCryptor (1.0.32)
   - BlueECC (1.2.5)
   - BlueRSA (1.0.200)
@@ -114,6 +115,7 @@ PODS:
   - ZXingObjC/All (3.6.5)
 
 DEPENDENCIES:
+  - AnalyticsEvents (from `../matrix-analytics-events/AnalyticsEvents.podspec`)
   - DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
   - DSWaveformImage (~> 6.1.1)
   - ffmpeg-kit-ios-audio (~> 4.5)
@@ -182,8 +184,13 @@ SPEC REPOS:
     - zxcvbn-ios
     - ZXingObjC
 
+EXTERNAL SOURCES:
+  AnalyticsEvents:
+    :path: "../matrix-analytics-events/AnalyticsEvents.podspec"
+
 SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
+  AnalyticsEvents: 5d210d99ddf18f3c81116e5c98f6d9f159598f80
   BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
   BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc
   BlueRSA: dfeef51db96bcc4edec654956c1581adbda4e6a3
@@ -224,6 +231,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 06d0fee10c99dee2531993f8cb2e54ec04f0752b
+PODFILE CHECKSUM: 1a5c7e918ee799655f370ad9fae8cd457b8d1ca1
 
 COCOAPODS: 1.11.2
diff --git a/Riot/Managers/Analytics/Analytics.swift b/Riot/Managers/Analytics/Analytics.swift
index 6b0bbb7b4..358ce63e0 100644
--- a/Riot/Managers/Analytics/Analytics.swift
+++ b/Riot/Managers/Analytics/Analytics.swift
@@ -15,6 +15,7 @@
 //
 
 import PostHog
+import AnalyticsEvents
 
 @objcMembers class Analytics: NSObject {
     
@@ -112,18 +113,19 @@ import PostHog
         postHog?.flush()
     }
     
-    func log(event: String) {
-        postHog?.capture(event)
+    private func capture(event: DictionaryConvertible, named eventName: String) {
+        postHog?.capture(eventName, properties: event.dictionary)
     }
     
-    func trackScreen(_ screenName: String) {
-//        postHog?.capture("screen:\(screenName)")
+    func trackScreen(_ screen: AnalyticsScreen) {
+        let event = AnalyticsEventScreen(durationMs: nil, eventName: .screen, screenName: screen.screenName)
+        capture(event: event, named: event.eventName.rawValue)
     }
     
     func trackE2EEError(_ reason: DecryptionFailureReason, count: Int) {
         for _ in 0..<count {
-            let event = AnalyticsEvent.Error(domain: .E2EE, name: reason.errorName, context: nil)
-            postHog?.capture("\(type(of: event).self)", properties: event.dictionary)
+            let event = AnalyticsEventError(context: nil, domain: .e2Ee, eventName: .error, name: reason.errorName)
+            capture(event: event, named: event.eventName.rawValue)
         }
     }
     
@@ -137,31 +139,34 @@ extension Analytics: MXAnalyticsDelegate {
     func trackDuration(_ seconds: TimeInterval, category: String, name: String) { }
     
     func trackCallStarted(_ call: MXCall) {
-        let event = AnalyticsEvent.CallStarted(placed: !call.isIncoming,
-                                               isVideo: call.isVideoCall,
-                                               numParticipants: Int(call.room.summary.membersCount.joined))
+        let event = AnalyticsEventCallStarted(eventName: .callStarted,
+                                              isVideo: call.isVideoCall,
+                                              numParticipants: Int(call.room.summary.membersCount.joined),
+                                              placed: !call.isIncoming)
         
-        postHog?.capture("\(type(of: event).self)", properties: event.dictionary)
+        capture(event: event, named: event.eventName.rawValue)
     }
     
     func trackCallEnded(_ call: MXCall) {
-        let event = AnalyticsEvent.CallEnded(placed: !call.isIncoming,
-                                             isVideo: call.isVideoCall,
-                                             durationMs: Int(call.duration),
-                                             numParticipants: Int(call.room.summary.membersCount.joined))
+        let event = AnalyticsEventCallEnded(durationMs: Int(call.duration),
+                                            eventName: .callEnded,
+                                            isVideo: call.isVideoCall,
+                                            numParticipants: Int(call.room.summary.membersCount.joined),
+                                            placed: !call.isIncoming)
         
-        postHog?.capture("\(type(of: event).self)", properties: event.dictionary)
+        capture(event: event, named: event.eventName.rawValue)
     }
     
     func trackCallError(_ call: MXCall, with reason: __MXCallHangupReason) {
-        let callEvent = AnalyticsEvent.CallError(placed: !call.isIncoming,
-                                                 isVideo: call.isVideoCall,
-                                                 numParticipants: Int(call.room.summary.membersCount.joined))
+        let callEvent = AnalyticsEventCallError(eventName: .callError,
+                                                isVideo: call.isVideoCall,
+                                                numParticipants: Int(call.room.summary.membersCount.joined),
+                                                placed: !call.isIncoming)
         
-        let event = AnalyticsEvent.Error(domain: .VOIP, name: reason.errorName, context: nil)
+        let event = AnalyticsEventError(context: nil, domain: .voip, eventName: .error, name: reason.errorName)
         
-        postHog?.capture("\(type(of: callEvent).self)", properties: callEvent.dictionary)
-        postHog?.capture("\(type(of: event).self)", properties: event.dictionary)
+        capture(event: callEvent, named: callEvent.eventName.rawValue)
+        capture(event: event, named: event.eventName.rawValue)
     }
     
     func trackContactsAccessGranted(_ granted: Bool) {
diff --git a/Riot/Managers/Analytics/AnalyticsScreen.swift b/Riot/Managers/Analytics/AnalyticsScreen.swift
new file mode 100644
index 000000000..fd65ff004
--- /dev/null
+++ b/Riot/Managers/Analytics/AnalyticsScreen.swift
@@ -0,0 +1,44 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import AnalyticsEvents
+
+@objc enum AnalyticsScreen: Int {
+    case group
+    case home
+    case myGroups
+    case room
+    case roomDirectory
+    case user
+    
+    var screenName: AnalyticsEventScreenName {
+        switch self {
+        case .group:
+            return .group
+        case .home:
+            return .home
+        case .myGroups:
+            return .myGroups
+        case .room:
+            return .room
+        case .roomDirectory:
+            return .roomDirectory
+        case .user:
+            return .user
+        }
+    }
+}
diff --git a/Riot/Managers/Analytics/DictionaryConvertable.swift b/Riot/Managers/Analytics/DictionaryConvertable.swift
index c8bc925b4..403dd91d7 100644
--- a/Riot/Managers/Analytics/DictionaryConvertable.swift
+++ b/Riot/Managers/Analytics/DictionaryConvertable.swift
@@ -16,27 +16,28 @@
 
 import Foundation
 
-protocol DictionaryConvertible {
+protocol DictionaryConvertible: Encodable {
     var dictionary: [String: Any] { get }
 }
 
 extension DictionaryConvertible {
     var dictionary: [String: Any] {
         let mirror = Mirror(reflecting: self)
-        let dict: [String: Any] = Dictionary(uniqueKeysWithValues: mirror.children
-                                                .compactMap { (label: String?, value: Any) in
-                                                    guard let label = label else { return nil }
-                                                    
-                                                    if let value = value as? NSCoding {
-                                                        return (label, value)
-                                                    }
-                                                    
-                                                    if let value = value as? CustomStringConvertible {
-                                                        return (label, value.description)
-                                                    }
-                                                    
-                                                    return nil
-                                                })
+        let dict: [String: Any] = Dictionary(uniqueKeysWithValues: mirror.children.compactMap { (label: String?, value: Any) in
+            guard let label = label else { return nil }
+            
+            // Handle standard types such as String/Int/Bool
+            if let value = value as? NSCoding {
+                return (label, value)
+            }
+            
+            // AnalyticsEvent enums
+            if let value = value as? CustomStringConvertible {
+                return (label, value.description)
+            }
+            
+            return nil
+        })
         
         return dict
     }
diff --git a/Riot/Managers/Analytics/EventExtensions.swift b/Riot/Managers/Analytics/EventExtensions.swift
index 718c71eba..c6daf485b 100644
--- a/Riot/Managers/Analytics/EventExtensions.swift
+++ b/Riot/Managers/Analytics/EventExtensions.swift
@@ -15,60 +15,70 @@
 //
 
 import Foundation
+import AnalyticsEvents
 
-// MARK:  -Events
+// MARK: - Events
+//
+// All events must conform to DictionaryConvertible to be captured by PostHog
 
-extension AnalyticsEvent.Error: DictionaryConvertible { }
-extension AnalyticsEvent.CallStarted: DictionaryConvertible { }
-extension AnalyticsEvent.CallEnded: DictionaryConvertible { }
-extension AnalyticsEvent.CallError: DictionaryConvertible { }
+extension AnalyticsEventError: DictionaryConvertible { }
+extension AnalyticsEventCallStarted: DictionaryConvertible { }
+extension AnalyticsEventCallEnded: DictionaryConvertible { }
+extension AnalyticsEventCallError: DictionaryConvertible { }
+extension AnalyticsEventScreen: DictionaryConvertible { }
 
 // MARK: - Enums
+//
+// All enums must conform to CustomStringConvertible for DictionaryConvertible to access the raw value
 
-extension AnalyticsEvent.ErrorDomain: CustomStringConvertible {
-    var description: String { rawValue }
+extension AnalyticsEventErrorDomain: CustomStringConvertible {
+    public var description: String { rawValue }
 }
 
-extension AnalyticsEvent.ErrorName: CustomStringConvertible {
-    var description: String { rawValue }
+extension AnalyticsEventErrorName: CustomStringConvertible {
+    public var description: String { rawValue }
+}
+
+extension AnalyticsEventScreenName: CustomStringConvertible {
+    public var description: String { rawValue }
 }
 
 // MARK: - Helpers
 
 extension __MXCallHangupReason {
-    var errorName: AnalyticsEvent.ErrorName {
+    var errorName: AnalyticsEventErrorName {
         switch self {
         case .userHangup:
-            return .VoipUserHangup
+            return .voipUserHangup
         case .inviteTimeout:
-            return .VoipInviteTimeout
+            return .voipInviteTimeout
         case .iceFailed:
-            return .VoipIceFailed
+            return .voipIceFailed
         case .iceTimeout:
-            return .VoipIceTimeout
+            return .voipIceTimeout
         case .userMediaFailed:
-            return .VoipUserMediaFailed
+            return .voipUserMediaFailed
         case .unknownError:
-            return .UnknownError
+            return .unknownError
         default:
-            return .UnknownError
+            return .unknownError
         }
     }
 }
 
 extension DecryptionFailureReason {
-    var errorName: AnalyticsEvent.ErrorName {
+    var errorName: AnalyticsEventErrorName {
         switch self {
         case .unspecified:
-            return .OlmUnspecifiedError
+            return .olmUnspecifiedError
         case .olmKeysNotSent:
-            return .OlmKeysNotSentError
+            return .olmKeysNotSentError
         case .olmIndexError:
-            return .OlmIndexError
+            return .olmIndexError
         case .unexpected:
-            return .UnknownError
+            return .unknownError
         default:
-            return .UnknownError
+            return .unknownError
         }
     }
 }
diff --git a/Riot/Managers/Analytics/Generated/GeneratedEvents.swift b/Riot/Managers/Analytics/Generated/GeneratedEvents.swift
deleted file mode 100644
index 11100e091..000000000
--- a/Riot/Managers/Analytics/Generated/GeneratedEvents.swift
+++ /dev/null
@@ -1,45 +0,0 @@
-import Foundation
-
-struct AnalyticsEvent {
-    struct Error {
-        let domain: ErrorDomain
-        let name: ErrorName
-        let context: String?
-    }
-    
-    enum ErrorDomain: String {
-        case E2EE
-        case VOIP
-    }
-    
-    enum ErrorName: String {
-        case UnknownError
-        case OlmIndexError
-        case OlmKeysNotSentError
-        case OlmUnspecifiedError
-        case VoipUserHangup
-        case VoipIceFailed
-        case VoipInviteTimeout
-        case VoipIceTimeout
-        case VoipUserMediaFailed
-    }
-    
-    struct CallStarted {
-        let placed: Bool
-        let isVideo: Bool
-        let numParticipants: Int
-    }
-    
-    struct CallEnded {
-        let placed: Bool
-        let isVideo: Bool
-        let durationMs: Int
-        let numParticipants: Int
-    }
-    
-    struct CallError {
-        let placed: Bool
-        let isVideo: Bool
-        let numParticipants: Int
-    }
-}
diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
index a698c9bad..67b2a9e8b 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -309,9 +309,6 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"Authentication"];
     
     [_keyboardAvoider startAvoiding];
 }
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.h b/Riot/Modules/Common/Recents/RecentsViewController.h
index a9e9c4863..8afc8b26e 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.h
+++ b/Riot/Modules/Common/Recents/RecentsViewController.h
@@ -85,11 +85,6 @@ FOUNDATION_EXPORT NSString *const RecentsViewControllerDataReadyNotification;
  */
 @property (nonatomic) CGFloat stickyHeaderHeight;
 
-/**
- The analytics instance screen name (Default is "RecentsScreen").
- */
-@property (nonatomic) NSString *screenName;
-
 /**
  Empty view to display when there is no item to show on the screen.
  */
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
index 922c30463..d73827749 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.m
+++ b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -106,9 +106,6 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     self.enableBarTintColorStatusChange = NO;
     self.rageShakeManager = [RageShakeManager sharedManager];
     
-    // Set default screen name
-    _screenName = @"RecentsScreen";
-    
     // Enable the search bar in the recents table, and remove the search option from the navigation bar.
     _enableSearchBar = YES;
     self.enableBarButtonSearch = NO;
@@ -260,7 +257,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     [super viewWillAppear:animated];
 
     // Screen tracking
-    [Analytics.shared trackScreen:_screenName];
+    [Analytics.shared trackScreen:AnalyticsScreenHome];
 
     // Reset back user interactions
     self.userInteractionEnabled = YES;
diff --git a/Riot/Modules/Communities/GroupsViewController.m b/Riot/Modules/Communities/GroupsViewController.m
index cd722d323..c72e95dab 100644
--- a/Riot/Modules/Communities/GroupsViewController.m
+++ b/Riot/Modules/Communities/GroupsViewController.m
@@ -204,7 +204,7 @@
     [super viewWillAppear:animated];
     
     // Screen tracking
-    [Analytics.shared trackScreen:@"Groups"];
+    [Analytics.shared trackScreen:AnalyticsScreenMyGroups];
     
     // Deselect the current selected row, it will be restored on viewDidAppear (if any)
     NSIndexPath *indexPath = [self.groupsTableView indexPathForSelectedRow];
diff --git a/Riot/Modules/Communities/Home/GroupHomeViewController.m b/Riot/Modules/Communities/Home/GroupHomeViewController.m
index 12d240f64..b12cd5d70 100644
--- a/Riot/Modules/Communities/Home/GroupHomeViewController.m
+++ b/Riot/Modules/Communities/Home/GroupHomeViewController.m
@@ -206,7 +206,7 @@
     [super viewWillAppear:animated];
     
     // Screen tracking
-    [Analytics.shared trackScreen:@"GroupDetailsHome"];
+    [Analytics.shared trackScreen:AnalyticsScreenGroup];
     
     // Release the potential pushed view controller
     [self releasePushedViewController];
diff --git a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
index f8a0508c4..9a87f6562 100644
--- a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
+++ b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
@@ -219,9 +219,6 @@
 {
     [super viewWillAppear:animated];
     
-    // Screen tracking
-    [Analytics.shared trackScreen:@"GroupDetailsPeople"];
-    
     // Release the potential pushed view controller
     [self releasePushedViewController];
     
diff --git a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
index a51a762f1..855c46580 100644
--- a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
+++ b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
@@ -183,9 +183,6 @@
 {
     [super viewWillAppear:animated];
     
-    // Screen tracking
-    [Analytics.shared trackScreen:@"GroupDetailsRooms"];
-    
     // Release the potential pushed view controller
     [self releasePushedViewController];
     
diff --git a/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m b/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
index 96660bcc6..339af8584 100644
--- a/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
+++ b/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
@@ -136,9 +136,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    
-    // Screen tracking
-    [Analytics.shared trackScreen:@"GroupDetails"];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
diff --git a/Riot/Modules/Contacts/ContactsTableViewController.h b/Riot/Modules/Contacts/ContactsTableViewController.h
index f1b3effaf..d35c71dbe 100644
--- a/Riot/Modules/Contacts/ContactsTableViewController.h
+++ b/Riot/Modules/Contacts/ContactsTableViewController.h
@@ -85,11 +85,6 @@
  */
 @property (nonatomic) BOOL shouldScrollToTopOnRefresh;
 
-/**
- The analytics instance screen name (Default is "ContactsTable").
- */
-@property (nonatomic) NSString *screenName;
-
 /**
  Callback used to take into account the change of the user interface theme.
  */
diff --git a/Riot/Modules/Contacts/ContactsTableViewController.m b/Riot/Modules/Contacts/ContactsTableViewController.m
index ab59604f6..b564d226c 100644
--- a/Riot/Modules/Contacts/ContactsTableViewController.m
+++ b/Riot/Modules/Contacts/ContactsTableViewController.m
@@ -76,8 +76,6 @@
     // Setup `MXKViewControllerHandling` properties
     self.enableBarTintColorStatusChange = NO;
     self.rageShakeManager = [RageShakeManager sharedManager];
-    
-    _screenName = @"ContactsTable";
 }
 
 - (void)viewDidLoad
@@ -159,9 +157,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:_screenName];
     
     MXWeakify(self);
 
diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
index a42ee9225..be2fe5596 100644
--- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
+++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
@@ -232,9 +232,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"ContactDetails"];
     
     // Hide the bottom border of the navigation bar to display the expander header
     [self hideNavigationBarBorder:YES];
diff --git a/Riot/Modules/Favorites/FavouritesViewController.m b/Riot/Modules/Favorites/FavouritesViewController.m
index 12f129d68..f7148a6e6 100644
--- a/Riot/Modules/Favorites/FavouritesViewController.m
+++ b/Riot/Modules/Favorites/FavouritesViewController.m
@@ -39,8 +39,6 @@
 {
     [super finalizeInit];
     
-    self.screenName = @"Favourites";
-    
     self.enableDragging = YES;
 }
 
diff --git a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
index c67f9e3f9..ee756902c 100644
--- a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
@@ -109,9 +109,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [Analytics.shared trackScreen:@"FilesGlobalSearch"];
-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshSearchResult:) name:kMXSessionDidLeaveRoomNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshSearchResult:) name:kMXSessionNewRoomNotification object:nil];
 }
diff --git a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
index 5a439b6bb..acf36b053 100644
--- a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
@@ -115,9 +115,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"MessagesGlobalSearch"];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshSearchResult:) name:kMXSessionDidLeaveRoomNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshSearchResult:) name:kMXSessionNewRoomNotification object:nil];
diff --git a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
index f62b5beec..ec511bb3c 100644
--- a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
+++ b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
@@ -108,7 +108,7 @@
     [super viewWillAppear:animated];
 
     // Screen tracking
-    [Analytics.shared trackScreen:@"Directory"];
+    [Analytics.shared trackScreen:AnalyticsScreenRoomDirectory];
     
     // Observe kAppDelegateDidTapStatusBarNotificationObserver.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
diff --git a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
index d2f044854..7d240e48c 100644
--- a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
@@ -80,7 +80,6 @@
     [titles addObject:[VectorL10n searchRooms]];
     recentsViewController = [RecentsViewController recentListViewController];
     recentsViewController.enableSearchBar = NO;
-    recentsViewController.screenName = @"UnifiedSearchRooms";
     [viewControllers addObject:recentsViewController];
 
     [titles addObject:[VectorL10n searchMessages]];
@@ -144,9 +143,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [Analytics.shared trackScreen:@"UnifiedSearch"];
-
     // Let's child display the loading not the home view controller
     if (self.activityIndicator)
     {
diff --git a/Riot/Modules/Home/HomeViewController.m b/Riot/Modules/Home/HomeViewController.m
index 0f7f5234b..89dd5d3c0 100644
--- a/Riot/Modules/Home/HomeViewController.m
+++ b/Riot/Modules/Home/HomeViewController.m
@@ -68,8 +68,6 @@
     selectedSection = -1;
     selectedRoomId = nil;
     selectedCollectionViewContentOffset = -1;
-    
-    self.screenName = @"Home";
 }
 
 - (void)viewDidLoad
@@ -102,6 +100,9 @@
 {
     [super viewWillAppear:animated];
     
+    // Screen tracking
+    [Analytics.shared trackScreen:AnalyticsScreenHome];
+    
     [AppDelegate theDelegate].masterTabBarController.navigationItem.title = [VectorL10n titleHome];
 
     [ThemeService.shared.theme applyStyleOnNavigationBar:[AppDelegate theDelegate].masterTabBarController.navigationController.navigationBar];
diff --git a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
index f847f5c6d..c01c845e6 100644
--- a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
+++ b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
@@ -163,9 +163,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"MediaAlbumContent"];
     
     self.navigationItem.title = _assetsCollection.localizedTitle;
     
diff --git a/Riot/Modules/MediaPicker/MediaPickerViewController.m b/Riot/Modules/MediaPicker/MediaPickerViewController.m
index 9aa20846b..190af4d17 100644
--- a/Riot/Modules/MediaPicker/MediaPickerViewController.m
+++ b/Riot/Modules/MediaPicker/MediaPickerViewController.m
@@ -212,9 +212,6 @@
     [super viewWillAppear:animated];
     
     [self userInterfaceThemeDidChange];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"MediaPicker"];
     
     if (!userAlbumsQueue)
     {
diff --git a/Riot/Modules/People/PeopleViewController.m b/Riot/Modules/People/PeopleViewController.m
index 1cb481a90..9d93622c2 100644
--- a/Riot/Modules/People/PeopleViewController.m
+++ b/Riot/Modules/People/PeopleViewController.m
@@ -50,8 +50,6 @@
     [super finalizeInit];
     
     directRoomsSectionNumber = 0;
-    
-    self.screenName = @"People";
 }
 
 - (void)viewDidLoad
diff --git a/Riot/Modules/Room/Attachements/AttachmentsViewController.m b/Riot/Modules/Room/Attachements/AttachmentsViewController.m
index 556539a6a..31bb29519 100644
--- a/Riot/Modules/Room/Attachements/AttachmentsViewController.m
+++ b/Riot/Modules/Room/Attachements/AttachmentsViewController.m
@@ -73,14 +73,6 @@
     return ThemeService.shared.theme.statusBarStyle;
 }
 
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"AttachmentsViewer"];
-}
-
 - (void)destroy
 {
     [super destroy];
diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
index 0d68d9b42..68112586e 100644
--- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
@@ -240,7 +240,7 @@
     [super viewWillAppear:animated];
 
     // Screen tracking
-    [Analytics.shared trackScreen:@"RoomMemberDetails"];
+    [Analytics.shared trackScreen:AnalyticsScreenUser];
 
     [self userInterfaceThemeDidChange];
 
diff --git a/Riot/Modules/Room/Members/RoomParticipantsViewController.m b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
index 737a3d1be..6802f7a3b 100644
--- a/Riot/Modules/Room/Members/RoomParticipantsViewController.m
+++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
@@ -245,9 +245,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"RoomParticipants"];
     
     // Refresh display
     [self refreshTableView];
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index bcc330c61..3792006c4 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -570,7 +570,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     [super viewWillAppear:animated];
     
     // Screen tracking
-    [Analytics.shared trackScreen:@"ChatRoom"];
+    [Analytics.shared trackScreen:AnalyticsScreenRoom];
     
     // Refresh the room title view
     [self refreshRoomTitle];
diff --git a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
index 17bfde94a..c063cc7b9 100644
--- a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
+++ b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
@@ -109,9 +109,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"RoomFilesSearch"];
     
     // Observe kAppDelegateDidTapStatusBarNotificationObserver.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
diff --git a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
index 13ec858ad..6848a1665 100644
--- a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
+++ b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
@@ -111,9 +111,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [Analytics.shared trackScreen:@"RoomMessagesSearch"];
-
     // Observe kAppDelegateDidTapStatusBarNotificationObserver.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
         
diff --git a/Riot/Modules/Room/Search/RoomSearchViewController.m b/Riot/Modules/Room/Search/RoomSearchViewController.m
index f73ada35f..5991b4fe6 100644
--- a/Riot/Modules/Room/Search/RoomSearchViewController.m
+++ b/Riot/Modules/Room/Search/RoomSearchViewController.m
@@ -106,9 +106,6 @@
         [self.activityIndicator stopAnimating];
         self.activityIndicator = nil;
     }
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"RoomsSearch"];
     
     // Enable the search field by default at the screen opening
     if (self.searchBarHidden)
diff --git a/Riot/Modules/Room/Settings/RoomSettingsViewController.m b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
index de36a4035..b0b5944e2 100644
--- a/Riot/Modules/Room/Settings/RoomSettingsViewController.m
+++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
@@ -311,9 +311,6 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"RoomSettings"];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didUpdateRules:) name:kMXNotificationCenterDidUpdateRules object:nil];
     
diff --git a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
index c3a7c752c..25f335203 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
+++ b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
@@ -145,9 +145,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [Analytics.shared trackScreen:@"DirectoryServerPicker"];
-
     // Observe kAppDelegateDidTapStatusBarNotificationObserver.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
diff --git a/Riot/Modules/Rooms/RoomsViewController.m b/Riot/Modules/Rooms/RoomsViewController.m
index 25ae25ce9..63145b1c4 100644
--- a/Riot/Modules/Rooms/RoomsViewController.m
+++ b/Riot/Modules/Rooms/RoomsViewController.m
@@ -36,13 +36,6 @@
     return viewController;
 }
 
-- (void)finalizeInit
-{
-    [super finalizeInit];
-    
-    self.screenName = @"Rooms";
-}
-
 - (void)viewDidLoad
 {
     [super viewDidLoad];
diff --git a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
index b617fe465..ea6297529 100644
--- a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
+++ b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
@@ -95,9 +95,6 @@ static CGFloat const kTextFontSize = 15.0;
     [super viewWillAppear:animated];
 
     [self userInterfaceThemeDidChange];
-    
-    // Screen tracking
-    [Analytics.shared trackScreen:@"DeactivateAccount"];
 }
 
 - (void)viewDidLayoutSubviews
diff --git a/Riot/Modules/Settings/Language/LanguagePickerViewController.m b/Riot/Modules/Settings/Language/LanguagePickerViewController.m
index c93b88ae1..7c4c69055 100644
--- a/Riot/Modules/Settings/Language/LanguagePickerViewController.m
+++ b/Riot/Modules/Settings/Language/LanguagePickerViewController.m
@@ -106,14 +106,6 @@
     }
 }
 
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"CountryPicker"];
-}
-
 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
 {
     cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
diff --git a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
index 8842d7e87..bdbc14ee1 100644
--- a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
+++ b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
@@ -95,14 +95,6 @@
     return ThemeService.shared.theme.statusBarStyle;
 }
 
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"CountryPicker"];
-}
-
 - (void)destroy
 {
     [super destroy];
diff --git a/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m b/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
index 02eac7c51..42920094f 100644
--- a/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
+++ b/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
@@ -161,9 +161,6 @@ enum {
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [Analytics.shared trackScreen:@"ManageSession"];
-
     // Release the potential pushed view controller
     [self releasePushedViewController];
 
diff --git a/Riot/Modules/Settings/Security/SecurityViewController.m b/Riot/Modules/Settings/Security/SecurityViewController.m
index 9b61048a6..333459083 100644
--- a/Riot/Modules/Settings/Security/SecurityViewController.m
+++ b/Riot/Modules/Settings/Security/SecurityViewController.m
@@ -250,9 +250,6 @@ TableViewSectionsDelegate>
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [Analytics.shared trackScreen:@"Security"];
-
     // Release the potential pushed view controller
     [self releasePushedViewController];
 
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index 304266411..b5d4c3b05 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -776,9 +776,6 @@ TableViewSectionsDelegate>
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [Analytics.shared trackScreen:@"Settings"];
     
     // Refresh display
     [self refreshSettings];
diff --git a/Riot/Modules/StartChat/StartChatViewController.m b/Riot/Modules/StartChat/StartChatViewController.m
index 18ef614dd..f9807d408 100644
--- a/Riot/Modules/StartChat/StartChatViewController.m
+++ b/Riot/Modules/StartChat/StartChatViewController.m
@@ -73,8 +73,6 @@
 {
     [super finalizeInit];
     
-    self.screenName = @"StartChat";
-    
     _isAddParticipantSearchBarEditing = NO;
     
     // Prepare room participants
diff --git a/Riot/Modules/UserDevices/UsersDevicesViewController.m b/Riot/Modules/UserDevices/UsersDevicesViewController.m
index 5371b3100..308f0afcd 100644
--- a/Riot/Modules/UserDevices/UsersDevicesViewController.m
+++ b/Riot/Modules/UserDevices/UsersDevicesViewController.m
@@ -120,9 +120,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [Analytics.shared trackScreen:@"UnknownDevices"];
-
     [self.tableView reloadData];
 }