diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 850bfeece33fbd1da0cc2319eb95bd1f98b50a58..fa0ed112a28c61ce5bfbdccc79faff2e82a090cf 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -406,10 +406,10 @@
1CCB5F7A1A62A724004C3E90 /* open.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28203E2EB1C0059A3A7 /* open.m */; };
1CCB5F7B1A62A724004C3E90 /* output.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB7F0459B0FD00FB3317 /* output.h */; };
1CCB5F7C1A62A724004C3E90 /* output.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB800459B0FD00FB3317 /* output.m */; };
- 1CCB5F7D1A62A724004C3E90 /* playlist.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28303E2EB1C0059A3A7 /* playlist.h */; };
- 1CCB5F7E1A62A724004C3E90 /* playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28403E2EB1C0059A3A7 /* playlist.m */; };
- 1CCB5F7F1A62A724004C3E90 /* playlistinfo.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720006417F6800370C9F /* playlistinfo.h */; };
- 1CCB5F801A62A724004C3E90 /* playlistinfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720106417F6800370C9F /* playlistinfo.m */; };
+ 1CCB5F7D1A62A724004C3E90 /* VLCPlaylist.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */; };
+ 1CCB5F7E1A62A724004C3E90 /* VLCPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */; };
+ 1CCB5F7F1A62A724004C3E90 /* VLCPlaylistInfo.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720006417F6800370C9F /* VLCPlaylistInfo.h */; };
+ 1CCB5F801A62A724004C3E90 /* VLCPlaylistInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720106417F6800370C9F /* VLCPlaylistInfo.m */; };
1CCB5F811A62A724004C3E90 /* prefs_widgets.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E9CA1A306D7DEE800B7186C /* prefs_widgets.h */; };
1CCB5F821A62A724004C3E90 /* prefs_widgets.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */; };
1CCB5F831A62A724004C3E90 /* prefs.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28503E2EB1C0059A3A7 /* prefs.h */; };
@@ -1257,8 +1257,8 @@
7D8BB0B61830311300FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/DebugMessageVisualizer.xib; sourceTree = "<group>"; };
7D8BB0B91830367200FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlaylistMenu.xib; sourceTree = "<group>"; };
7D8BB0BF1830393300FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/MainWindow.xib; sourceTree = "<group>"; };
- 7DA481221B5FC13700917FD7 /* playlistview.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = playlistview.h; path = ../../../modules/gui/macosx/playlistview.h; sourceTree = "<group>"; };
- 7DA481231B5FC13700917FD7 /* playlistview.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = playlistview.m; path = ../../../modules/gui/macosx/playlistview.m; sourceTree = "<group>"; };
+ 7DA481221B5FC13700917FD7 /* VLCPlaylistView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCPlaylistView.h; path = ../../../modules/gui/macosx/VLCPlaylistView.h; sourceTree = "<group>"; };
+ 7DA481231B5FC13700917FD7 /* VLCPlaylistView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCPlaylistView.m; path = ../../../modules/gui/macosx/VLCPlaylistView.m; sourceTree = "<group>"; };
7DB65D5218ABD6380053B874 /* AddonsWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AddonsWindowController.h; path = ../../../modules/gui/macosx/AddonsWindowController.h; sourceTree = SOURCE_ROOT; };
7DB65D5318ABD6380053B874 /* AddonsWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonsWindowController.m; path = ../../../modules/gui/macosx/AddonsWindowController.m; sourceTree = SOURCE_ROOT; };
7DB65D5518ABD6490053B874 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/AddonManager.xib; sourceTree = "<group>"; };
@@ -1277,8 +1277,8 @@
7DF812F41B5599E40052293C /* PLModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PLModel.m; path = ../../../modules/gui/macosx/PLModel.m; sourceTree = "<group>"; };
7DFFA16A16124F38001AF89F /* effects-one-button-pressed-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark.png"; sourceTree = "<group>"; };
7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark@2x.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark@2x.png"; sourceTree = "<group>"; };
- 8E49720006417F6800370C9F /* playlistinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playlistinfo.h; path = ../../../modules/gui/macosx/playlistinfo.h; sourceTree = SOURCE_ROOT; };
- 8E49720106417F6800370C9F /* playlistinfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = playlistinfo.m; path = ../../../modules/gui/macosx/playlistinfo.m; sourceTree = SOURCE_ROOT; };
+ 8E49720006417F6800370C9F /* VLCPlaylistInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaylistInfo.h; path = ../../../modules/gui/macosx/VLCPlaylistInfo.h; sourceTree = SOURCE_ROOT; };
+ 8E49720106417F6800370C9F /* VLCPlaylistInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaylistInfo.m; path = ../../../modules/gui/macosx/VLCPlaylistInfo.m; sourceTree = SOURCE_ROOT; };
8E55FB7F0459B0FD00FB3317 /* output.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = output.h; path = ../../../modules/gui/macosx/output.h; sourceTree = SOURCE_ROOT; };
8E55FB800459B0FD00FB3317 /* output.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = output.m; path = ../../../modules/gui/macosx/output.m; sourceTree = SOURCE_ROOT; };
8E6BC6F6041643860059A3A7 /* applescript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = applescript.h; path = ../../../modules/gui/macosx/applescript.h; sourceTree = SOURCE_ROOT; };
@@ -1294,8 +1294,8 @@
8ED6C28003E2EB1C0059A3A7 /* misc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = misc.m; path = ../../../modules/gui/macosx/misc.m; sourceTree = SOURCE_ROOT; };
8ED6C28103E2EB1C0059A3A7 /* open.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = open.h; path = ../../../modules/gui/macosx/open.h; sourceTree = SOURCE_ROOT; };
8ED6C28203E2EB1C0059A3A7 /* open.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = open.m; path = ../../../modules/gui/macosx/open.m; sourceTree = SOURCE_ROOT; };
- 8ED6C28303E2EB1C0059A3A7 /* playlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playlist.h; path = ../../../modules/gui/macosx/playlist.h; sourceTree = SOURCE_ROOT; };
- 8ED6C28403E2EB1C0059A3A7 /* playlist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = playlist.m; path = ../../../modules/gui/macosx/playlist.m; sourceTree = SOURCE_ROOT; };
+ 8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaylist.h; path = ../../../modules/gui/macosx/VLCPlaylist.h; sourceTree = SOURCE_ROOT; };
+ 8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaylist.m; path = ../../../modules/gui/macosx/VLCPlaylist.m; sourceTree = SOURCE_ROOT; };
8ED6C28503E2EB1C0059A3A7 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prefs.h; path = ../../../modules/gui/macosx/prefs.h; sourceTree = SOURCE_ROOT; };
8ED6C28603E2EB1C0059A3A7 /* prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = prefs.m; path = ../../../modules/gui/macosx/prefs.m; sourceTree = SOURCE_ROOT; };
8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = README.MacOSX.rtf; sourceTree = SOURCE_ROOT; };
@@ -1872,12 +1872,12 @@
8ED6C28203E2EB1C0059A3A7 /* open.m */,
8E55FB7F0459B0FD00FB3317 /* output.h */,
8E55FB800459B0FD00FB3317 /* output.m */,
- 8ED6C28303E2EB1C0059A3A7 /* playlist.h */,
- 8ED6C28403E2EB1C0059A3A7 /* playlist.m */,
- 7DA481221B5FC13700917FD7 /* playlistview.h */,
- 7DA481231B5FC13700917FD7 /* playlistview.m */,
- 8E49720006417F6800370C9F /* playlistinfo.h */,
- 8E49720106417F6800370C9F /* playlistinfo.m */,
+ 8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */,
+ 8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */,
+ 7DA481221B5FC13700917FD7 /* VLCPlaylistView.h */,
+ 7DA481231B5FC13700917FD7 /* VLCPlaylistView.m */,
+ 8E49720006417F6800370C9F /* VLCPlaylistInfo.h */,
+ 8E49720106417F6800370C9F /* VLCPlaylistInfo.m */,
7DF812F11B5599E40052293C /* PLItem.h */,
7DF812F21B5599E40052293C /* PLItem.m */,
7DF812F31B5599E40052293C /* PLModel.h */,
@@ -3902,10 +3902,10 @@
1CCB5F7B1A62A724004C3E90 /* output.h in Sources */,
1CC25CA81B2C585D0003F994 /* darwinvlc.m in Sources */,
1CCB5F7C1A62A724004C3E90 /* output.m in Sources */,
- 1CCB5F7D1A62A724004C3E90 /* playlist.h in Sources */,
- 1CCB5F7E1A62A724004C3E90 /* playlist.m in Sources */,
- 1CCB5F7F1A62A724004C3E90 /* playlistinfo.h in Sources */,
- 1CCB5F801A62A724004C3E90 /* playlistinfo.m in Sources */,
+ 1CCB5F7D1A62A724004C3E90 /* VLCPlaylist.h in Sources */,
+ 1CCB5F7E1A62A724004C3E90 /* VLCPlaylist.m in Sources */,
+ 1CCB5F7F1A62A724004C3E90 /* VLCPlaylistInfo.h in Sources */,
+ 1CCB5F801A62A724004C3E90 /* VLCPlaylistInfo.m in Sources */,
1CCB5F811A62A724004C3E90 /* prefs_widgets.h in Sources */,
1CCB5F821A62A724004C3E90 /* prefs_widgets.m in Sources */,
1CCB5F831A62A724004C3E90 /* prefs.h in Sources */,
diff --git a/modules/gui/macosx/ControlsBar.m b/modules/gui/macosx/ControlsBar.m
index 0259e6fe5f84de3bd49eb868d30946bea9c009cb..3d2623d8db51a6967e7da06f47b3c2b827baf8b6 100644
--- a/modules/gui/macosx/ControlsBar.m
+++ b/modules/gui/macosx/ControlsBar.m
@@ -27,7 +27,7 @@
#import "CoreInteraction.h"
#import "MainMenu.h"
#import "fspanel.h"
-#import "playlist.h"
+#import "VLCPlaylist.h"
#import "CompatibilityFixes.h"
/*****************************************************************************
diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m
index 08f543bc512faa1f2ffb53394bf243f714b5f9bb..053644ab0a624130c2e8d038acca7851a8451c4f 100644
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -23,7 +23,7 @@
#import "ConvertAndSave.h"
#import "intf.h"
-#import "playlist.h"
+#import "VLCPlaylist.h"
#import "misc.h"
#import "SharedDialogs.h"
diff --git a/modules/gui/macosx/CoreInteraction.m b/modules/gui/macosx/CoreInteraction.m
index face01d0d3992549c61213eadb480dab49de304d..400636b7d04c8f31c8087954037176567d15ff09 100644
--- a/modules/gui/macosx/CoreInteraction.m
+++ b/modules/gui/macosx/CoreInteraction.m
@@ -24,7 +24,7 @@
#import "CoreInteraction.h"
#import "intf.h"
#import "open.h"
-#import "playlist.h"
+#import "VLCPlaylist.h"
#import <math.h>
#import <vlc_playlist.h>
#import <vlc_input.h>
diff --git a/modules/gui/macosx/InputManager.m b/modules/gui/macosx/InputManager.m
index 368f127be371854add5d7ac9dc7ad2fabcd69ad3..d39c6a826188c02c0de2617a526886557204b452 100644
--- a/modules/gui/macosx/InputManager.m
+++ b/modules/gui/macosx/InputManager.m
@@ -27,8 +27,8 @@
#import "intf.h"
#import "MainMenu.h"
#import "MainWindow.h"
-#import "playlist.h"
-#import "playlistinfo.h"
+#import "VLCPlaylist.h"
+#import "VLCPlaylistInfo.h"
#import "TrackSynchronization.h"
#import "VideoView.h"
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 83ae9290d0ea2379ee0316b67799ea9696f23ff1..38bf0524a72ec6eb51e8e66baa3e73e930b56830 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -36,8 +36,8 @@
#import "bookmarks.h"
#import "simple_prefs.h"
#import "coredialogs.h"
-#import "playlist.h"
-#import "playlistinfo.h"
+#import "VLCPlaylist.h"
+#import "VLCPlaylistInfo.h"
#import "VideoView.h"
#import "CoreInteraction.h"
#import "MainWindow.h"
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index c7631b999b48cf4b1e758e3b7001f3fda94f3173..4ea26871f31ab15944e5097956a111c1f1e2f469 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -32,7 +32,7 @@
#import "AudioEffects.h"
#import "MainMenu.h"
#import "open.h"
-#import "playlist.h"
+#import "VLCPlaylist.h"
#import "SideBarItem.h"
#import <math.h>
#import <vlc_playlist.h>
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 06784bcd3d70a112d773af0810960fe86b8e3e73..691cf1289c83a52f40f9edd0182cff972b8f8ba6 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -51,9 +51,9 @@ libmacosx_plugin_la_SOURCES = \
misc.h misc.m \
open.h open.m \
output.h output.m \
- playlistview.h playlistview.m \
- playlist.h playlist.m \
- playlistinfo.h playlistinfo.m \
+ VLCPlaylistView.h VLCPlaylistView.m \
+ VLCPlaylist.h VLCPlaylist.m \
+ VLCPlaylistInfo.h VLCPlaylistInfo.m \
PLItem.h PLItem.m \
PLModel.h PLModel.m \
prefs.h prefs.m \
diff --git a/modules/gui/macosx/PLModel.m b/modules/gui/macosx/PLModel.m
index 7478fc3eca35869cd9fe592dabf66147cf60a581..4ccb16e5c03930758b66c41abdf35609058013cb 100644
--- a/modules/gui/macosx/PLModel.m
+++ b/modules/gui/macosx/PLModel.m
@@ -23,12 +23,12 @@
#import "misc.h" /* VLCByteCountFormatter */
-#import "playlist.h"
+#import "VLCPlaylist.h"
#import "StringUtility.h"
#import "intf.h"
#import "ControlsBar.h"
#import "MainMenu.h"
-#import "playlistinfo.h"
+#import "VLCPlaylistInfo.h"
#import "MainWindow.h"
#ifdef HAVE_CONFIG_H
diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/VLCPlaylist.h
similarity index 98%
rename from modules/gui/macosx/playlist.h
rename to modules/gui/macosx/VLCPlaylist.h
index b111affcba0a2671a36592ec669d2c6cf3828b03..937abb94f93cd6eb569591ba3fe46b16fb2c924b 100644
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/VLCPlaylist.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * playlist.h: MacOS X interface module
+ * VLCPlaylist.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
@@ -25,7 +25,7 @@
#import "PXSourceList.h"
#import "PLModel.h"
-#import "playlistview.h"
+#import "VLCPlaylistView.h"
@interface VLCPlaylist : NSObject<NSOutlineViewDelegate>
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/VLCPlaylist.m
similarity index 99%
rename from modules/gui/macosx/playlist.m
rename to modules/gui/macosx/VLCPlaylist.m
index 923253d5e10917a1138ee5be938366fa87d243a6..8bcde00fd8e85f663d7030e43dc20b2ae8ee59df 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/VLCPlaylist.m
@@ -1,5 +1,5 @@
/*****************************************************************************
- * playlist.m: MacOS X interface module
+ * VLCPlaylist.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
@@ -42,9 +42,9 @@
#import "CompatibilityFixes.h"
#import "intf.h"
-#import "playlist.h"
+#import "VLCPlaylist.h"
#import "MainMenu.h"
-#import "playlistinfo.h"
+#import "VLCPlaylistInfo.h"
#import "ResumeDialogController.h"
#include <vlc_keys.h>
diff --git a/modules/gui/macosx/playlistinfo.h b/modules/gui/macosx/VLCPlaylistInfo.h
similarity index 99%
rename from modules/gui/macosx/playlistinfo.h
rename to modules/gui/macosx/VLCPlaylistInfo.h
index 6511a5fdf5aa0be729c9e9243f119cf7cd2741db..2893a94c2189c0d76f38adf36c303a0cdc7e9377 100644
--- a/modules/gui/macosx/playlistinfo.h
+++ b/modules/gui/macosx/VLCPlaylistInfo.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * playlistinfo.h: MacOS X interface module
+ * VLCPlaylistInfo.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/VLCPlaylistInfo.m
similarity index 99%
rename from modules/gui/macosx/playlistinfo.m
rename to modules/gui/macosx/VLCPlaylistInfo.m
index bb4e6cdf449886c9f452b0796f179bcf0e7b37dd..d0755e74cb6868c9fa6ad12dce6d21a3cc1aab24 100644
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/VLCPlaylistInfo.m
@@ -1,5 +1,5 @@
/*****************************************************************************
- * playlistinfo.m: MacOS X interface module
+ * VLCPlaylistInfo.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
@@ -24,8 +24,8 @@
#import "CompatibilityFixes.h"
#import "intf.h"
-#import "playlistinfo.h"
-#import "playlist.h"
+#import "VLCPlaylistInfo.h"
+#import "VLCPlaylist.h"
#import <vlc_url.h>
@interface VLCInfo () <NSOutlineViewDataSource, NSOutlineViewDelegate>
@@ -529,4 +529,3 @@ error:
}
@end
-
diff --git a/modules/gui/macosx/playlistview.h b/modules/gui/macosx/VLCPlaylistView.h
similarity index 96%
rename from modules/gui/macosx/playlistview.h
rename to modules/gui/macosx/VLCPlaylistView.h
index fe96528e0c4f3d7e5809ad5a341a7183ea61cdc6..83f2a191424c4f72ad1e3b0ce503c9b6612aeaab 100644
--- a/modules/gui/macosx/playlistview.h
+++ b/modules/gui/macosx/VLCPlaylistView.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * playlist.h: MacOS X interface module
+ * VLCPlaylistView.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
diff --git a/modules/gui/macosx/playlistview.m b/modules/gui/macosx/VLCPlaylistView.m
similarity index 96%
rename from modules/gui/macosx/playlistview.m
rename to modules/gui/macosx/VLCPlaylistView.m
index 24a08f9b149c5dda98deac1c18b551000c5e4130..132d86fd1f93a4c6ee33ed4a1cb71f0ee8ae3044 100644
--- a/modules/gui/macosx/playlistview.m
+++ b/modules/gui/macosx/VLCPlaylistView.m
@@ -1,5 +1,5 @@
/*****************************************************************************
- * playlistview.m: MacOS X interface module
+ * VLCPlaylistView.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2003-2015 VLC authors and VideoLAN
* $Id$
@@ -24,8 +24,8 @@
*****************************************************************************/
#import "intf.h"
-#import "playlistview.h"
-#import "playlist.h"
+#import "VLCPlaylistView.h"
+#import "VLCPlaylist.h"
@implementation VLCPlaylistView
diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index 9db2312d1059878362b4042136a832fe715f3786..bbd1a847d182bc73f4b876682aa30a5e0eadb562 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -32,11 +32,11 @@
#import "VideoEffects.h"
#import "AudioEffects.h"
-#import "playlistinfo.h"
+#import "VLCPlaylistInfo.h"
#import "bookmarks.h"
#import "TrackSynchronization.h"
#import "ResumeDialogController.h"
-#import "playlist.h"
+#import "VLCPlaylist.h"
static atomic_bool b_intf_starting = ATOMIC_VAR_INIT(false);
diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m
index 3fa7faef4256d1cc7d543eec23e328c7c7d79b6a..296c5e6ae506523380b24669225ec7cf5ae0d489 100644
--- a/modules/gui/macosx/applescript.m
+++ b/modules/gui/macosx/applescript.m
@@ -28,7 +28,7 @@
#import "intf.h"
#import "applescript.h"
#import "CoreInteraction.h"
-#import "playlist.h"
+#import "VLCPlaylist.h"
#import <vlc_url.h>
/*****************************************************************************
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index dd9bc6628ab3ec96171b23140e9a76b3f4824416..96fb2e7236c3564805018e900a63030b83a36391 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -47,8 +47,8 @@
#import "MainMenu.h"
#import "VideoView.h"
#import "prefs.h"
-#import "playlist.h"
-#import "playlistinfo.h"
+#import "VLCPlaylist.h"
+#import "VLCPlaylistInfo.h"
#import "open.h"
#import "bookmarks.h"
#import "coredialogs.h"
diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index d84f47de47937cfe18dbd4fdf5b06894cea88a56..73b88ac08cc4969ae82c625d9be7b4fa7f2b5202 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -36,7 +36,7 @@
#import <QTKit/QTKit.h>
#import "intf.h"
-#import "playlist.h"
+#import "VLCPlaylist.h"
#import "open.h"
#import "output.h"
#import "eyetv.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8077a0cf0eedfb837124f7e864a3077af016a43e..a5b21c8cb7b893671748575c65f77dca0542477f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -589,12 +589,12 @@ modules/gui/macosx/open.h
modules/gui/macosx/open.m
modules/gui/macosx/output.h
modules/gui/macosx/output.m
-modules/gui/macosx/playlist.h
-modules/gui/macosx/playlist.m
-modules/gui/macosx/playlistinfo.h
-modules/gui/macosx/playlistinfo.m
-modules/gui/macosx/playlistview.h
-modules/gui/macosx/playlistview.m
+modules/gui/macosx/VLCPlaylist.h
+modules/gui/macosx/VLCPlaylist.m
+modules/gui/macosx/VLCPlaylistInfo.h
+modules/gui/macosx/VLCPlaylistInfo.m
+modules/gui/macosx/VLCPlaylistView.h
+modules/gui/macosx/VLCPlaylistView.m
modules/gui/macosx/prefs.h
modules/gui/macosx/prefs.m
modules/gui/macosx/prefs_widgets.h