diff --git a/Riot/Managers/Call/CallService.swift b/Riot/Managers/Call/CallService.swift
index 80a8996ae..39857513d 100644
--- a/Riot/Managers/Call/CallService.swift
+++ b/Riot/Managers/Call/CallService.swift
@@ -230,7 +230,7 @@ class CallService: NSObject {
                                                object: nil)
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(callTileTapped(_:)),
-                                               name: NSNotification.Name(rawValue: kRoomCallTileTapped),
+                                               name: .RoomCallTileTapped,
                                                object: nil)
         
         isStarted = true
@@ -248,7 +248,7 @@ class CallService: NSObject {
                                                   name: NSNotification.Name(rawValue: kMXCallStateDidChange),
                                                   object: nil)
         NotificationCenter.default.removeObserver(self,
-                                                  name: NSNotification.Name(rawValue: kRoomCallTileTapped),
+                                                  name: .RoomCallTileTapped,
                                                   object: nil)
         
         isStarted = false
diff --git a/Riot/Modules/Room/RoomViewController.h b/Riot/Modules/Room/RoomViewController.h
index 99ee17445..4e9864bfd 100644
--- a/Riot/Modules/Room/RoomViewController.h
+++ b/Riot/Modules/Room/RoomViewController.h
@@ -30,7 +30,7 @@
 /**
  Notification string used to indicate call tile tapped in a room. Notification object will be the `RoomBubbleCellData` object.
  */
-extern NSString *const kRoomCallTileTapped;
+extern NSNotificationName const RoomCallTileTappedNotification;
 
 @interface RoomViewController : MXKRoomViewController
 
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index f58b9ad35..b2c3e19ad 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -123,7 +123,7 @@
 
 #import "Riot-Swift.h"
 
-NSString *const kRoomCallTileTapped = @"RoomCallTileTapped";
+NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNotification";
 
 @interface RoomViewController () <UISearchBarDelegate, UIGestureRecognizerDelegate, UIScrollViewAccessibilityDelegate, RoomTitleViewTapGestureDelegate, RoomParticipantsViewControllerDelegate, MXKRoomMemberDetailsViewControllerDelegate, ContactsTableViewControllerDelegate, MXServerNoticesDelegate, RoomContextualMenuViewControllerDelegate,
     ReactionsMenuViewModelCoordinatorDelegate, EditHistoryCoordinatorBridgePresenterDelegate, MXKDocumentPickerPresenterDelegate, EmojiPickerCoordinatorBridgePresenterDelegate,
@@ -2164,7 +2164,7 @@ NSString *const kRoomCallTileTapped = @"RoomCallTileTapped";
                     if ([bubbleData isKindOfClass:[RoomBubbleCellData class]])
                     {
                         //  post notification `RoomCallTileTapped`
-                        [[NSNotificationCenter defaultCenter] postNotificationName:kRoomCallTileTapped object:bubbleData];
+                        [[NSNotificationCenter defaultCenter] postNotificationName:RoomCallTileTappedNotification object:bubbleData];
                     }
                 }
                 else