diff --git a/Classes/HistoryListTableView.m b/Classes/HistoryListTableView.m
index b572b55a6..f6b34c503 100644
--- a/Classes/HistoryListTableView.m
+++ b/Classes/HistoryListTableView.m
@@ -272,9 +272,9 @@
 						[ConferenceViewModelBridge showCancelledMeetingWithCConferenceInfo:confInfo];
 						return;
 					}
-					ConferenceWaitingRoomFragment *view = VIEW(ConferenceWaitingRoomFragment);
+					ConferenceWaitingRoomView *view = VIEW(ConferenceWaitingRoomView);
 					[view setDetailsWithSubject:[NSString stringWithUTF8String:linphone_conference_info_get_subject(confInfo)] url:[NSString stringWithUTF8String:linphone_address_as_string(linphone_conference_info_get_uri(confInfo))]];
-					[PhoneMainView.instance changeCurrentView:ConferenceWaitingRoomFragment.compositeViewDescription];
+					[PhoneMainView.instance changeCurrentView:ConferenceWaitingRoomView.compositeViewDescription];
 				} else {
 					const LinphoneAddress *addr = linphone_call_log_get_remote_address(callLog);
 					[LinphoneManager.instance call:addr];
diff --git a/Classes/Swift/Conference/Views/ConferenceWaitingRoomFragment.swift b/Classes/Swift/Conference/Views/ConferenceWaitingRoomView.swift
similarity index 97%
rename from Classes/Swift/Conference/Views/ConferenceWaitingRoomFragment.swift
rename to Classes/Swift/Conference/Views/ConferenceWaitingRoomView.swift
index fd1a8f10c..20fae72b9 100644
--- a/Classes/Swift/Conference/Views/ConferenceWaitingRoomFragment.swift
+++ b/Classes/Swift/Conference/Views/ConferenceWaitingRoomView.swift
@@ -22,7 +22,7 @@ import UIKit
 import linphonesw
 
 
-@objc class ConferenceWaitingRoomFragment: UIViewController, UICompositeViewDelegate { // Replaces CallView
+@objc class ConferenceWaitingRoomView: UIViewController, UICompositeViewDelegate { // Replaces CallView
 	
 	// Layout constants
 	let common_margin = 17.0
@@ -54,7 +54,7 @@ import linphonesw
 	let layoutPickerView = ConferenceLayoutPickerView(orientation: UIDevice.current.orientation)
 
 
-	static let compositeDescription = UICompositeViewDescription(ConferenceWaitingRoomFragment.self, statusBar: StatusBarView.self, tabBar: nil, sideMenu: SideMenuView.self, fullscreen: false, isLeftFragment: false,fragmentWith: nil)
+	static let compositeDescription = UICompositeViewDescription(ConferenceWaitingRoomView.self, statusBar: StatusBarView.self, tabBar: nil, sideMenu: SideMenuView.self, fullscreen: false, isLeftFragment: false,fragmentWith: nil)
 	static func compositeViewDescription() -> UICompositeViewDescription! { return compositeDescription }
 	func compositeViewDescription() -> UICompositeViewDescription! { return type(of: self).compositeDescription }
 	
diff --git a/Classes/Swift/Conference/Views/ICSBubbleView.swift b/Classes/Swift/Conference/Views/ICSBubbleView.swift
index 27637e979..45b46a579 100644
--- a/Classes/Swift/Conference/Views/ICSBubbleView.swift
+++ b/Classes/Swift/Conference/Views/ICSBubbleView.swift
@@ -108,7 +108,7 @@ import EventKitUI
 		joinShare.alignParentBottom(withMargin: inner_padding).width(join_share_width).alignParentRight(withMargin: inner_padding).done()
 		
 		join.onClick {
-			let view : ConferenceWaitingRoomFragment = self.VIEW(ConferenceWaitingRoomFragment.compositeViewDescription())
+			let view : ConferenceWaitingRoomView = self.VIEW(ConferenceWaitingRoomView.compositeViewDescription())
 			PhoneMainView.instance().changeCurrentView(view.compositeViewDescription())
 			view.setDetails(subject: (self.conferenceData?.subject.value)!, url: (self.conferenceData?.address.value)!)
 		}
diff --git a/Classes/Swift/Conference/Views/ScheduledConferencesCell.swift b/Classes/Swift/Conference/Views/ScheduledConferencesCell.swift
index 09914b5c5..f72bef7df 100644
--- a/Classes/Swift/Conference/Views/ScheduledConferencesCell.swift
+++ b/Classes/Swift/Conference/Views/ScheduledConferencesCell.swift
@@ -177,7 +177,7 @@ class ScheduledConferencesCell: UITableViewCell {
 		joinEditDelete.addArrangedSubview(joinConf)
 		joinConf.width(150).done()
 		joinConf.onClick {
-			let view : ConferenceWaitingRoomFragment = self.VIEW(ConferenceWaitingRoomFragment.compositeViewDescription())
+			let view : ConferenceWaitingRoomView = self.VIEW(ConferenceWaitingRoomView.compositeViewDescription())
 			PhoneMainView.instance().changeCurrentView(view.compositeViewDescription())
 			view.setDetails(subject: (self.conferenceData?.subject.value)!, url: (self.conferenceData?.address.value)!)
 		}
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index e18506a07..812fc787e 100644
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -673,7 +673,7 @@
 		C63F7212285A24B10066163B /* ScheduledConferenceData.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F719F285A24B10066163B /* ScheduledConferenceData.swift */; };
 		C63F7213285A24B10066163B /* TimeZoneData.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71A0285A24B10066163B /* TimeZoneData.swift */; };
 		C63F7214285A24B10066163B /* Duration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71A1285A24B10066163B /* Duration.swift */; };
-		C63F7215285A24B10066163B /* ConferenceWaitingRoomFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71A3285A24B10066163B /* ConferenceWaitingRoomFragment.swift */; };
+		C63F7215285A24B10066163B /* ConferenceWaitingRoomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71A3285A24B10066163B /* ConferenceWaitingRoomView.swift */; };
 		C63F7216285A24B10066163B /* ScheduledConferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71A4285A24B10066163B /* ScheduledConferencesView.swift */; };
 		C63F7217285A24B10066163B /* ICSBubbleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71A5285A24B10066163B /* ICSBubbleView.swift */; };
 		C63F7218285A24B10066163B /* ScheduledConferencesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71A6285A24B10066163B /* ScheduledConferencesCell.swift */; };
@@ -1847,7 +1847,7 @@
 		C63F719F285A24B10066163B /* ScheduledConferenceData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduledConferenceData.swift; sourceTree = "<group>"; };
 		C63F71A0285A24B10066163B /* TimeZoneData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeZoneData.swift; sourceTree = "<group>"; };
 		C63F71A1285A24B10066163B /* Duration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Duration.swift; sourceTree = "<group>"; };
-		C63F71A3285A24B10066163B /* ConferenceWaitingRoomFragment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConferenceWaitingRoomFragment.swift; sourceTree = "<group>"; };
+		C63F71A3285A24B10066163B /* ConferenceWaitingRoomView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConferenceWaitingRoomView.swift; sourceTree = "<group>"; };
 		C63F71A4285A24B10066163B /* ScheduledConferencesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduledConferencesView.swift; sourceTree = "<group>"; };
 		C63F71A5285A24B10066163B /* ICSBubbleView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICSBubbleView.swift; sourceTree = "<group>"; };
 		C63F71A6285A24B10066163B /* ScheduledConferencesCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduledConferencesCell.swift; sourceTree = "<group>"; };
@@ -3406,7 +3406,7 @@
 		C63F71A2285A24B10066163B /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				C63F71A3285A24B10066163B /* ConferenceWaitingRoomFragment.swift */,
+				C63F71A3285A24B10066163B /* ConferenceWaitingRoomView.swift */,
 				C63F71A4285A24B10066163B /* ScheduledConferencesView.swift */,
 				C63F71A6285A24B10066163B /* ScheduledConferencesCell.swift */,
 				C63F71A5285A24B10066163B /* ICSBubbleView.swift */,
@@ -4938,7 +4938,7 @@
 				63B8D6A21BCBF43100C12B09 /* UIChatCreateCell.m in Sources */,
 				636BC9971B5F921B00C754CE /* UIIconButton.m in Sources */,
 				C63F7263285A24B10066163B /* FormButton.swift in Sources */,
-				C63F7215285A24B10066163B /* ConferenceWaitingRoomFragment.swift in Sources */,
+				C63F7215285A24B10066163B /* ConferenceWaitingRoomView.swift in Sources */,
 				C6548820292D32FA00BF646B /* SingleCallView.swift in Sources */,
 				63423C0A1C4501D000D9A050 /* Contact.m in Sources */,
 				C63F7262285A24B10066163B /* RotatingSpinner.swift in Sources */,