diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index d1e4aaa92a..1370921f10 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -427,8 +427,8 @@
 		1CCB5F8C1A62A724004C3E90 /* VLCTrackSynchronizationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC707EC4137464CD0003010A /* VLCTrackSynchronizationWindowController.m */; };
 		1CCB5F8D1A62A724004C3E90 /* VLCVideoEffectsWindowController.h in Sources */ = {isa = PBXBuildFile; fileRef = CCCE366D13817E4500694F2A /* VLCVideoEffectsWindowController.h */; };
 		1CCB5F8E1A62A724004C3E90 /* VLCVideoEffectsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCE366E13817E4500694F2A /* VLCVideoEffectsWindowController.m */; };
-		1CCB5F8F1A62A724004C3E90 /* VideoView.h in Sources */ = {isa = PBXBuildFile; fileRef = CCCCDCA01413E1C000FE3DE1 /* VideoView.h */; };
-		1CCB5F901A62A724004C3E90 /* VideoView.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCCDCA11413E1C000FE3DE1 /* VideoView.m */; };
+		1CCB5F8F1A62A724004C3E90 /* VLCVoutView.h in Sources */ = {isa = PBXBuildFile; fileRef = CCCCDCA01413E1C000FE3DE1 /* VLCVoutView.h */; };
+		1CCB5F901A62A724004C3E90 /* VLCVoutView.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCCDCA11413E1C000FE3DE1 /* VLCVoutView.m */; };
 		1CCB5F911A62A724004C3E90 /* VLCUIWidgets.h in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71414C0D4A90057F8D1 /* VLCUIWidgets.h */; };
 		1CCB5F921A62A724004C3E90 /* VLCUIWidgets.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71514C0D4A90057F8D1 /* VLCUIWidgets.m */; };
 		1CCB5F931A62A724004C3E90 /* VLCVoutWindowController.h in Sources */ = {isa = PBXBuildFile; fileRef = E0C2583E161B593D00185AAD /* VLCVoutWindowController.h */; };
@@ -1751,8 +1751,8 @@
 		CCB320711423AAEE002CB53B /* shuffle-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "shuffle-blue.png"; path = "Resources/mainwindow/shuffle-blue.png"; sourceTree = "<group>"; };
 		CCBE999E0F922C51000705F8 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
 		CCC895830D9A8A82005AE59C /* eyetv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = eyetv.m; path = ../../../modules/access/eyetv.m; sourceTree = SOURCE_ROOT; };
-		CCCCDCA01413E1C000FE3DE1 /* VideoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VideoView.h; path = ../../../modules/gui/macosx/VideoView.h; sourceTree = SOURCE_ROOT; };
-		CCCCDCA11413E1C000FE3DE1 /* VideoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VideoView.m; path = ../../../modules/gui/macosx/VideoView.m; sourceTree = SOURCE_ROOT; };
+		CCCCDCA01413E1C000FE3DE1 /* VLCVoutView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCVoutView.h; path = ../../../modules/gui/macosx/VLCVoutView.h; sourceTree = SOURCE_ROOT; };
+		CCCCDCA11413E1C000FE3DE1 /* VLCVoutView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCVoutView.m; path = ../../../modules/gui/macosx/VLCVoutView.m; sourceTree = SOURCE_ROOT; };
 		CCCDDEEF13E870BB00A35661 /* SideBarItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SideBarItem.h; path = ../../../modules/gui/macosx/SideBarItem.h; sourceTree = SOURCE_ROOT; };
 		CCCDDEF013E870BB00A35661 /* SideBarItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SideBarItem.m; path = ../../../modules/gui/macosx/SideBarItem.m; sourceTree = SOURCE_ROOT; };
 		CCCE366D13817E4500694F2A /* VLCVideoEffectsWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCVideoEffectsWindowController.h; path = ../../../modules/gui/macosx/VLCVideoEffectsWindowController.h; sourceTree = SOURCE_ROOT; };
@@ -1942,8 +1942,8 @@
 				CC707EC4137464CD0003010A /* VLCTrackSynchronizationWindowController.m */,
 				CCCE366D13817E4500694F2A /* VLCVideoEffectsWindowController.h */,
 				CCCE366E13817E4500694F2A /* VLCVideoEffectsWindowController.m */,
-				CCCCDCA01413E1C000FE3DE1 /* VideoView.h */,
-				CCCCDCA11413E1C000FE3DE1 /* VideoView.m */,
+				CCCCDCA01413E1C000FE3DE1 /* VLCVoutView.h */,
+				CCCCDCA11413E1C000FE3DE1 /* VLCVoutView.m */,
 				8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */,
 				8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */,
 				8E49720006417F6800370C9F /* VLCPlaylistInfo.h */,
@@ -4024,8 +4024,8 @@
 				6BBBB8B71D114628001BD9BA /* VLCRendererDiscovery.m in Sources */,
 				1CCB5F8D1A62A724004C3E90 /* VLCVideoEffectsWindowController.h in Sources */,
 				1CCB5F8E1A62A724004C3E90 /* VLCVideoEffectsWindowController.m in Sources */,
-				1CCB5F8F1A62A724004C3E90 /* VideoView.h in Sources */,
-				1CCB5F901A62A724004C3E90 /* VideoView.m in Sources */,
+				1CCB5F8F1A62A724004C3E90 /* VLCVoutView.h in Sources */,
+				1CCB5F901A62A724004C3E90 /* VLCVoutView.m in Sources */,
 				1CCB5F911A62A724004C3E90 /* VLCUIWidgets.h in Sources */,
 				1CCB5F921A62A724004C3E90 /* VLCUIWidgets.m in Sources */,
 				1CCB5F931A62A724004C3E90 /* VLCVoutWindowController.h in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index e2f6aad052..7b40bd3e21 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -61,7 +61,7 @@ libmacosx_plugin_la_SOURCES = \
 	SPMediaKeyTap.h SPMediaKeyTap.m \
 	Spotify.h \
 	VLCStringUtility.h VLCStringUtility.m \
-	VideoView.h VideoView.m \
+	VLCVoutView.h VLCVoutView.m \
 	VLCTimeSelectionPanelController.h VLCTimeSelectionPanelController.m \
 	VLCUIWidgets.h VLCUIWidgets.m \
 	VLCScrollingClipView.h VLCScrollingClipView.m \
diff --git a/modules/gui/macosx/VLCInputManager.m b/modules/gui/macosx/VLCInputManager.m
index dd3c1db8db..a9e9fa3e87 100644
--- a/modules/gui/macosx/VLCInputManager.m
+++ b/modules/gui/macosx/VLCInputManager.m
@@ -31,7 +31,7 @@
 #import "VLCPlaylistInfo.h"
 #import "VLCResumeDialogController.h"
 #import "VLCTrackSynchronizationWindowController.h"
-#import "VideoView.h"
+#import "VLCVoutView.h"
 
 #import "iTunes.h"
 #import "Spotify.h"
diff --git a/modules/gui/macosx/VLCMainMenu.m b/modules/gui/macosx/VLCMainMenu.m
index 016ef51bae..171efefa8b 100644
--- a/modules/gui/macosx/VLCMainMenu.m
+++ b/modules/gui/macosx/VLCMainMenu.m
@@ -38,7 +38,7 @@
 #import "simple_prefs.h"
 #import "VLCPlaylist.h"
 #import "VLCPlaylistInfo.h"
-#import "VideoView.h"
+#import "VLCVoutView.h"
 #import "VLCCoreInteraction.h"
 #import "VLCMainWindow.h"
 #import "ControlsBar.h"
diff --git a/modules/gui/macosx/VLCMainWindow.m b/modules/gui/macosx/VLCMainWindow.m
index c82d5b340a..ea42cd4829 100644
--- a/modules/gui/macosx/VLCMainWindow.m
+++ b/modules/gui/macosx/VLCMainWindow.m
@@ -46,7 +46,7 @@
 #import "PXSourceListDataSource.h"
 
 #import "ControlsBar.h"
-#import "VideoView.h"
+#import "VLCVoutView.h"
 #import "VLCVoutWindowController.h"
 
 
diff --git a/modules/gui/macosx/VideoView.h b/modules/gui/macosx/VLCVoutView.h
similarity index 97%
rename from modules/gui/macosx/VideoView.h
rename to modules/gui/macosx/VLCVoutView.h
index cc38ec1422..0cc10cde85 100644
--- a/modules/gui/macosx/VideoView.h
+++ b/modules/gui/macosx/VLCVoutView.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VideoView.h: MacOS X video output module
+ * VLCVoutView.h: MacOS X video output module
  *****************************************************************************
  * Copyright (C) 2002-2013 VLC authors and VideoLAN
  * $Id$
diff --git a/modules/gui/macosx/VideoView.m b/modules/gui/macosx/VLCVoutView.m
similarity index 99%
rename from modules/gui/macosx/VideoView.m
rename to modules/gui/macosx/VLCVoutView.m
index 00c2d54b26..f9aa48d2f7 100644
--- a/modules/gui/macosx/VideoView.m
+++ b/modules/gui/macosx/VLCVoutView.m
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VideoView.m: MacOS X video output module
+ * VLCVoutView.m: MacOS X video output module
  *****************************************************************************
  * Copyright (C) 2002-2014 VLC authors and VideoLAN
  * $Id$
@@ -33,7 +33,7 @@
 
 #import "CompatibilityFixes.h"
 #import "intf.h"
-#import "VideoView.h"
+#import "VLCVoutView.h"
 #import "VLCCoreInteraction.h"
 #import "VLCMainMenu.h"
 
diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index 4a9da96f49..f3d1064c75 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -28,7 +28,7 @@
 #import "VLCVoutWindowController.h"
 #import "intf.h"
 #import "VLCMainWindow.h"
-#import "VideoView.h"
+#import "VLCVoutView.h"
 
 #import "VLCVideoEffectsWindowController.h"
 #import "VLCAudioEffectsWindowController.h"
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index 58b5c32e18..146ff65e4c 100644
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -26,7 +26,7 @@
 #import "intf.h"
 #import "VLCCoreInteraction.h"
 #import "ControlsBar.h"
-#import "VideoView.h"
+#import "VLCVoutView.h"
 #import "CompatibilityFixes.h"
 
 /*****************************************************************************
diff --git a/modules/gui/macosx/helpers.h b/modules/gui/macosx/helpers.h
index 1dfd82cf46..97c43347a5 100644
--- a/modules/gui/macosx/helpers.h
+++ b/modules/gui/macosx/helpers.h
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #import "intf.h"
-#import "VideoView.h"
+#import "VLCVoutView.h"
 
 static inline input_thread_t *getInput(void)
 {
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 0e900fdab3..749d8512b1 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -45,7 +45,7 @@
 #import "CompatibilityFixes.h"
 #import "VLCInputManager.h"
 #import "VLCMainMenu.h"
-#import "VideoView.h"
+#import "VLCVoutView.h"
 #import "prefs.h"
 #import "VLCPlaylist.h"
 #import "VLCPlaylistInfo.h"