diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsCoordinator.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsCoordinator.swift
index 25e663ae4..2d8e48cee 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsCoordinator.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsCoordinator.swift
@@ -1,7 +1,7 @@
 // File created from ScreenTemplate
 // $ createScreen.sh Room/NotificationSettings RoomNotificationSettings
 /*
- Copyright 2020 New Vector Ltd
+ 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.
diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsCoordinatorType.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsCoordinatorType.swift
index 99e30f617..ac0c6288b 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsCoordinatorType.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsCoordinatorType.swift
@@ -1,7 +1,7 @@
 // File created from ScreenTemplate
 // $ createScreen.sh Room/NotificationSettings RoomNotificationSettings
 /*
- Copyright 2020 New Vector Ltd
+ 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.
@@ -23,7 +23,7 @@ protocol RoomNotificationSettingsCoordinatorDelegate: AnyObject {
     func roomNotificationSettingsCoordinatorDidCancel(_ coordinator: RoomNotificationSettingsCoordinatorType)
 }
 
-/// `RoomNotificationSettingsCoordinatorType` is a protocol describing a Coordinator that handle key backup setup passphrase navigation flow.
+/// `RoomNotificationSettingsCoordinatorType` is a protocol describing a Coordinator that handles changes to the room navigation settings navigation flow.
 protocol RoomNotificationSettingsCoordinatorType: Coordinator, Presentable {
     var delegate: RoomNotificationSettingsCoordinatorDelegate? { get }
 }
diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewAction.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewAction.swift
index ee6539614..5d42f64fa 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewAction.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewAction.swift
@@ -1,7 +1,7 @@
 // File created from ScreenTemplate
 // $ createScreen.sh Room/NotificationSettings RoomNotificationSettings
 /*
- Copyright 2020 New Vector Ltd
+ 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.
diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewController.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewController.swift
index 3c6ce1f01..21eb3e6e3 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewController.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewController.swift
@@ -1,7 +1,7 @@
 // File created from ScreenTemplate
 // $ createScreen.sh Room/NotificationSettings RoomNotificationSettings
 /*
- Copyright 2020 New Vector Ltd
+ 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.
diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModel.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModel.swift
index 3d7d22b09..e9f5729df 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModel.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModel.swift
@@ -1,7 +1,7 @@
 // File created from ScreenTemplate
 // $ createScreen.sh Room/NotificationSettings RoomNotificationSettings
 /*
- Copyright 2020 New Vector Ltd
+ 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.
@@ -73,7 +73,7 @@ final class RoomNotificationSettingsViewModel: RoomNotificationSettingsViewModel
     // MARK: - Private
     
     private static func mapNotificationStateOnRead(encrypted: Bool, state: RoomNotificationState) -> RoomNotificationState {
-        if encrypted, case .mentionsOnly = state {
+        if encrypted, case .mentionsAndKeywordsOnly = state {
             // Notifications not supported on encrypted rooms, map mentionsOnly to mute on read
             return .mute
         } else {
diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModelType.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModelType.swift
index b43a2a325..e2fe135d4 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModelType.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModelType.swift
@@ -1,7 +1,7 @@
 // File created from ScreenTemplate
 // $ createScreen.sh Room/NotificationSettings RoomNotificationSettings
 /*
- Copyright 2020 New Vector Ltd
+ 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.
diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewStateType.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewStateType.swift
index 48e9d6290..56de53b13 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewStateType.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewStateType.swift
@@ -1,7 +1,7 @@
 // File created from ScreenTemplate
 // $ createScreen.sh Room/NotificationSettings RoomNotificationSettings
 /*
- Copyright 2020 New Vector Ltd
+ 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.
diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationState.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationState.swift
index 8d37a6702..054993117 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationState.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationState.swift
@@ -18,6 +18,6 @@ import Foundation
 
 enum RoomNotificationState: CaseIterable {
     case all
-    case mentionsOnly
+    case mentionsAndKeywordsOnly
     case mute
 }
diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationsSettingsCell.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationsSettingsCell.swift
index 2591b6c4e..967859228 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationsSettingsCell.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationsSettingsCell.swift
@@ -47,7 +47,7 @@ fileprivate extension RoomNotificationState {
         switch self {
         case .all:
             return VectorL10n.roomNotifsSettingsAllMessages
-        case .mentionsOnly:
+        case .mentionsAndKeywordsOnly:
             return VectorL10n.roomNotifsSettingsMentionsAndKeywords
         case .mute:
             return VectorL10n.roomNotifsSettingsNone
diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotifcationsSettingsService.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationsSettingsService.swift
similarity index 99%
rename from Riot/Modules/Room/NotificationSettings/RoomNotifcationsSettingsService.swift
rename to Riot/Modules/Room/NotificationSettings/RoomNotificationsSettingsService.swift
index c9d89f1b4..bb7e2fe81 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotifcationsSettingsService.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationsSettingsService.swift
@@ -65,7 +65,7 @@ final class RoomNotificationSettingsService: RoomNotificationSettingsServiceType
         switch state {
         case .all:
             allMessages(completion: completion)
-        case .mentionsOnly:
+        case .mentionsAndKeywordsOnly:
             mentionsOnly(completion: completion)
         case .mute:
             mute(completion: completion)
@@ -277,7 +277,7 @@ fileprivate extension MXRoom {
             return .mute
         }
         if isMentionsOnly {
-            return .mentionsOnly
+            return .mentionsAndKeywordsOnly
         }
         return .all
     }
diff --git a/RiotTests/RoomNotificationSettingsViewModelTests.swift b/RiotTests/RoomNotificationSettingsViewModelTests.swift
index 6f2615e4e..b10dbd63b 100644
--- a/RiotTests/RoomNotificationSettingsViewModelTests.swift
+++ b/RiotTests/RoomNotificationSettingsViewModelTests.swift
@@ -119,10 +119,10 @@ class RoomNotificationSettingsViewModelTests: XCTestCase {
         viewModel.process(viewAction: .load)
         XCTAssertNotNil(view.viewState)
         XCTAssertTrue(view.viewState!.notificationState == .all)
-        viewModel.process(viewAction: .selectNotificationState(.mentionsOnly))
-        XCTAssertTrue(view.viewState!.notificationState == .mentionsOnly)
+        viewModel.process(viewAction: .selectNotificationState(.mentionsAndKeywordsOnly))
+        XCTAssertTrue(view.viewState!.notificationState == .mentionsAndKeywordsOnly)
         viewModel.process(viewAction: .save)
-        XCTAssertTrue(service.notificationState == .mentionsOnly)
+        XCTAssertTrue(service.notificationState == .mentionsAndKeywordsOnly)
         XCTAssertTrue(coordinator.didComplete)
     }
     
@@ -135,7 +135,7 @@ class RoomNotificationSettingsViewModelTests: XCTestCase {
     }
     
     func testMentionsOnlyNotAvaileOnEncryptedRoom() throws {
-        service = MockRoomNotificationSettingsService(initialState: .mentionsOnly)
+        service = MockRoomNotificationSettingsService(initialState: .mentionsAndKeywordsOnly)
         setupViewModel(roomEncrypted: true, showAvatar: false)
         
         viewModel.process(viewAction: .load)