diff --git a/po/POTFILES.in b/po/POTFILES.in
index d8ea32865972bed583cbf7565aff144890061f9e..0532a46d4efe5d0c614cd6498e85251d938bc6b5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -530,54 +530,54 @@ modules/demux/wav.c
 modules/demux/xa.c
 modules/demux/xiph_metadata.h
 modules/demux/xiph_metadata.c
-modules/gui/macosx/about.h
-modules/gui/macosx/about.m
-modules/gui/macosx/AddonsWindowController.h
-modules/gui/macosx/AddonsWindowController.m
+modules/gui/macosx/VLCAboutWindowController.h
+modules/gui/macosx/VLCAboutWindowController.m
+modules/gui/macosx/VLCAddonsWindowController.h
+modules/gui/macosx/VLCAddonsWindowController.m
 modules/gui/macosx/AppleRemote.h
 modules/gui/macosx/AppleRemote.m
 modules/gui/macosx/applescript.h
 modules/gui/macosx/applescript.m
-modules/gui/macosx/AudioEffects.h
-modules/gui/macosx/AudioEffects.m
-modules/gui/macosx/bookmarks.h
-modules/gui/macosx/bookmarks.m
+modules/gui/macosx/VLCAudioEffectsWindowController.h
+modules/gui/macosx/VLCAudioEffectsWindowController.m
+modules/gui/macosx/VLCBookmarksWindowController.h
+modules/gui/macosx/VLCBookmarksWindowController.m
 modules/gui/macosx/BWQuincyUI.h
 modules/gui/macosx/BWQuincyUI.m
 modules/gui/macosx/ControlsBar.h
 modules/gui/macosx/ControlsBar.m
-modules/gui/macosx/ConvertAndSave.h
-modules/gui/macosx/ConvertAndSave.m
-modules/gui/macosx/coredialogs.h
-modules/gui/macosx/coredialogs.m
-modules/gui/macosx/CoreInteraction.h
-modules/gui/macosx/CoreInteraction.m
+modules/gui/macosx/VLCConvertAndSaveWindowController.h
+modules/gui/macosx/VLCConvertAndSaveWindowController.m
+modules/gui/macosx/VLCCoreDialogProvider.h
+modules/gui/macosx/VLCCoreDialogProvider.m
+modules/gui/macosx/VLCCoreInteraction.h
+modules/gui/macosx/VLCCoreInteraction.m
 modules/gui/macosx/ExtensionsDialogProvider.h
 modules/gui/macosx/ExtensionsDialogProvider.m
 modules/gui/macosx/ExtensionsManager.h
 modules/gui/macosx/ExtensionsManager.m
-modules/gui/macosx/eyetv.h
-modules/gui/macosx/eyetv.m
-modules/gui/macosx/fspanel.h
-modules/gui/macosx/fspanel.m
+modules/gui/macosx/VLCEyeTvController.h
+modules/gui/macosx/VLCEyeTvController.m
+modules/gui/macosx/VLCFSPanel.h
+modules/gui/macosx/VLCFSPanel.m
 modules/gui/macosx/helpers.h
 modules/gui/macosx/intf.h
 modules/gui/macosx/intf.m
 modules/gui/macosx/intf-prefs.h
 modules/gui/macosx/intf-prefs.m
 modules/gui/macosx/macosx.m
-modules/gui/macosx/MainMenu.h
-modules/gui/macosx/MainMenu.m
-modules/gui/macosx/MainWindow.h
-modules/gui/macosx/MainWindow.m
+modules/gui/macosx/VLCMainMenu.h
+modules/gui/macosx/VLCMainMenu.m
+modules/gui/macosx/VLCMainWindow.h
+modules/gui/macosx/VLCMainWindow.m
 modules/gui/macosx/MainWindowTitle.h
 modules/gui/macosx/MainWindowTitle.m
 modules/gui/macosx/misc.h
 modules/gui/macosx/misc.m
-modules/gui/macosx/open.h
-modules/gui/macosx/open.m
-modules/gui/macosx/output.h
-modules/gui/macosx/output.m
+modules/gui/macosx/VLCOpenWindowController.h
+modules/gui/macosx/VLCOpenWindowController.m
+modules/gui/macosx/VLCOutput.h
+modules/gui/macosx/VLCOutput.m
 modules/gui/macosx/VLCPlaylist.h
 modules/gui/macosx/VLCPlaylist.m
 modules/gui/macosx/VLCPlaylistInfo.h
@@ -588,18 +588,18 @@ modules/gui/macosx/prefs.h
 modules/gui/macosx/prefs.m
 modules/gui/macosx/prefs_widgets.h
 modules/gui/macosx/prefs_widgets.m
-modules/gui/macosx/ResumeDialogController.h
-modules/gui/macosx/ResumeDialogController.m
+modules/gui/macosx/VLCResumeDialogController.h
+modules/gui/macosx/VLCResumeDialogController.m
 modules/gui/macosx/simple_prefs.h
 modules/gui/macosx/simple_prefs.m
-modules/gui/macosx/StringUtility.h
-modules/gui/macosx/StringUtility.m
-modules/gui/macosx/TrackSynchronization.h
-modules/gui/macosx/TrackSynchronization.m
-modules/gui/macosx/VideoEffects.h
-modules/gui/macosx/VideoEffects.m
-modules/gui/macosx/VideoView.h
-modules/gui/macosx/VideoView.m
+modules/gui/macosx/VLCStringUtility.h
+modules/gui/macosx/VLCStringUtility.m
+modules/gui/macosx/VLCTrackSynchronizationWindowController.h
+modules/gui/macosx/VLCTrackSynchronizationWindowController.m
+modules/gui/macosx/VLCVideoEffectsWindowController.h
+modules/gui/macosx/VLCVideoEffectsWindowController.m
+modules/gui/macosx/VLCVoutView.h
+modules/gui/macosx/VLCVoutView.m
 modules/gui/macosx/VLCTimeSelectionPanelController.h
 modules/gui/macosx/VLCTimeSelectionPanelController.m
 modules/gui/macosx/VLCVoutWindowController.h