diff --git a/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib b/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
index 7f5ea916c06feaa4a159d0daa4d37cac1de14121..c0fdedc233a14cfde93c97a76a729027a46a55e1 100644
--- a/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
+++ b/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G24b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
         <development version="7000" identifier="xcode"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="ResumeDialogController">
+        <customObject id="-2" userLabel="File's Owner" customClass="VLCResumeDialogController">
             <connections>
                 <outlet property="o_always_resume_chk" destination="85X-TN-2Hu" id="ttg-8c-Zbf"/>
                 <outlet property="o_restart_btn" destination="9" id="37"/>
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index edba00af617cfcab0264010546b1bacb5402af0d..9b78999af437ac01b850ec273a41b5671224cda3 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -22,8 +22,8 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		1C15C7DC1B5146DB003AB729 /* ResumeDialogController.h in Sources */ = {isa = PBXBuildFile; fileRef = 633121CA1B51122700E636DA /* ResumeDialogController.h */; };
-		1C15C7DD1B5146DB003AB729 /* ResumeDialogController.m in Sources */ = {isa = PBXBuildFile; fileRef = 633121CB1B51122700E636DA /* ResumeDialogController.m */; };
+		1C15C7DC1B5146DB003AB729 /* VLCResumeDialogController.h in Sources */ = {isa = PBXBuildFile; fileRef = 633121CA1B51122700E636DA /* VLCResumeDialogController.h */; };
+		1C15C7DD1B5146DB003AB729 /* VLCResumeDialogController.m in Sources */ = {isa = PBXBuildFile; fileRef = 633121CB1B51122700E636DA /* VLCResumeDialogController.m */; };
 		1C51BDE51B7A221B0056B9AA /* TimeSelectionPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1C51BDE31B7A221B0056B9AA /* TimeSelectionPanel.xib */; };
 		1C57690E19DC93620099F5A6 /* topbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C57690D19DC93620099F5A6 /* topbar_background.png */; };
 		1C67C8A51D58C0980079E1C1 /* HelpWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C8A41D58C0980079E1C1 /* HelpWindowController.m */; };
@@ -1260,8 +1260,8 @@
 		5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtensionsManager.m; path = ../../../modules/gui/macosx/ExtensionsManager.m; sourceTree = SOURCE_ROOT; };
 		5CCED71414C0D4A90057F8D1 /* VLCUIWidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCUIWidgets.h; path = ../../../modules/gui/macosx/VLCUIWidgets.h; sourceTree = SOURCE_ROOT; };
 		5CCED71514C0D4A90057F8D1 /* VLCUIWidgets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCUIWidgets.m; path = ../../../modules/gui/macosx/VLCUIWidgets.m; sourceTree = SOURCE_ROOT; };
-		633121CA1B51122700E636DA /* ResumeDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResumeDialogController.h; path = ../../../modules/gui/macosx/ResumeDialogController.h; sourceTree = "<group>"; };
-		633121CB1B51122700E636DA /* ResumeDialogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResumeDialogController.m; path = ../../../modules/gui/macosx/ResumeDialogController.m; sourceTree = "<group>"; };
+		633121CA1B51122700E636DA /* VLCResumeDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCResumeDialogController.h; path = ../../../modules/gui/macosx/VLCResumeDialogController.h; sourceTree = "<group>"; };
+		633121CB1B51122700E636DA /* VLCResumeDialogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCResumeDialogController.m; path = ../../../modules/gui/macosx/VLCResumeDialogController.m; sourceTree = "<group>"; };
 		633121CF1B5112C300E636DA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/ResumeDialog.xib; sourceTree = "<group>"; };
 		6B13E2A61BC67678001AD24A /* VLCScrollingClipView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCScrollingClipView.h; path = ../../../modules/gui/macosx/VLCScrollingClipView.h; sourceTree = "<group>"; };
 		6B13E2A71BC67678001AD24A /* VLCScrollingClipView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCScrollingClipView.m; path = ../../../modules/gui/macosx/VLCScrollingClipView.m; sourceTree = "<group>"; };
@@ -1927,8 +1927,8 @@
 				8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */,
 				8ED6C28503E2EB1C0059A3A7 /* prefs.h */,
 				8ED6C28603E2EB1C0059A3A7 /* prefs.m */,
-				633121CA1B51122700E636DA /* ResumeDialogController.h */,
-				633121CB1B51122700E636DA /* ResumeDialogController.m */,
+				633121CA1B51122700E636DA /* VLCResumeDialogController.h */,
+				633121CB1B51122700E636DA /* VLCResumeDialogController.m */,
 				CC461F6C160078340022423C /* SharedDialogs.h */,
 				CC461F6D160078340022423C /* SharedDialogs.m */,
 				CCB24D5E0D54BBAE004D780C /* simple_prefs.h */,
@@ -3947,8 +3947,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1C15C7DC1B5146DB003AB729 /* ResumeDialogController.h in Sources */,
-				1C15C7DD1B5146DB003AB729 /* ResumeDialogController.m in Sources */,
+				1C15C7DC1B5146DB003AB729 /* VLCResumeDialogController.h in Sources */,
+				1C15C7DD1B5146DB003AB729 /* VLCResumeDialogController.m in Sources */,
 				1CCB5F531A62A724004C3E90 /* AddonListDataSource.h in Sources */,
 				1CCB5F541A62A724004C3E90 /* AddonListDataSource.m in Sources */,
 				1CCB5F551A62A724004C3E90 /* AddonsWindowController.h in Sources */,
diff --git a/modules/gui/macosx/InputManager.m b/modules/gui/macosx/InputManager.m
index 26fe1edbac41fdc0b732ba9b790704998e6f9917..b5262509f890be04a7f427b11f7434d4a28935c6 100644
--- a/modules/gui/macosx/InputManager.m
+++ b/modules/gui/macosx/InputManager.m
@@ -29,7 +29,7 @@
 #import "MainWindow.h"
 #import "VLCPlaylist.h"
 #import "VLCPlaylistInfo.h"
-#import "ResumeDialogController.h"
+#import "VLCResumeDialogController.h"
 #import "TrackSynchronization.h"
 #import "VideoView.h"
 
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index eaf919b5009c891539b0d9440e508c0937f6a87b..3f9a40ca43b2f7fdf120c967d05c9242aaeae9b9 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -57,7 +57,6 @@ libmacosx_plugin_la_SOURCES = \
 	prefs_widgets.h prefs_widgets.m \
 	PXSourceList.h PXSourceList.m \
 	PXSourceListDataSource.h PXSourceListDelegate.h \
-	ResumeDialogController.h ResumeDialogController.m \
 	SideBarItem.h SideBarItem.m \
 	SharedDialogs.h SharedDialogs.m \
 	simple_prefs.h simple_prefs.m \
@@ -85,4 +84,5 @@ libmacosx_plugin_la_SOURCES = \
 	VLCRendererDiscovery.h VLCRendererDiscovery.m \
 	VLCRendererItem.h VLCRendererItem.m \
 	VLCRendererDialog.h VLCRendererDialog.m \
+	VLCResumeDialogController.h VLCResumeDialogController.m \
 	VLCVideoEffectsWindowController.h VLCVideoEffectsWindowController.m
diff --git a/modules/gui/macosx/VLCPlaylist.m b/modules/gui/macosx/VLCPlaylist.m
index d71c13358188a0781746c198a7d11ea6b21ee2d1..a608bbf20faf620021ede00e6e1fd0731b126e2c 100644
--- a/modules/gui/macosx/VLCPlaylist.m
+++ b/modules/gui/macosx/VLCPlaylist.m
@@ -45,7 +45,7 @@
 #import "VLCPlaylist.h"
 #import "MainMenu.h"
 #import "VLCPlaylistInfo.h"
-#import "ResumeDialogController.h"
+#import "VLCResumeDialogController.h"
 #import "open.h"
 
 #include <vlc_keys.h>
diff --git a/modules/gui/macosx/ResumeDialogController.h b/modules/gui/macosx/VLCResumeDialogController.h
similarity index 93%
rename from modules/gui/macosx/ResumeDialogController.h
rename to modules/gui/macosx/VLCResumeDialogController.h
index 08c6fb937d4be6beb8aea5531850bdce5bb581f3..cad5cdb49a069aac1f714b17029a46ab75066d33 100644
--- a/modules/gui/macosx/ResumeDialogController.h
+++ b/modules/gui/macosx/VLCResumeDialogController.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * ResumeDialogController.h: MacOS X interface module
+ * VLCResumeDialogController.m: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2015 VLC authors and VideoLAN
  *
@@ -33,7 +33,7 @@ enum ResumeResult {
 
 typedef void(^CompletionBlock)(enum ResumeResult);
 
-@interface ResumeDialogController : NSWindowController
+@interface VLCResumeDialogController : NSWindowController
 {
     IBOutlet id o_title_lbl;
     IBOutlet id o_text_lbl;
diff --git a/modules/gui/macosx/ResumeDialogController.m b/modules/gui/macosx/VLCResumeDialogController.m
similarity index 96%
rename from modules/gui/macosx/ResumeDialogController.m
rename to modules/gui/macosx/VLCResumeDialogController.m
index 5031c891d13afd43760e77a717f7654be50c7a81..97617f69d9efd82da59a073d7c2d72e552028f01 100644
--- a/modules/gui/macosx/ResumeDialogController.m
+++ b/modules/gui/macosx/VLCResumeDialogController.m
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * ResumeDialogController.m: MacOS X interface module
+ * VLCResumeDialogController.m: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2015 VLC authors and VideoLAN
  *
@@ -22,19 +22,19 @@
  *****************************************************************************/
 
 
-#import "ResumeDialogController.h"
+#import "VLCResumeDialogController.h"
 
 #import "intf.h"
 #import "StringUtility.h"
 
-@interface ResumeDialogController()
+@interface VLCResumeDialogController()
 {
     int currentResumeTimeout;
     CompletionBlock completionBlock;
 }
 @end
 
-@implementation ResumeDialogController
+@implementation VLCResumeDialogController
 
 - (id)init
 {
diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index fcb05f0a555e032f1a04d1fe4842e0c598216af0..6f1c76b05e45a860b157978f991ca1b3066a6a8a 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -35,7 +35,7 @@
 #import "VLCPlaylistInfo.h"
 #import "VLCBookmarksWindowController.h"
 #import "TrackSynchronization.h"
-#import "ResumeDialogController.h"
+#import "VLCResumeDialogController.h"
 #import "VLCPlaylist.h"
 
 static atomic_bool b_intf_starting = ATOMIC_VAR_INIT(false);
diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 1511b03ccc5114bfa1e2089a31cf9bca0553e2b6..b8056622f357fa0a5cf9eac86a973585d0ebdc88 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -60,7 +60,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
 @class VLCMainMenu;
 @class VLCPlaylist;
 @class VLCInputManager;
-@class ResumeDialogController;
+@class VLCResumeDialogController;
 @class VLCSimplePrefs;
 @class VLCPrefs;
 @class VLCCoreDialogProvider;
@@ -92,7 +92,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
 - (VLCPrefs *)preferences;
 - (VLCPlaylist *)playlist;
 - (VLCCoreDialogProvider *)coreDialogProvider;
-- (ResumeDialogController *)resumeDialog;
+- (VLCResumeDialogController *)resumeDialog;
 - (VLCInputManager *)inputManager;
 - (ExtensionsManager *)extensionsManager;
 - (VLCStatusBarIcon *)statusBarIcon;
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 86007a8257fd500aab4a442ba73be8eaa9f882cc..1ae559157e312a1a880546cd0389dfeb56f517c2 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -58,7 +58,7 @@
 #import "TrackSynchronization.h"
 #import "ExtensionsManager.h"
 #import "BWQuincyManager.h"
-#import "ResumeDialogController.h"
+#import "VLCResumeDialogController.h"
 #import "DebugMessageVisualizer.h"
 #import "ConvertAndSave.h"
 
@@ -171,7 +171,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
     VLCCoreDialogProvider *_coredialogs;
     VLCBookmarksWindowController *_bookmarks;
     VLCCoreInteraction *_coreinteraction;
-    ResumeDialogController *_resume_dialog;
+    VLCResumeDialogController *_resume_dialog;
     VLCInputManager *_input_manager;
     VLCPlaylist *_playlist;
     VLCDebugMessageVisualizer *_messagePanelController;
@@ -626,10 +626,10 @@ static VLCMain *sharedInstance = nil;
     return _coredialogs;
 }
 
-- (ResumeDialogController *)resumeDialog
+- (VLCResumeDialogController *)resumeDialog
 {
     if (!_resume_dialog)
-        _resume_dialog = [[ResumeDialogController alloc] init];
+        _resume_dialog = [[VLCResumeDialogController alloc] init];
 
     return _resume_dialog;
 }