rename dvdplayer to VideoPlayer

379 files changed, 1400 insertions, 1400 deletions

diff --git a/.gitignore b/.gitignore
index 337bdc02c0..9f36ff77a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -375,8 +375,8 @@ lib/cpluff/stamp-h1
 /system/cdrip/vorbis.dll
 /system/cdrip/vorbisenc.dll
 
-# /system/players/dvdplayer
-/system/players/dvdplayer/*
+# /system/players/VideoPlayer
+/system/players/VideoPlayer/*
 
 # /system/players/paplayer
 /system/players/paplayer/libmodplug.dll
@@ -499,19 +499,19 @@ lib/cpluff/stamp-h1
 /xbmc/cores/DllLoader/exports/wrapper.def
 /xbmc/cores/DllLoader/Makefile
 /xbmc/cores/DllLoader/exports/Makefile
-/xbmc/cores/dvdplayer/Makefile
-/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile
-/xbmc/cores/dvdplayer/DVDCodecs/Makefile
-/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile
-/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile
-/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile
-/xbmc/cores/dvdplayer/DVDDemuxers/Makefile
-/xbmc/cores/dvdplayer/DVDSubtitles/Makefile
+/xbmc/cores/VideoPlayer/Makefile
+/xbmc/cores/VideoPlayer/DVDCodecs/Audio/Makefile
+/xbmc/cores/VideoPlayer/DVDCodecs/Makefile
+/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/Makefile
+/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/Makefile
+/xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile
+/xbmc/cores/VideoPlayer/DVDDemuxers/Makefile
+/xbmc/cores/VideoPlayer/DVDSubtitles/Makefile
 /xbmc/cores/omxplayer/Makefile
 /xbmc/cores/paplayer/Makefile
 /xbmc/cores/playercorefactory/Makefile
 /xbmc/cores/Makefile
-/xbmc/cores/dvdplayer/VideoRenderers/Makefile
+/xbmc/cores/VideoPlayer/VideoRenderers/Makefile
 
 # /xbmc/filesystem/
 /xbmc/filesystem/Makefile
diff --git a/Makefile.in b/Makefile.in
index 25a897bea6..8e3d38a03f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,19 +14,19 @@ DVDPCODECS_DIRS= \
 	lib/libdvd 
 
 ifeq (@USE_LIBSTAGEFRIGHT@,1)
-DVDPCODECS_DIRS += xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
+DVDPCODECS_DIRS += xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS
 endif
 
-DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \
-                   xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \
-                   xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a \
-                   xbmc/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a \
-                   xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a \
-                   xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \
-                   xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \
-                   xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a
+VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \
+                   xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.a \
+                   xbmc/cores/VideoPlayer/DVDCodecs/Audio/Audio.a \
+                   xbmc/cores/VideoPlayer/DVDCodecs/Overlay/Overlay.a \
+                   xbmc/cores/VideoPlayer/DVDCodecs/Video/Video.a \
+                   xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxers.a \
+                   xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreams.a \
+                   xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitles.a
 
-DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
+DIRECTORY_ARCHIVES=$(VideoPlayer_ARCHIVES) \
                    xbmc/addons/addons.a \
                    xbmc/cdrip/cdrip.a \
                    xbmc/contrib/kissfft/kissfft.a \
@@ -35,9 +35,9 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    xbmc/cores/DllLoader/exports/exports.a \
                    xbmc/cores/DllLoader/exports/util/exports_utils.a \
                    xbmc/cores/ExternalPlayer/ExternalPlayer.a \
-                   xbmc/cores/dvdplayer/VideoRenderers/VideoRenderer.a \
-                   xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/VideoShaders.a \
-                   xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/HwDecRender.a \
+                   xbmc/cores/VideoPlayer/VideoRenderers/VideoRenderer.a \
+                   xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoShaders.a \
+                   xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/HwDecRender.a \
                    xbmc/cores/cores.a \
                    xbmc/cores/paplayer/paplayer.a \
                    xbmc/cores/playercorefactory/playercorefactory.a \
@@ -310,7 +310,7 @@ endif
 
 # Setup some dependencies for subdir makes
 xbmc/cores/paplayer/paplayer.a:
-$(DVDPLAYER_ARCHIVES)         : dvdpcodecs
+$(VideoPlayer_ARCHIVES)         : dvdpcodecs
 
 lib/cpluff/libcpluff/.libs/libcpluff.a: force
 	$(MAKE) -C lib/cpluff/libcpluff
@@ -343,7 +343,7 @@ dvdpcodecs: dllloader
 
 ifeq (@USE_LIBSTAGEFRIGHT@,1)
 dvdpextcodecs: lib@APP_NAME_LC@.so
-	$(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
+	$(MAKE) -C xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS
 else
 dvdpextcodecs:
 endif
diff --git a/Makefile.include.in b/Makefile.include.in
index 510a6e0a12..05be24fea3 100644
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -48,7 +48,7 @@ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
 INCLUDES+=$(sort @INCLUDES@)
 INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/VideoPlayer
 DEFINES+= \
 	@ARCH_DEFINES@ \
 	-D_FILE_DEFINED \
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index bee1351a20..3d6a6e9833 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -6401,23 +6401,23 @@ msgid "Render method"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.cpp
+#: xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
 msgctxt "#13416"
 msgid "Auto detect"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.cpp
+#: xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
 msgctxt "#13417"
 msgid "Basic shaders (ARB)"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.cpp
+#: xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
 msgctxt "#13418"
 msgid "Advanced shaders (GLSL)"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.cpp
+#: xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
 msgctxt "#13419"
 msgid "Software"
 msgstr ""
@@ -6472,7 +6472,7 @@ msgid "Allow hardware acceleration - OpenMax"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.cpp
+#: xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
 msgctxt "#13431"
 msgid "Pixel shaders"
 msgstr ""
@@ -8237,7 +8237,7 @@ msgctxt "#16318"
 msgid "Temporal / Spatial (half)"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.cpp
+#: xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
 msgctxt "#16319"
 msgid "DXVA"
 msgstr ""
@@ -8272,7 +8272,7 @@ msgctxt "#16325"
 msgid "VDPAU - Bob"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.cpp
+#: xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
 msgctxt "#16326"
 msgid "DXVA-HD"
 msgstr ""
@@ -14057,12 +14057,12 @@ msgctxt "#25007"
 msgid "Chapters: %u - duration: %s"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDPlayer.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayer.cpp
 msgctxt "#25008"
 msgid "Playback of Blu-ray failed"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDPlayer.cpp
+#: xbmc/cores/VideoPlayer/VideoPlayer.cpp
 msgctxt "#25009"
 msgid "The menu of this Blu-ray is not supported"
 msgstr ""
@@ -17400,7 +17400,7 @@ msgstr ""
 #. Description of setting "Videos -> Playback -> Enable MMAL hardware decoding of video files"
 #: system/settings/settings.xml
 msgctxt "#36435"
-msgid "Use DVDPlayer for decoding of video files with MMAL acceleration."
+msgid "Use VideoPlayer for decoding of video files with MMAL acceleration."
 msgstr ""
 
 #. Button on settings "System -> Audio output" to opend DSP manager dialog
@@ -17866,34 +17866,34 @@ msgstr ""
 
 #empty strings from id 36922 to 36999
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37000"
 msgid "(Visually impaired)"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37001"
 msgid "(Director's comments)"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37002"
 msgid "(Director's comments 2)"
 msgstr ""
 
 #empty strings from id 37003 to 37010
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37011"
 msgid "(CC)"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37012"
 msgid "(Forced)"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37013"
 msgid "(Director's comments)"
 msgstr ""
diff --git a/configure.ac b/configure.ac
index 8ab2681f1b..1fe6bfb17a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2358,18 +2358,18 @@ OUTPUT_FILES="Makefile \
     xbmc/Makefile \
     xbmc/cdrip/Makefile \
     xbmc/cores/Makefile \
-    xbmc/cores/dvdplayer/VideoRenderers/Makefile \
-    xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/Makefile \
-    xbmc/cores/dvdplayer/Makefile \
+    xbmc/cores/VideoPlayer/VideoRenderers/Makefile \
+    xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/Makefile \
+    xbmc/cores/VideoPlayer/Makefile \
     lib/libdvd/Makefile \
     xbmc/cores/DllLoader/Makefile \
     xbmc/cores/DllLoader/exports/Makefile \
-    xbmc/cores/dvdplayer/DVDCodecs/Makefile \
-    xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile \
-    xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile \
-    xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile \
-    xbmc/cores/dvdplayer/DVDDemuxers/Makefile \
-    xbmc/cores/dvdplayer/DVDSubtitles/Makefile \
+    xbmc/cores/VideoPlayer/DVDCodecs/Makefile \
+    xbmc/cores/VideoPlayer/DVDCodecs/Audio/Makefile \
+    xbmc/cores/VideoPlayer/DVDCodecs/Overlay/Makefile \
+    xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile \
+    xbmc/cores/VideoPlayer/DVDDemuxers/Makefile \
+    xbmc/cores/VideoPlayer/DVDSubtitles/Makefile \
     xbmc/cores/AudioEngine/Makefile \
     xbmc/cores/paplayer/Makefile \
     xbmc/cores/omxplayer/Makefile \
@@ -2447,7 +2447,7 @@ OUTPUT_FILES="$OUTPUT_FILES addons/skin.re-touched/media/Makefile"
 fi
 
 if test "$use_codec_libstagefright" = "yes"; then
-OUTPUT_FILES="$OUTPUT_FILES xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile"
+OUTPUT_FILES="$OUTPUT_FILES xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/Makefile"
 fi
 
 if test "$use_sse4" = "yes"; then
diff --git a/lib/addons/library.kodi.adsp/Makefile.in b/lib/addons/library.kodi.adsp/Makefile.in
index 0b9eb7703a..12edc7858f 100644
--- a/lib/addons/library.kodi.adsp/Makefile.in
+++ b/lib/addons/library.kodi.adsp/Makefile.in
@@ -1,5 +1,5 @@
 ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers
+INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/VideoPlayer/DVDDemuxers
 DEFINES+=
 CXXFLAGS=-fPIC
 LIBNAME=libKODI_adsp
diff --git a/lib/addons/library.kodi.adsp/project/VS2010Express/libKODI_adsp.vcxproj b/lib/addons/library.kodi.adsp/project/VS2010Express/libKODI_adsp.vcxproj
index 87a33fa58a..334fe542f8 100644
--- a/lib/addons/library.kodi.adsp/project/VS2010Express/libKODI_adsp.vcxproj
+++ b/lib/addons/library.kodi.adsp/project/VS2010Express/libKODI_adsp.vcxproj
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\addons\library.xbmc.addon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;..\..\..\..\..\addons\library.xbmc.addon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
@@ -62,7 +62,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\addons\library.xbmc.addon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;..\..\..\..\..\addons\library.xbmc.addon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
diff --git a/lib/addons/library.kodi.guilib/Makefile.in b/lib/addons/library.kodi.guilib/Makefile.in
index 347f540320..4dda47c1f7 100644
--- a/lib/addons/library.kodi.guilib/Makefile.in
+++ b/lib/addons/library.kodi.guilib/Makefile.in
@@ -1,5 +1,5 @@
 ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers
+INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/VideoPlayer/DVDDemuxers
 DEFINES+=
 CXXFLAGS=-fPIC
 LIBNAME=libKODI_guilib
diff --git a/lib/addons/library.kodi.guilib/project/VS2010Express/libKODI_guilib.vcxproj b/lib/addons/library.kodi.guilib/project/VS2010Express/libKODI_guilib.vcxproj
index 1235ce11ba..8328ccf138 100644
--- a/lib/addons/library.kodi.guilib/project/VS2010Express/libKODI_guilib.vcxproj
+++ b/lib/addons/library.kodi.guilib/project/VS2010Express/libKODI_guilib.vcxproj
@@ -53,7 +53,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
@@ -68,7 +68,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
diff --git a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj
index 55bfd4ea2c..c869c83a92 100644
--- a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj
+++ b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
@@ -62,7 +62,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
diff --git a/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj b/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj
index c2d14e5ebc..1f069018a3 100644
--- a/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj
+++ b/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
@@ -62,7 +62,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
diff --git a/lib/addons/library.xbmc.pvr/Makefile.in b/lib/addons/library.xbmc.pvr/Makefile.in
index 8c10e0d5b3..d5c315c0d0 100644
--- a/lib/addons/library.xbmc.pvr/Makefile.in
+++ b/lib/addons/library.xbmc.pvr/Makefile.in
@@ -1,5 +1,5 @@
 ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers
+INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/VideoPlayer/DVDDemuxers
 DEFINES+=
 CXXFLAGS=-fPIC
 LIBNAME=libXBMC_pvr
diff --git a/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp b/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp
index 381f7abc52..b16a540a1c 100644
--- a/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp
+++ b/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp
@@ -26,7 +26,7 @@
 #include <string>
 #include "../../../addons/library.xbmc.pvr/libXBMC_pvr.h"
 #include "addons/AddonCallbacks.h"
-#include "cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h"
+#include "cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj
index eda0b1fe2b..0c8a6340af 100644
--- a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj
+++ b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
@@ -62,7 +62,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in
index 54387cc99a..2dfa6e3fb3 100644
--- a/lib/libdvd/Makefile.in
+++ b/lib/libdvd/Makefile.in
@@ -3,7 +3,7 @@ ARCH=@ARCH@
 CC=@CC@
 CXX=@CXX@
 
-SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
+SYSDIR=@abs_top_srcdir@/system/players/VideoPlayer
 SOS= libdvdnav-$(ARCH).so
 DIRS=	libdvdread \
 	libdvdnav
diff --git a/lib/libdvd/build-xbmc-win32.sh b/lib/libdvd/build-xbmc-win32.sh
index e9287380ca..0945773ec0 100644
--- a/lib/libdvd/build-xbmc-win32.sh
+++ b/lib/libdvd/build-xbmc-win32.sh
@@ -32,7 +32,7 @@ strip -S .libs/libdvdcss-2.dll
 cd ..
 mkdir -p includes/dvdcss
 cp libdvdcss/src/dvdcss/dvdcss.h includes/dvdcss
-cp libdvdcss/.libs/libdvdcss-2.dll /xbmc/system/players/dvdplayer/
+cp libdvdcss/.libs/libdvdcss-2.dll /xbmc/system/players/VideoPlayer/
 
 #libdvdread
 cd libdvdread
@@ -79,7 +79,7 @@ gcc \
 
 strip -S obj/libdvdnav.dll
 cd ..
-cp libdvdnav/obj/libdvdnav.dll /xbmc/system/players/dvdplayer/
+cp libdvdnav/obj/libdvdnav.dll /xbmc/system/players/VideoPlayer/
 echo "***** Done *****"
 #remove the bgprocessfile for signaling the process end
 rm $BGPROCESSFILE
diff --git a/lib/libdvd/patches/cores.diff b/lib/libdvd/patches/cores.diff
index 72463226ae..35438b2f5a 100644
--- a/lib/libdvd/patches/cores.diff
+++ b/lib/libdvd/patches/cores.diff
@@ -1,6 +1,6 @@
-diff -uwr ../../dvdnav_diff/config.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h
+diff -uwr ../../dvdnav_diff/config.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/config.h
 --- ../../dvdnav_diff/config.h	Sun Sep 14 22:02:38 2008
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h	Sat Oct 19 06:29:41 2013
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/config.h	Sat Oct 19 06:29:41 2013
 @@ -1,56 +1,95 @@
 -/* config.h.  Generated by hand.  */
 +#pragma once
@@ -116,9 +116,9 @@ diff -uwr ../../dvdnav_diff/config.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav
 -
 -#endif /* LIBDVDREAD_CONFIG_H */
 +#endif
-diff -uwr ../../dvdnav_diff/decoder.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h
+diff -uwr ../../dvdnav_diff/decoder.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/decoder.h
 --- ../../dvdnav_diff/decoder.h	Sun Sep 14 21:31:44 2008
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h	Fri Feb  7 19:51:38 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/decoder.h	Fri Feb  7 19:51:38 2014
 @@ -22,6 +22,9 @@
  #ifndef LIBDVDNAV_DECODER_H
  #define LIBDVDNAV_DECODER_H
@@ -129,9 +129,9 @@ diff -uwr ../../dvdnav_diff/decoder.h xbmc/cores/dvdplayer/DVDInputStreams/dvdna
  /* link command types */
  typedef enum {
    LinkNoLink  = 0,
-diff -uwr ../../dvdnav_diff/dvd_reader.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h
+diff -uwr ../../dvdnav_diff/dvd_reader.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h
 --- ../../dvdnav_diff/dvd_reader.h	Mon Dec  7 03:50:20 2009
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h	Thu Feb  7 18:22:32 2013
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h	Thu Feb  7 18:22:32 2013
 @@ -24,14 +24,14 @@
  #define LIBDVDREAD_DVD_READER_H
  
@@ -149,9 +149,9 @@ diff -uwr ../../dvdnav_diff/dvd_reader.h xbmc/cores/dvdplayer/DVDInputStreams/dv
  
  /**
   * The DVD access interface.
-diff -uwr ../../dvdnav_diff/dvd_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h
+diff -uwr ../../dvdnav_diff/dvd_types.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_types.h
 --- ../../dvdnav_diff/dvd_types.h	Tue Dec 30 14:48:46 2008
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h	Fri Feb  7 20:03:34 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_types.h	Fri Feb  7 20:03:34 2014
 @@ -60,7 +60,8 @@
  
  /* the following types are currently unused */
@@ -221,9 +221,9 @@ diff -uwr ../../dvdnav_diff/dvd_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvd
  
  #endif
  
-diff -uwr ../../dvdnav_diff/dvdnav.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h
+diff -uwr ../../dvdnav_diff/dvdnav.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav.h
 --- ../../dvdnav_diff/dvdnav.h	Sun Oct  6 21:47:20 2013
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h	Fri Feb  7 19:58:51 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav.h	Fri Feb  7 19:58:51 2014
 @@ -32,11 +32,11 @@
  extern "C" {
  #endif
@@ -252,9 +252,9 @@ diff -uwr ../../dvdnav_diff/dvdnav.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav
  
  #ifdef __cplusplus
  }
-diff -uwr ../../dvdnav_diff/dvdnav_events.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h
+diff -uwr ../../dvdnav_diff/dvdnav_events.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h
 --- ../../dvdnav_diff/dvdnav_events.h	Tue Dec 30 14:48:46 2008
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h	Sat Feb  9 11:12:51 2013
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h	Sat Feb  9 11:12:51 2013
 @@ -25,6 +25,10 @@
  #ifndef LIBDVDNAV_DVDNAV_EVENTS_H
  #define LIBDVDNAV_DVDNAV_EVENTS_H
@@ -266,9 +266,9 @@ diff -uwr ../../dvdnav_diff/dvdnav_events.h xbmc/cores/dvdplayer/DVDInputStreams
  /*
   * DVDNAV_BLOCK_OK
   *
-diff -uwr ../../dvdnav_diff/dvdnav_internal.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
+diff -uwr ../../dvdnav_diff/dvdnav_internal.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h
 --- ../../dvdnav_diff/dvdnav_internal.h	Sun Dec  9 21:22:16 2012
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h	Fri Feb  7 20:06:27 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h	Fri Feb  7 20:06:27 2014
 @@ -25,9 +25,15 @@
  #include "config.h"
  #endif
@@ -348,9 +348,9 @@ diff -uwr ../../dvdnav_diff/dvdnav_internal.h xbmc/cores/dvdplayer/DVDInputStrea
  #endif
  #define printerr(str) \
  	do { if (this) strncpy(this->err_str, str, MAX_ERR_LEN - 1); } while (0)
-diff -uwr ../../dvdnav_diff/ifo_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h
+diff -uwr ../../dvdnav_diff/ifo_types.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h
 --- ../../dvdnav_diff/ifo_types.h	Sun Dec  9 21:08:00 2012
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h	Fri Feb  7 19:24:37 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h	Fri Feb  7 19:24:37 2014
 @@ -22,8 +22,8 @@
  #ifndef LIBDVDREAD_IFO_TYPES_H
  #define LIBDVDREAD_IFO_TYPES_H
@@ -362,9 +362,9 @@ diff -uwr ../../dvdnav_diff/ifo_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvd
  
  
  #undef ATTRIBUTE_PACKED
-diff -uwr ../../dvdnav_diff/nav_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h
+diff -uwr ../../dvdnav_diff/nav_types.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h
 --- ../../dvdnav_diff/nav_types.h	Sun Aug  8 23:49:28 2010
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h	Thu Feb  7 18:22:32 2013
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h	Thu Feb  7 18:22:32 2013
 @@ -28,9 +28,27 @@
  #ifndef LIBDVDREAD_NAV_TYPES_H
  #define LIBDVDREAD_NAV_TYPES_H
@@ -407,10 +407,10 @@ diff -uwr ../../dvdnav_diff/nav_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvd
  /**
   * PCI General Information
   */
-Only in xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/: remap.h
-diff -uwr ../../dvdnav_diff/vm.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h
+Only in xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/: remap.h
+diff -uwr ../../dvdnav_diff/vm.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h
 --- ../../dvdnav_diff/vm.h	Sat Jul 31 00:34:16 2010
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h	Fri Feb  7 19:37:55 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h	Fri Feb  7 19:37:55 2014
 @@ -23,6 +23,9 @@
  #ifndef LIBDVDNAV_VM_H
  #define LIBDVDNAV_VM_H
diff --git a/lib/libmpeg2/make-xbmc-lib-win32.sh b/lib/libmpeg2/make-xbmc-lib-win32.sh
index d8a9eed57a..04f9592101 100644
--- a/lib/libmpeg2/make-xbmc-lib-win32.sh
+++ b/lib/libmpeg2/make-xbmc-lib-win32.sh
@@ -27,7 +27,7 @@ fi
 make $MAKEFLAGS &&
 
 strip libmpeg2/.libs/*.dll &&
-cp libmpeg2/.libs/*.dll /xbmc/system/players/dvdplayer/
+cp libmpeg2/.libs/*.dll /xbmc/system/players/VideoPlayer/
 
 #remove the bgprocessfile for signaling the process end
 rm $BGPROCESSFILE
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index c11906f88e..2ded595132 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -75,7 +75,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32\Effects11\inc;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.kodi.guilib;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;shaders;..\..\tools\depends\native\libsquish-native\src;%(AdditionalIncludeDirectories);XBMC\$(Configuration);..\..\addons\library.xbmc.adsp</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\VideoPlayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32\Effects11\inc;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.kodi.guilib;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;shaders;..\..\tools\depends\native\libsquish-native\src;%(AdditionalIncludeDirectories);XBMC\$(Configuration);..\..\addons\library.xbmc.adsp</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;TAGLIB_STATIC;NPT_CONFIG_ENABLE_LOGGING;PLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi";PLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -111,7 +111,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32\Effects11\inc;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.kodi.guilib;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;shaders;..\..\lib\gtest\include;..\..\tools\depends\native\libsquish-native\src;%(AdditionalIncludeDirectories);XBMC\$(Configuration);..\..\addons\library.xbmc.adsp</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\VideoPlayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32\Effects11\inc;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.kodi.guilib;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;shaders;..\..\lib\gtest\include;..\..\tools\depends\native\libsquish-native\src;%(AdditionalIncludeDirectories);XBMC\$(Configuration);..\..\addons\library.xbmc.adsp</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;TAGLIB_STATIC;NPT_CONFIG_ENABLE_LOGGING;PLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi";PLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -149,7 +149,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32\Effects11\inc;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.kodi.guilib;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;shaders;..\..\tools\depends\native\libsquish-native\src;%(AdditionalIncludeDirectories);XBMC\$(Configuration);..\..\addons\library.xbmc.adsp</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\VideoPlayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32\Effects11\inc;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.kodi.guilib;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;shaders;..\..\tools\depends\native\libsquish-native\src;%(AdditionalIncludeDirectories);XBMC\$(Configuration);..\..\addons\library.xbmc.adsp</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;__STDC_CONSTANT_MACROS;TAGLIB_STATIC;NPT_CONFIG_ENABLE_LOGGING;PLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi";PLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -252,20 +252,20 @@
     <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamInfo.cpp" />
     <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEUtil.cpp" />
     <ClCompile Include="..\..\xbmc\cores\DataCacheCore.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\contrib\cc_decoder.c">
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\contrib\cc_decoder.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">CompileAsCpp</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\contrib\cc_decoder708.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCC.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\contrib\cc_decoder708.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodec.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxBXA.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCC.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCDDA.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxPVRClient.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamBluray.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamPVRManager.cpp" />
     <ClCompile Include="..\..\xbmc\cores\FFmpeg.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererGUI.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoRenderers\RenderCapture.cpp" />
@@ -931,12 +931,12 @@
     <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEPackIEC61937.h" />
     <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamInfo.h" />
     <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEUtil.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\contrib\cc_decoder.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\contrib\cc_decoder708.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCC.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\contrib\cc_decoder.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\contrib\cc_decoder708.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxBXA.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCC.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCDDA.h" />
     <ClInclude Include="..\..\xbmc\cores\FFmpeg.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererGUI.h" />
     <ClInclude Include="..\..\xbmc\dialogs\GUIDialogKeyboardGeneric.h" />
@@ -1602,65 +1602,65 @@
     <ClCompile Include="..\..\xbmc\win32\WIN32Util.cpp" />
     <ClCompile Include="..\..\xbmc\win32\WindowHelper.cpp" />
     <ClCompile Include="..\..\xbmc\cores\DummyVideoPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDAudio.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDClock.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxSPU.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDFileInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessage.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerAudio.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDAudio.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDClock.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxSPU.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxVobsub.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDFileInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDMessage.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDMessageQueue.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayContainer.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayRenderer.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerRadioRDS.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerSubtitle.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerTeletext.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerVideo.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDStreamInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDTSCorrection.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\Edl.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DXVA.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemux.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStream.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayer.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerAudio.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerSubtitle.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerTeletext.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerVideo.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDStreamInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDTSCorrection.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\Edl.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\DVDCodecUtils.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\DVDFactoryCodec.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoPPFFmpeg.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DXVA.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodec.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecText.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemux.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxFFmpeg.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxShoutcast.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxUtils.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDFactoryDemuxer.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDFactoryInputStream.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStream.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamFFmpeg.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamFile.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamHttp.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamMemory.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamNavigator.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamRTMP.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDStateSerializer.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDFactorySubtitle.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleLineCollection.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserMicroDVD.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserMPL2.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSami.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSSA.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSubrip.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserVplayer.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitlesLibass.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleStream.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleTagMicroDVD.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleTagSami.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\AudioDecoder.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\CodecFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\paplayer\VideoPlayerCodec.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\PAPlayer.cpp" />
     <ClCompile Include="..\..\xbmc\cores\DllLoader\coff.cpp" />
     <ClCompile Include="..\..\xbmc\cores\DllLoader\dll.cpp" />
@@ -1798,9 +1798,9 @@
     <ClInclude Include="..\..\xbmc\BackgroundInfoLoader.h" />
     <ClInclude Include="..\..\xbmc\ContextMenuItem.h" />
     <ClInclude Include="..\..\xbmc\ContextMenuManager.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxPVRClient.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamBluray.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamPVRManager.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoRenderers\RenderCapture.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\WinVideoFilter.h" />
     <ClInclude Include="..\..\xbmc\CueDocument.h" />
@@ -2253,87 +2253,87 @@
     <ClInclude Include="..\..\xbmc\win32\WindowHelper.h" />
     <ClInclude Include="..\..\xbmc\cores\DummyVideoPlayer.h" />
     <ClInclude Include="..\..\xbmc\cores\IPlayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDAudio.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDClock.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxSPU.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDFileInfo.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessage.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerAudio.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDAudio.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDClock.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxSPU.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxVobsub.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDFileInfo.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDMessage.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDMessageQueue.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayContainer.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayRenderer.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerRadioRDS.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerSubtitle.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerTeletext.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerVideo.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDStreamInfo.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDTSCorrection.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Edl.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\IDVDPlayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecs.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecUtils.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DllLibMpeg2.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DXVA.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlay.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayImage.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySpu.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySSA.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayText.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemux.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DllDvdNav.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStream.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvd_types.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_events.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_internal.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\ifo_types.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\nav_types.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\remap.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\vm.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\vmcmd.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DllLibass.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParser.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayer.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerAudio.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerSubtitle.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerTeletext.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerVideo.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDStreamInfo.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDTSCorrection.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\Edl.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\IVideoPlayer.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\DVDCodecs.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\DVDCodecUtils.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\DVDFactoryCodec.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Audio\DVDAudioCodec.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DllLibMpeg2.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodec.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoPPFFmpeg.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DXVA.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlay.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodec.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecText.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayImage.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlaySpu.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlaySSA.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayText.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemux.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxFFmpeg.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxShoutcast.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxUtils.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDFactoryDemuxer.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DllDvdNav.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDFactoryInputStream.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStream.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamFFmpeg.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamFile.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamHttp.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamMemory.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamNavigator.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamRTMP.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDStateSerializer.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\dvd_types.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\dvdnav.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\dvdnav_events.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\dvdnav_internal.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\ifo_types.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\nav_types.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\remap.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\vm.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\vmcmd.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DllLibass.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDFactorySubtitle.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleLineCollection.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParser.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserMicroDVD.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserMPL2.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSami.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSSA.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSubrip.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserVplayer.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitlesLibass.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleStream.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleTagMicroDVD.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleTagSami.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\AudioDecoder.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\CodecFactory.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.h" />
+    <ClInclude Include="..\..\xbmc\cores\paplayer\VideoPlayerCodec.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\ICodec.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\PAPlayer.h" />
     <ClInclude Include="..\..\xbmc\cores\DllLoader\coff.h" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index eaecbbf7af..408dc2dd0d 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -7,31 +7,31 @@
     <Filter Include="cores">
       <UniqueIdentifier>{d9048f15-4226-45a0-bd7d-c4f326b8c232}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cores\dvdplayer">
+    <Filter Include="cores\VideoPlayer">
       <UniqueIdentifier>{b7e0c19a-163b-43a8-bc50-47f0f220c225}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cores\dvdplayer\DVDCodecs">
+    <Filter Include="cores\VideoPlayer\DVDCodecs">
       <UniqueIdentifier>{f72e399a-b2f5-4f77-a680-797306b37afe}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cores\dvdplayer\DVDCodecs\Audio">
+    <Filter Include="cores\VideoPlayer\DVDCodecs\Audio">
       <UniqueIdentifier>{5bee29f5-b152-4416-9413-0bed2a669575}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cores\dvdplayer\DVDCodecs\Video">
+    <Filter Include="cores\VideoPlayer\DVDCodecs\Video">
       <UniqueIdentifier>{09e9057e-7017-4f3d-b5d3-2f5e9a23a53c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cores\dvdplayer\DVDCodecs\Overlay">
+    <Filter Include="cores\VideoPlayer\DVDCodecs\Overlay">
       <UniqueIdentifier>{cc80e830-cd3b-4790-9d73-b727b997efdc}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cores\dvdplayer\DVDDemuxers">
+    <Filter Include="cores\VideoPlayer\DVDDemuxers">
       <UniqueIdentifier>{59ff29b6-c2b5-4ed8-a80c-e5dd130802a7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cores\dvdplayer\DVDInputStreams">
+    <Filter Include="cores\VideoPlayer\DVDInputStreams">
       <UniqueIdentifier>{15bea9e8-7473-4e72-93b1-c403d491160d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cores\dvdplayer\DVDHeaders">
+    <Filter Include="cores\VideoPlayer\DVDHeaders">
       <UniqueIdentifier>{9b9c3d13-56db-4db5-98a3-4402ee3b4ff9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cores\dvdplayer\DVDSubtitles">
+    <Filter Include="cores\VideoPlayer\DVDSubtitles">
       <UniqueIdentifier>{83ae8e22-c3a0-45c6-bbc2-29d0bb180e2d}</UniqueIdentifier>
     </Filter>
     <Filter Include="cores\paplayer">
@@ -313,7 +313,7 @@
     <Filter Include="video\videosync">
       <UniqueIdentifier>{9775d5c0-c640-4606-a625-e6cdcf9f959e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cores\dvdplayer\DVDCodecs\Overlay\contrib">
+    <Filter Include="cores\VideoPlayer\DVDCodecs\Overlay\contrib">
       <UniqueIdentifier>{43526341-7b96-462d-9f71-685e426251ec}</UniqueIdentifier>
     </Filter>
     <Filter Include="cores\AudioEngine\DSPAddons">
@@ -384,167 +384,167 @@
     <ClCompile Include="..\..\xbmc\cores\DummyVideoPlayer.cpp">
       <Filter>cores</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDAudio.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDAudio.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDClock.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDClock.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxSPU.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxSPU.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxVobsub.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDFileInfo.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDFileInfo.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessage.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDMessage.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDMessageQueue.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayContainer.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayRenderer.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayer.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerAudio.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerAudio.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerRadioRDS.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerSubtitle.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerSubtitle.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerTeletext.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerTeletext.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerVideo.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerVideo.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDStreamInfo.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDStreamInfo.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDTSCorrection.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDTSCorrection.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\Edl.cpp">
-      <Filter>cores\dvdplayer</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\Edl.cpp">
+      <Filter>cores\VideoPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecUtils.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\DVDCodecUtils.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\DVDFactoryCodec.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoPPFFmpeg.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DXVA.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DXVA.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodec.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecText.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemux.cpp">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemux.cpp">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.cpp">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxFFmpeg.cpp">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.cpp">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxShoutcast.cpp">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.cpp">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxUtils.cpp">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.cpp">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDFactoryDemuxer.cpp">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDFactoryInputStream.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStream.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStream.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamFFmpeg.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamFile.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamHttp.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamMemory.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamNavigator.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamRTMP.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDStateSerializer.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDFactorySubtitle.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleLineCollection.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserMicroDVD.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserMPL2.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSami.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSSA.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSubrip.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserVplayer.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitlesLibass.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleStream.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\cores\paplayer\AudioDecoder.cpp">
       <Filter>cores\paplayer</Filter>
@@ -552,7 +552,7 @@
     <ClCompile Include="..\..\xbmc\cores\paplayer\CodecFactory.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.cpp">
+    <ClCompile Include="..\..\xbmc\cores\paplayer\VideoPlayerCodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\cores\paplayer\PAPlayer.cpp">
@@ -783,14 +783,14 @@
     <ClCompile Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\WinVideoFilter.cpp">
       <Filter>cores\VideoRenderers\Shaders</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleTagMicroDVD.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.cpp">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleTagSami.cpp">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamBluray.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\addons\Service.cpp">
       <Filter>addons</Filter>
@@ -1615,11 +1615,11 @@
     <ClCompile Include="..\..\xbmc\utils\Observer.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.cpp">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamPVRManager.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.cpp">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxPVRClient.cpp">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\utils\TextSearch.cpp">
       <Filter>utils</Filter>
@@ -2145,8 +2145,8 @@
     <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceInfo.cpp">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Audio</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\guilib\GraphicContext.cpp">
       <Filter>guilib</Filter>
@@ -2587,8 +2587,8 @@
     <ClCompile Include="..\..\xbmc\interfaces\json-rpc\AddonsOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.cpp">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxBXA.cpp">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\dialogs\GUIDialogMediaFilter.cpp">
       <Filter>dialogs</Filter>
@@ -2738,8 +2738,8 @@
     <ClCompile Include="..\..\xbmc\interfaces\json-rpc\FavouritesOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.cpp">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCDDA.cpp">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\utils\Environment.cpp">
       <Filter>utils</Filter>
@@ -2854,8 +2854,8 @@
     <ClCompile Include="..\..\xbmc\utils\XSLTUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodec.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\cores\FFmpeg.cpp">
       <Filter>cores</Filter>
@@ -2918,14 +2918,14 @@
     <ClCompile Include="..\..\xbmc\filesystem\OverrideFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\contrib\cc_decoder.c">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay\contrib</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\contrib\cc_decoder.c">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay\contrib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\contrib\cc_decoder708.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay\contrib</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\contrib\cc_decoder708.cpp">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay\contrib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCC.cpp">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCC.cpp">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\settings\AudioDSPSettings.cpp">
       <Filter>settings</Filter>
@@ -3248,233 +3248,233 @@
     <ClInclude Include="..\..\xbmc\cores\IPlayer.h">
       <Filter>cores</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDAudio.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDAudio.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDClock.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDClock.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxSPU.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxSPU.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxVobsub.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDFileInfo.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDFileInfo.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessage.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDMessage.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDMessageQueue.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayContainer.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDOverlayRenderer.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayer.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerAudio.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerAudio.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerRadioRDS.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerSubtitle.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerSubtitle.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerTeletext.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerTeletext.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerVideo.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoPlayerVideo.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDStreamInfo.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDStreamInfo.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDTSCorrection.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDTSCorrection.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Edl.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\Edl.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\IDVDPlayer.h">
-      <Filter>cores\dvdplayer</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\IVideoPlayer.h">
+      <Filter>cores\VideoPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecs.h">
-      <Filter>cores\dvdplayer\DVDCodecs</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\DVDCodecs.h">
+      <Filter>cores\VideoPlayer\DVDCodecs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecUtils.h">
-      <Filter>cores\dvdplayer\DVDCodecs</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\DVDCodecUtils.h">
+      <Filter>cores\VideoPlayer\DVDCodecs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.h">
-      <Filter>cores\dvdplayer\DVDCodecs</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\DVDFactoryCodec.h">
+      <Filter>cores\VideoPlayer\DVDCodecs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodec.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Audio\DVDAudioCodec.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DllLibMpeg2.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DllLibMpeg2.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodec.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DVDVideoPPFFmpeg.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DXVA.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Video\DXVA.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlay.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlay.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodec.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecText.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayImage.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayImage.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySpu.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlaySpu.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySSA.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlaySSA.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayText.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\DVDOverlayText.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemux.h">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemux.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.h">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxFFmpeg.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.h">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxShoutcast.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.h">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxUtils.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.h">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDFactoryDemuxer.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DllDvdNav.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DllDvdNav.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDFactoryInputStream.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStream.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStream.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamFFmpeg.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamFile.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamHttp.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamMemory.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamNavigator.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamRTMP.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDStateSerializer.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvd_types.h">
-      <Filter>cores\dvdplayer\DVDHeaders</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\dvd_types.h">
+      <Filter>cores\VideoPlayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav.h">
-      <Filter>cores\dvdplayer\DVDHeaders</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\dvdnav.h">
+      <Filter>cores\VideoPlayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_events.h">
-      <Filter>cores\dvdplayer\DVDHeaders</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\dvdnav_events.h">
+      <Filter>cores\VideoPlayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_internal.h">
-      <Filter>cores\dvdplayer\DVDHeaders</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\dvdnav_internal.h">
+      <Filter>cores\VideoPlayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\ifo_types.h">
-      <Filter>cores\dvdplayer\DVDHeaders</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\ifo_types.h">
+      <Filter>cores\VideoPlayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\nav_types.h">
-      <Filter>cores\dvdplayer\DVDHeaders</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\nav_types.h">
+      <Filter>cores\VideoPlayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\remap.h">
-      <Filter>cores\dvdplayer\DVDHeaders</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\remap.h">
+      <Filter>cores\VideoPlayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\vm.h">
-      <Filter>cores\dvdplayer\DVDHeaders</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\vm.h">
+      <Filter>cores\VideoPlayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\vmcmd.h">
-      <Filter>cores\dvdplayer\DVDHeaders</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\dvdnav\vmcmd.h">
+      <Filter>cores\VideoPlayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DllLibass.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DllLibass.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDFactorySubtitle.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleLineCollection.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParser.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParser.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserMicroDVD.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserMPL2.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSami.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSSA.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserSubrip.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleParserVplayer.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitlesLibass.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleStream.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\cores\paplayer\AudioDecoder.h">
       <Filter>cores\paplayer</Filter>
@@ -3482,7 +3482,7 @@
     <ClInclude Include="..\..\xbmc\cores\paplayer\CodecFactory.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.h">
+    <ClInclude Include="..\..\xbmc\cores\paplayer\VideoPlayerCodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\cores\paplayer\ICodec.h">
@@ -3737,14 +3737,14 @@
     <ClInclude Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\WinVideoFilter.h">
       <Filter>cores\VideoRenderers\Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleTagMicroDVD.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.h">
-      <Filter>cores\dvdplayer\DVDSubtitles</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDSubtitles\DVDSubtitleTagSami.h">
+      <Filter>cores\VideoPlayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamBluray.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\addons\Service.h">
       <Filter>addons</Filter>
@@ -4660,11 +4660,11 @@
     <ClInclude Include="..\..\xbmc\utils\Observer.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.h">
-      <Filter>cores\dvdplayer\DVDInputStreams</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamPVRManager.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.h">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxPVRClient.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\utils\TextSearch.h">
       <Filter>utils</Filter>
@@ -5234,8 +5234,8 @@
     <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceInfo.h">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Audio</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\guilib\TextureManager.h">
       <Filter>guilib</Filter>
@@ -5542,8 +5542,8 @@
     <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AddonsOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.h">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxBXA.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\utils\Screenshot.h">
       <Filter>utils</Filter>
@@ -5711,8 +5711,8 @@
     <ClInclude Include="..\..\xbmc\interfaces\json-rpc\FavouritesOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.h">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCDDA.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\utils\Environment.h">
       <Filter>utils</Filter>
@@ -5932,14 +5932,14 @@
     <ClInclude Include="..\..\xbmc\filesystem\OverrideFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\contrib\cc_decoder.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay\contrib</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\contrib\cc_decoder.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay\contrib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\contrib\cc_decoder708.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Overlay\contrib</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDCodecs\Overlay\contrib\cc_decoder708.h">
+      <Filter>cores\VideoPlayer\DVDCodecs\Overlay\contrib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCC.h">
-      <Filter>cores\dvdplayer\DVDDemuxers</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCC.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\settings\AudioDSPSettings.h">
       <Filter>settings</Filter>
diff --git a/project/Win32BuildSetup/buildffmpeg.sh b/project/Win32BuildSetup/buildffmpeg.sh
index fe17ef3e98..3ea1b4bbee 100644
--- a/project/Win32BuildSetup/buildffmpeg.sh
+++ b/project/Win32BuildSetup/buildffmpeg.sh
@@ -88,18 +88,18 @@ OPTIONS="
 --enable-libdcadec"
 
 echo configuring $LIBNAME
-./configure --extra-cflags="-fno-common -I/xbmc/lib/win32/ffmpeg_dxva2 -DNDEBUG" --extra-ldflags="-L/xbmc/system/players/dvdplayer" ${OPTIONS} &&
+./configure --extra-cflags="-fno-common -I/xbmc/lib/win32/ffmpeg_dxva2 -DNDEBUG" --extra-ldflags="-L/xbmc/system/players/VideoPlayer" ${OPTIONS} &&
 
 make $MAKEFLAGS &&
 cp lib*/*.dll .libs/ &&
 cp lib*/*.lib .libs/ &&
-cp .libs/avcodec-*.dll /xbmc/system/players/dvdplayer/ &&
-cp .libs/avformat-*.dll /xbmc/system/players/dvdplayer/ &&
-cp .libs/avutil-*.dll /xbmc/system/players/dvdplayer/ &&
-cp .libs/avfilter-*.dll /xbmc/system/players/dvdplayer/ &&
-cp .libs/postproc-*.dll /xbmc/system/players/dvdplayer/ &&
-cp .libs/swresample-*.dll /xbmc/system/players/dvdplayer/ &&
-cp .libs/swscale-*.dll /xbmc/system/players/dvdplayer/
+cp .libs/avcodec-*.dll /xbmc/system/players/VideoPlayer/ &&
+cp .libs/avformat-*.dll /xbmc/system/players/VideoPlayer/ &&
+cp .libs/avutil-*.dll /xbmc/system/players/VideoPlayer/ &&
+cp .libs/avfilter-*.dll /xbmc/system/players/VideoPlayer/ &&
+cp .libs/postproc-*.dll /xbmc/system/players/VideoPlayer/ &&
+cp .libs/swresample-*.dll /xbmc/system/players/VideoPlayer/ &&
+cp .libs/swscale-*.dll /xbmc/system/players/VideoPlayer/
 
 #remove the bgprocessfile for signaling the process end
 if [ -f $BGPROCESSFILE ]; then
diff --git a/system/playercorefactory.xml b/system/playercorefactory.xml
index df0e42f1f3..be6b7219ab 100644
--- a/system/playercorefactory.xml
+++ b/system/playercorefactory.xml
@@ -3,38 +3,38 @@
   <players>
     <!-- These are compiled-in as re-ordering them would break scripts
     The following aliases may also be used:
-      audiodefaultplayer, videodefaultplayer, videodefaultdvdplayer
-    <player name="DVDPlayer" audio="true" video="true" />
-    <player name="DVDPlayer" /> placeholder for MPlayer
+      audiodefaultplayer, videodefaultplayer, videodefaultVideoPlayer
+    <player name="VideoPlayer" audio="true" video="true" />
+    <player name="VideoPlayer" /> placeholder for MPlayer
     <player name="PAPlayer" audio="true" />
     -->
   </players>
 
   <rules name="system rules">
-    <rule name="mms/udp" protocols="mms|mmsh|udp" player="DVDPlayer" />
+    <rule name="mms/udp" protocols="mms|mmsh|udp" player="VideoPlayer" />
     <rule name="lastfm/shout" protocols="lastfm|shout" player="PAPlayer" />
     <rule name="rtmp" protocols="rtmp" player="videodefaultplayer" />
 
-    <!-- dvdplayer can play standard rtsp streams -->
+    <!-- VideoPlayer can play standard rtsp streams -->
     <rule name="rtsp" protocols="rtsp" filetypes="!(rm|ra)"  player="PAPlayer" />
 
     <!-- Internet streams -->
     <rule name="streams" internetstream="true">
-      <rule name="aacp/sdp" mimetypes="audio/aacp|application/sdp" player="DVDPlayer" />
+      <rule name="aacp/sdp" mimetypes="audio/aacp|application/sdp" player="VideoPlayer" />
       <rule name="mp2" mimetypes="application/octet-stream" filetypes="mp2" player="PAPlayer" />
     </rule>
 
     <!-- DVDs -->
-    <rule name="dvd" dvd="true" player="DVDPlayer" />
-    <rule name="dvdimage" dvdimage="true" player="DVDPlayer" />
+    <rule name="dvd" dvd="true" player="VideoPlayer" />
+    <rule name="dvdimage" dvdimage="true" player="VideoPlayer" />
 
-    <!-- Only dvdplayer can handle these normally -->
-    <rule name="sdp/asf" filetypes="sdp|asf" player="DVDPlayer" />
+    <!-- Only VideoPlayer can handle these normally -->
+    <rule name="sdp/asf" filetypes="sdp|asf" player="VideoPlayer" />
 
-    <!-- Pass these to dvdplayer as we do not know if they are audio or video -->
-    <rule name="nsv" filetypes="nsv" player="DVDPlayer" />
+    <!-- Pass these to VideoPlayer as we do not know if they are audio or video -->
+    <rule name="nsv" filetypes="nsv" player="VideoPlayer" />
 
-    <!-- pvr radio channels should be played by dvdplayer because they need buffering -->
-    <rule name="radio" filetypes="pvr" filename=".*/radio/.*" player="DVDPlayer" />
+    <!-- pvr radio channels should be played by VideoPlayer because they need buffering -->
+    <rule name="radio" filetypes="pvr" filename=".*/radio/.*" player="VideoPlayer" />
   </rules>
 </playercorefactory>
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-autohint.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-autohint.conf
index 5406f4eddb..5406f4eddb 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-autohint.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-autohint.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-no-sub-pixel.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-no-sub-pixel.conf
index 5d64a0b433..5d64a0b433 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-no-sub-pixel.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-no-sub-pixel.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-bgr.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
index 2aba95e13d..2aba95e13d 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-rgb.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
index c4e8a42e1c..c4e8a42e1c 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
index 0cdad2a700..0cdad2a700 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
index 60239e0254..60239e0254 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-unhinted.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-unhinted.conf
index fb0b375acd..fb0b375acd 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-unhinted.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-unhinted.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/20-fix-globaladvance.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/20-fix-globaladvance.conf
index a62162ca0f..a62162ca0f 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/20-fix-globaladvance.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/20-fix-globaladvance.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/20-lohit-gujarati.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/20-lohit-gujarati.conf
index 1c29d0d0ad..1c29d0d0ad 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/20-lohit-gujarati.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/20-lohit-gujarati.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/20-unhint-small-vera.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/20-unhint-small-vera.conf
index 3078119803..3078119803 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/20-unhint-small-vera.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/20-unhint-small-vera.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/30-amt-aliases.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/30-amt-aliases.conf
index d6df67e055..d6df67e055 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/30-amt-aliases.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/30-amt-aliases.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/30-urw-aliases.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/30-urw-aliases.conf
index cf90dd5466..cf90dd5466 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/30-urw-aliases.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/30-urw-aliases.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/40-generic.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/40-generic.conf
index 84e85e44bb..84e85e44bb 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/40-generic.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/40-generic.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/49-sansserif.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/49-sansserif.conf
index c6209a7d31..c6209a7d31 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/49-sansserif.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/49-sansserif.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/50-user.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/50-user.conf
index 9a38a40ad9..9a38a40ad9 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/50-user.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/50-user.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/51-local.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/51-local.conf
index d35046e78b..d35046e78b 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/51-local.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/51-local.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/60-latin.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/60-latin.conf
index 06cdd7e6c7..06cdd7e6c7 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/60-latin.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/60-latin.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/65-fonts-persian.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/65-fonts-persian.conf
index e30c4d9691..e30c4d9691 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/65-fonts-persian.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/65-fonts-persian.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/65-nonlatin.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/65-nonlatin.conf
index f8dbb64fc4..f8dbb64fc4 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/65-nonlatin.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/65-nonlatin.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/69-unifont.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/69-unifont.conf
index a784af920d..a784af920d 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/69-unifont.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/69-unifont.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/70-no-bitmaps.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/70-no-bitmaps.conf
index e8fb6a947f..e8fb6a947f 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/70-no-bitmaps.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/70-no-bitmaps.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/70-yes-bitmaps.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/70-yes-bitmaps.conf
index c539c70ac3..c539c70ac3 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/70-yes-bitmaps.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/70-yes-bitmaps.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/80-delicious.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/80-delicious.conf
index 701429bcc4..701429bcc4 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/80-delicious.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/80-delicious.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/90-synthetic.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/90-synthetic.conf
index 63d9b891b3..63d9b891b3 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/90-synthetic.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/90-synthetic.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/README b/system/players/VideoPlayer/etc/fonts/conf.avail/README
index dbcfe2135f..dbcfe2135f 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/README
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/README
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/20-fix-globaladvance.conf b/system/players/VideoPlayer/etc/fonts/conf.d/20-fix-globaladvance.conf
index a62162ca0f..a62162ca0f 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/20-fix-globaladvance.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/20-fix-globaladvance.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/20-lohit-gujarati.conf b/system/players/VideoPlayer/etc/fonts/conf.d/20-lohit-gujarati.conf
index 1c29d0d0ad..1c29d0d0ad 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/20-lohit-gujarati.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/20-lohit-gujarati.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/20-unhint-small-vera.conf b/system/players/VideoPlayer/etc/fonts/conf.d/20-unhint-small-vera.conf
index 3078119803..3078119803 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/20-unhint-small-vera.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/20-unhint-small-vera.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/30-amt-aliases.conf b/system/players/VideoPlayer/etc/fonts/conf.d/30-amt-aliases.conf
index d6df67e055..d6df67e055 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/30-amt-aliases.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/30-amt-aliases.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/30-urw-aliases.conf b/system/players/VideoPlayer/etc/fonts/conf.d/30-urw-aliases.conf
index cf90dd5466..cf90dd5466 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/30-urw-aliases.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/30-urw-aliases.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/40-generic.conf b/system/players/VideoPlayer/etc/fonts/conf.d/40-generic.conf
index 84e85e44bb..84e85e44bb 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/40-generic.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/40-generic.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/49-sansserif.conf b/system/players/VideoPlayer/etc/fonts/conf.d/49-sansserif.conf
index c6209a7d31..c6209a7d31 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/49-sansserif.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/49-sansserif.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/50-user.conf b/system/players/VideoPlayer/etc/fonts/conf.d/50-user.conf
index 9a38a40ad9..9a38a40ad9 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/50-user.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/50-user.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/51-local.conf b/system/players/VideoPlayer/etc/fonts/conf.d/51-local.conf
index d35046e78b..d35046e78b 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/51-local.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/51-local.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/60-latin.conf b/system/players/VideoPlayer/etc/fonts/conf.d/60-latin.conf
index 06cdd7e6c7..06cdd7e6c7 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/60-latin.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/60-latin.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/65-fonts-persian.conf b/system/players/VideoPlayer/etc/fonts/conf.d/65-fonts-persian.conf
index e30c4d9691..e30c4d9691 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/65-fonts-persian.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/65-fonts-persian.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/65-nonlatin.conf b/system/players/VideoPlayer/etc/fonts/conf.d/65-nonlatin.conf
index f8dbb64fc4..f8dbb64fc4 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/65-nonlatin.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/65-nonlatin.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/69-unifont.conf b/system/players/VideoPlayer/etc/fonts/conf.d/69-unifont.conf
index a784af920d..a784af920d 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/69-unifont.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/69-unifont.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/80-delicious.conf b/system/players/VideoPlayer/etc/fonts/conf.d/80-delicious.conf
index 701429bcc4..701429bcc4 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/80-delicious.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/80-delicious.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/90-synthetic.conf b/system/players/VideoPlayer/etc/fonts/conf.d/90-synthetic.conf
index 63d9b891b3..63d9b891b3 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/90-synthetic.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/90-synthetic.conf
diff --git a/system/players/dvdplayer/etc/fonts/fonts.conf b/system/players/VideoPlayer/etc/fonts/fonts.conf
index 9e2067c099..9e2067c099 100644
--- a/system/players/dvdplayer/etc/fonts/fonts.conf
+++ b/system/players/VideoPlayer/etc/fonts/fonts.conf
diff --git a/system/players/dvdplayer/etc/fonts/fonts.dtd b/system/players/VideoPlayer/etc/fonts/fonts.dtd
index a5c54f9835..a5c54f9835 100644
--- a/system/players/dvdplayer/etc/fonts/fonts.dtd
+++ b/system/players/VideoPlayer/etc/fonts/fonts.dtd
diff --git a/tools/buildsteps/win32/make-mingwlibs.sh b/tools/buildsteps/win32/make-mingwlibs.sh
index c78f73e670..5a6f032f39 100644
--- a/tools/buildsteps/win32/make-mingwlibs.sh
+++ b/tools/buildsteps/win32/make-mingwlibs.sh
@@ -82,21 +82,21 @@ echo "################################"
 echo "##### building ffmpeg dlls #####"
 cd /xbmc/project/Win32BuildSetup
 runBackgroundProcess "./buildffmpeg.sh $MAKECLEAN"
-setfilepath /xbmc/system/players/dvdplayer
+setfilepath /xbmc/system/players/VideoPlayer
 checkfiles avcodec-56.dll avformat-56.dll avutil-54.dll postproc-53.dll swscale-3.dll avfilter-5.dll swresample-1.dll
 echo "##### building of ffmpeg dlls done #####"
 
 echo "##### building libdvd dlls #####"
 cd /xbmc/lib/libdvd/
 runBackgroundProcess "./build-xbmc-win32.sh $MAKECLEAN"
-setfilepath /xbmc/system/players/dvdplayer
+setfilepath /xbmc/system/players/VideoPlayer
 checkfiles libdvdcss-2.dll libdvdnav.dll
 echo "##### building of libdvd dlls done #####"
 
 echo "##### building libmpeg2 dlls #####"
 cd /xbmc/lib/libmpeg2/
 runBackgroundProcess "./make-xbmc-lib-win32.sh $MAKECLEAN"
-setfilepath /xbmc/system/players/dvdplayer
+setfilepath /xbmc/system/players/VideoPlayer
 checkfiles libmpeg2-0.dll
 echo "##### building of libmpeg2 dlls done #####"
 
diff --git a/tools/darwin/Configurations/App.xcconfig.in b/tools/darwin/Configurations/App.xcconfig.in
index cc349096f4..d8b571051e 100644
--- a/tools/darwin/Configurations/App.xcconfig.in
+++ b/tools/darwin/Configurations/App.xcconfig.in
@@ -20,7 +20,7 @@
 
 XBMC_DEPENDS_ROOT = @DEPENDS_ROOT_FOR_XCODE@
 
-HEADER_SEARCH_PATHS = $(inherited) $SRCROOT xbmc xbmc/linux xbmc/osx xbmc/cores/dvdplayer lib $XBMC_DEPENDS/include $XBMC_DEPENDS/include/libcec $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.7
+HEADER_SEARCH_PATHS = $(inherited) $SRCROOT xbmc xbmc/linux xbmc/osx xbmc/cores/VideoPlayer lib $XBMC_DEPENDS/include $XBMC_DEPENDS/include/libcec $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.7
 
 LIBRARY_SEARCH_PATHS = $(inherited) $(SRCROOT) $(SRCROOT)/xbmc/interfaces/json-rpc "$(SRCROOT)/xbmc/interfaces/python" "$(SRCROOT)/xbmc/interfaces/legacy"
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$(SDKROOT)/System/Library/PrivateFrameworks/" "$(SDKROOT)/System/Library/Frameworks/"
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index a65a506519..464c21921d 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -33,7 +33,7 @@
 #include "URL.h"
 #include "guilib/TextureManager.h"
 #include "cores/IPlayer.h"
-#include "cores/dvdplayer/DVDFileInfo.h"
+#include "cores/VideoPlayer/DVDFileInfo.h"
 #include "cores/AudioEngine/AEFactory.h"
 #include "cores/AudioEngine/DSPAddons/ActiveAEDSP.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
@@ -973,7 +973,7 @@ bool CApplication::InitDirectoriesOSX()
 
 #if defined(TARGET_DARWIN_IOS)
   std::string fontconfigPath;
-  fontconfigPath = appPath + "/system/players/dvdplayer/etc/fonts/fonts.conf";
+  fontconfigPath = appPath + "/system/players/VideoPlayer/etc/fonts/fonts.conf";
   setenv("FONTCONFIG_FILE", fontconfigPath.c_str(), 0);
 #endif
 
@@ -3494,7 +3494,7 @@ PlayBackRet CApplication::PlayFile(const CFileItem& item, bool bRestart)
   }
 
   // We should restart the player, unless the previous and next tracks are using
-  // one of the players that allows gapless playback (paplayer, dvdplayer)
+  // one of the players that allows gapless playback (paplayer, VideoPlayer)
   m_pPlayer->ClosePlayerGapless(eNewCore);
 
   // now reset play state to starting, since we already stopped the previous playing item if there is.
diff --git a/xbmc/ApplicationPlayer.cpp b/xbmc/ApplicationPlayer.cpp
index fa65d6f0da..8c3aa70c2e 100644
--- a/xbmc/ApplicationPlayer.cpp
+++ b/xbmc/ApplicationPlayer.cpp
@@ -63,7 +63,7 @@ void CApplicationPlayer::ClosePlayerGapless(PLAYERCOREID newCore)
   if (!player)
     return;
 
-  bool gaplessSupported = (m_eCurrentPlayer == EPC_DVDPLAYER || m_eCurrentPlayer == EPC_PAPLAYER);
+  bool gaplessSupported = (m_eCurrentPlayer == EPC_VideoPlayer || m_eCurrentPlayer == EPC_PAPLAYER);
   gaplessSupported = gaplessSupported && (m_eCurrentPlayer == newCore);
   if (!gaplessSupported)
   {
@@ -71,7 +71,7 @@ void CApplicationPlayer::ClosePlayerGapless(PLAYERCOREID newCore)
   }
   else
   {
-    // XXX: we had to stop the previous playing item, it was done in dvdplayer::OpenFile.
+    // XXX: we had to stop the previous playing item, it was done in VideoPlayer::OpenFile.
     // but in paplayer::OpenFile, it sometimes just fade in without call CloseFile.
     // but if we do not stop it, we can not distingush callbacks from previous
     // item and current item, it will confused us then we can not make correct delay
diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp
index 8454f85e16..942e734693 100644
--- a/xbmc/Autorun.cpp
+++ b/xbmc/Autorun.cpp
@@ -304,11 +304,11 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
             item.m_lStartOffset = STARTOFFSET_RESUME;
 
             // get playername
-            std::string hddvdplayer = CPlayerCoreFactory::GetInstance().GetPlayerName(CPlayerCoreFactory::GetInstance().GetDefaultPlayer(item));
+            std::string hdVideoPlayer = CPlayerCoreFactory::GetInstance().GetPlayerName(CPlayerCoreFactory::GetInstance().GetDefaultPlayer(item));
             
             // Single *.xpl or *.ifo files require an external player to handle playback.
-            // If no matching rule was found, DVDPlayer will be default player.
-            if (hddvdplayer != "DVDPlayer")
+            // If no matching rule was found, VideoPlayer will be default player.
+            if (hdVideoPlayer != "VideoPlayer")
             {
               CLog::Log(LOGINFO,"HD DVD: External singlefile playback initiated: %s",hddvdname.c_str());
               g_application.PlayFile(item, false);
diff --git a/xbmc/DllPaths_generated.h.in b/xbmc/DllPaths_generated.h.in
index 5384a0b04e..cb50e1a244 100644
--- a/xbmc/DllPaths_generated.h.in
+++ b/xbmc/DllPaths_generated.h.in
@@ -41,9 +41,9 @@
 #define DLL_PATH_LIBCURL       "@CURL_SONAME@"
 #endif
 
-/* dvdplayer */
+/* VideoPlayer */
 #define DLL_PATH_LIBASS        "@ASS_SONAME@"
-#define DLL_PATH_LIBDVDNAV     "special://xbmcbin/system/players/dvdplayer/libdvdnav-@ARCH@.so"
+#define DLL_PATH_LIBDVDNAV     "special://xbmcbin/system/players/VideoPlayer/libdvdnav-@ARCH@.so"
 #define DLL_PATH_LIBMPEG2      "@MPEG2_SONAME@"
 
 /* libbluray */
diff --git a/xbmc/DllPaths_generated_android.h.in b/xbmc/DllPaths_generated_android.h.in
index edf6a04939..3eb51ce2f2 100644
--- a/xbmc/DllPaths_generated_android.h.in
+++ b/xbmc/DllPaths_generated_android.h.in
@@ -42,7 +42,7 @@
 #define DLL_PATH_LIBCURL       "@CURL_SONAME@"
 #endif
 
-/* dvdplayer */
+/* VideoPlayer */
 #define DLL_PATH_LIBASS        "@ASS_SONAME@"
 #define DLL_PATH_LIBDVDNAV     "libdvdnav-@ARCH@.so"
 #define DLL_PATH_LIBMPEG2      "@MPEG2_SONAME@"
diff --git a/xbmc/DllPaths_win32.h b/xbmc/DllPaths_win32.h
index c4ed9a3aaf..a273289e6b 100644
--- a/xbmc/DllPaths_win32.h
+++ b/xbmc/DllPaths_win32.h
@@ -32,14 +32,14 @@
 #define DLL_PATH_LIBSHAIRPLAY  "special://xbmcbin/system/airplay/libshairplay-1.dll"
 #define DLL_PATH_LIBCEC        "special://xbmcbin/system/libcec.dll"
 
-/* dvdplayer */
-#define DLL_PATH_LIBASS        "special://xbmcbin/system/players/dvdplayer/libass.dll"
-#define DLL_PATH_LIBMPEG2      "special://xbmcbin/system/players/dvdplayer/libmpeg2-0.dll"
-#define DLL_PATH_LIBDVDNAV     "special://xbmcbin/system/players/dvdplayer/libdvdnav.dll"
-#define DLL_PATH_LIBRTMP       "special://xbmcbin/system/players/dvdplayer/librtmp.dll"
+/* VideoPlayer */
+#define DLL_PATH_LIBASS        "special://xbmcbin/system/players/VideoPlayer/libass.dll"
+#define DLL_PATH_LIBMPEG2      "special://xbmcbin/system/players/VideoPlayer/libmpeg2-0.dll"
+#define DLL_PATH_LIBDVDNAV     "special://xbmcbin/system/players/VideoPlayer/libdvdnav.dll"
+#define DLL_PATH_LIBRTMP       "special://xbmcbin/system/players/VideoPlayer/librtmp.dll"
 
 /* libbluray */
-#define DLL_PATH_LIBBLURAY     "special://xbmcbin/system/players/dvdplayer/libbluray.dll"
+#define DLL_PATH_LIBBLURAY     "special://xbmcbin/system/players/VideoPlayer/libbluray.dll"
 
 #endif
 
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index a6b4d1be4e..8ca36e267e 100644
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@ -96,7 +96,7 @@
 #include "cores/IPlayer.h"
 #include "cores/AudioEngine/DSPAddons/ActiveAEDSPProcess.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
-#include "cores/dvdplayer/VideoRenderers/BaseRenderer.h"
+#include "cores/VideoPlayer/VideoRenderers/BaseRenderer.h"
 #include "interfaces/info/InfoExpression.h"
 
 #if defined(TARGET_DARWIN_OSX)
@@ -1679,7 +1679,7 @@ std::string CGUIInfoManager::GetLabel(int info, int contextWindow, std::string *
           return m_currentFile->GetVideoInfoTag()->m_strTitle;
         if (m_currentFile->HasMusicInfoTag() && !m_currentFile->GetMusicInfoTag()->GetTitle().empty())
           return m_currentFile->GetMusicInfoTag()->GetTitle();
-        // don't have the title, so use dvdplayer, label, or drop down to title from path
+        // don't have the title, so use VideoPlayer, label, or drop down to title from path
         if (!g_application.m_pPlayer->GetPlayingTitle().empty())
           return g_application.m_pPlayer->GetPlayingTitle();
         if (!m_currentFile->GetLabel().empty())
diff --git a/xbmc/GUIUserMessages.h b/xbmc/GUIUserMessages.h
index fffad6b5d6..6876a1fb90 100644
--- a/xbmc/GUIUserMessages.h
+++ b/xbmc/GUIUserMessages.h
@@ -82,7 +82,7 @@
 #define GUI_MSG_VISUALISATION_ACTION    GUI_MSG_USER + 120 // request the vis perform an action
 #define GUI_MSG_VISUALISATION_RELOAD    GUI_MSG_USER + 121 // request the vis to reload
 
-#define GUI_MSG_VIDEO_MENU_STARTED      GUI_MSG_USER + 21 // sent by dvdplayer on entry to the menu
+#define GUI_MSG_VIDEO_MENU_STARTED      GUI_MSG_USER + 21 // sent by VideoPlayer on entry to the menu
 
 //  Message is sent by built-in function to alert the playlist window
 //  that the user has initiated Random playback
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index 9235dd21bc..66c33012fb 100644
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -85,8 +85,8 @@
 #include "utils/log.h"
 #include "utils/Environment.h"
 
-#include "cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.h"
-#include "cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.h"
+#include "cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagSami.h"
+#include "cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.h"
 #include "URL.h"
 #include "utils/LangCodeExpander.h"
 #include "video/VideoInfoTag.h"
@@ -94,7 +94,7 @@
   #include <sys/capability.h>
 #endif
 
-#include "cores/dvdplayer/DVDDemuxers/DVDDemux.h"
+#include "cores/VideoPlayer/DVDDemuxers/DVDDemux.h"
 
 #ifdef HAS_DVD_DRIVE
 using namespace MEDIA_DETECT;
diff --git a/xbmc/addons/AddonCallbacks.h b/xbmc/addons/AddonCallbacks.h
index daa3821fc3..076fc35326 100644
--- a/xbmc/addons/AddonCallbacks.h
+++ b/xbmc/addons/AddonCallbacks.h
@@ -24,7 +24,7 @@
 #include "../../addons/library.kodi.guilib/libKODI_guilib.h"
 #include "../../addons/library.kodi.adsp/libKODI_adsp.h"
 #include "../../addons/library.kodi.audioengine/libKODI_audioengine.h"
-#include "cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h"
+#include "cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.h"
 #include "addons/include/kodi_adsp_types.h"
 #include "addons/include/kodi_audioengine_types.h"
 #include "addons/include/xbmc_pvr_types.h"
diff --git a/xbmc/addons/addon-bindings.mk b/xbmc/addons/addon-bindings.mk
index 8b67d40cf3..bac201ceb8 100644
--- a/xbmc/addons/addon-bindings.mk
+++ b/xbmc/addons/addon-bindings.mk
@@ -23,5 +23,5 @@ BINDINGS+=addons/library.kodi.audioengine/libKODI_audioengine.h
 BINDINGS+=addons/library.kodi.guilib/libKODI_guilib.h
 BINDINGS+=addons/library.xbmc.pvr/libXBMC_pvr.h
 BINDINGS+=addons/library.xbmc.codec/libXBMC_codec.h
-BINDINGS+=xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h
+BINDINGS+=xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
 BINDINGS+=xbmc/cores/AudioEngine/Utils/AEChannelData.h
diff --git a/xbmc/cores/AudioEngine/Makefile.in b/xbmc/cores/AudioEngine/Makefile.in
index 95d3ded5fd..7aab111f81 100644
--- a/xbmc/cores/AudioEngine/Makefile.in
+++ b/xbmc/cores/AudioEngine/Makefile.in
@@ -6,8 +6,8 @@ INCLUDES += -I@abs_top_srcdir@/xbmc/linux
 INCLUDES += -I@abs_top_srcdir@/xbmc/utils
 INCLUDES += -I@abs_top_srcdir@/xbmc/guilib
 INCLUDES += -I@abs_top_srcdir@/xbmc/cores
-INCLUDES += -I@abs_top_srcdir@/xbmc/cores/dvdplayer
-INCLUDES += -I@abs_top_srcdir@/xbmc/cores/dvdplayer/Codecs/ffmpeg
+INCLUDES += -I@abs_top_srcdir@/xbmc/cores/VideoPlayer
+INCLUDES += -I@abs_top_srcdir@/xbmc/cores/VideoPlayer/Codecs/ffmpeg
 
 OSSLIBDIR=0
 -include /etc/oss.conf
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.h
index 64721c9d4c..2d7091985d 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.h
+++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.h
@@ -53,13 +53,13 @@ const AudioChannelLabel g_LabelMap[] =
   kAudioChannelLabel_Right,                 // PCM_FRONT_RIGHT,
   kAudioChannelLabel_Center,                // PCM_FRONT_CENTER,
   kAudioChannelLabel_LFEScreen,             // PCM_LOW_FREQUENCY,
-  kAudioChannelLabel_LeftSurroundDirect,    // PCM_BACK_LEFT, *** This is incorrect, but has been changed to match dvdplayer
-  kAudioChannelLabel_RightSurroundDirect,   // PCM_BACK_RIGHT, *** This is incorrect, but has been changed to match dvdplayer
+  kAudioChannelLabel_LeftSurroundDirect,    // PCM_BACK_LEFT, *** This is incorrect, but has been changed to match VideoPlayer
+  kAudioChannelLabel_RightSurroundDirect,   // PCM_BACK_RIGHT, *** This is incorrect, but has been changed to match VideoPlayer
   kAudioChannelLabel_LeftCenter,            // PCM_FRONT_LEFT_OF_CENTER,
   kAudioChannelLabel_RightCenter,           // PCM_FRONT_RIGHT_OF_CENTER,
   kAudioChannelLabel_CenterSurround,        // PCM_BACK_CENTER,
-  kAudioChannelLabel_LeftSurround,          // PCM_SIDE_LEFT, *** This is incorrect, but has been changed to match dvdplayer
-  kAudioChannelLabel_RightSurround,         // PCM_SIDE_RIGHT, *** This is incorrect, but has been changed to match dvdplayer
+  kAudioChannelLabel_LeftSurround,          // PCM_SIDE_LEFT, *** This is incorrect, but has been changed to match VideoPlayer
+  kAudioChannelLabel_RightSurround,         // PCM_SIDE_RIGHT, *** This is incorrect, but has been changed to match VideoPlayer
   kAudioChannelLabel_VerticalHeightLeft,    // PCM_TOP_FRONT_LEFT,
   kAudioChannelLabel_VerticalHeightRight,   // PCM_TOP_FRONT_RIGHT,
   kAudioChannelLabel_VerticalHeightCenter,  // PCM_TOP_FRONT_CENTER,
diff --git a/xbmc/cores/DllLoader/DllLoaderContainer.cpp b/xbmc/cores/DllLoader/DllLoaderContainer.cpp
index ed5a14cdf4..eea16274b4 100644
--- a/xbmc/cores/DllLoader/DllLoaderContainer.cpp
+++ b/xbmc/cores/DllLoader/DllLoaderContainer.cpp
@@ -35,12 +35,12 @@
 
 #define ENV_PARTIAL_PATH "special://xbmcbin/system/;" \
                  "special://xbmcbin/system/players/mplayer/;" \
-                 "special://xbmcbin/system/players/dvdplayer/;" \
+                 "special://xbmcbin/system/players/VideoPlayer/;" \
                  "special://xbmcbin/system/players/paplayer/;" \
                  "special://xbmcbin/system/python/;" \
                  "special://xbmc/system/;" \
                  "special://xbmc/system/players/mplayer/;" \
-                 "special://xbmc/system/players/dvdplayer/;" \
+                 "special://xbmc/system/players/VideoPlayer/;" \
                  "special://xbmc/system/players/paplayer/;" \
                  "special://xbmc/system/python/"
 
diff --git a/xbmc/cores/DummyVideoPlayer.cpp b/xbmc/cores/DummyVideoPlayer.cpp
index 74b52a0fd7..ab372ada8c 100644
--- a/xbmc/cores/DummyVideoPlayer.cpp
+++ b/xbmc/cores/DummyVideoPlayer.cpp
@@ -200,7 +200,7 @@ float CDummyVideoPlayer::GetPercentage()
   return 0.0f;
 }
 
-//This is how much audio is delayed to video, we count the oposite in the dvdplayer
+//This is how much audio is delayed to video, we count the oposite in the VideoPlayer
 void CDummyVideoPlayer::SetAVDelay(float fValue)
 {
 }
diff --git a/xbmc/cores/dvdplayer/DVDAudio.cpp b/xbmc/cores/VideoPlayer/DVDAudio.cpp
index f420300ff0..f420300ff0 100644
--- a/xbmc/cores/dvdplayer/DVDAudio.cpp
+++ b/xbmc/cores/VideoPlayer/DVDAudio.cpp
diff --git a/xbmc/cores/dvdplayer/DVDAudio.h b/xbmc/cores/VideoPlayer/DVDAudio.h
index 16c26b2985..16c26b2985 100644
--- a/xbmc/cores/dvdplayer/DVDAudio.h
+++ b/xbmc/cores/VideoPlayer/DVDAudio.h
diff --git a/xbmc/cores/dvdplayer/DVDClock.cpp b/xbmc/cores/VideoPlayer/DVDClock.cpp
index 0ddb91d059..0ddb91d059 100644
--- a/xbmc/cores/dvdplayer/DVDClock.cpp
+++ b/xbmc/cores/VideoPlayer/DVDClock.cpp
diff --git a/xbmc/cores/dvdplayer/DVDClock.h b/xbmc/cores/VideoPlayer/DVDClock.h
index cf03af5101..cf03af5101 100644
--- a/xbmc/cores/dvdplayer/DVDClock.h
+++ b/xbmc/cores/VideoPlayer/DVDClock.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodec.h
index 5d9d424c1f..5d9d424c1f 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodec.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
index 6a417aa50b..6a417aa50b 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h
index e3427066a4..e3427066a4 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp
index 5e8ae98c9e..5e8ae98c9e 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h
index 88c31d2624..88c31d2624 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/Makefile.in
index 6446ee94cf..903011e0ca 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/Makefile.in
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/VideoPlayer
 
 CXXFLAGS+=-DHAVE_MMX
 
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp
index 273461d46d..835d62a92d 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp
@@ -20,7 +20,7 @@
 
 #include "DVDCodecUtils.h"
 #include "DVDClock.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "utils/log.h"
 #include "cores/FFmpeg.h"
 #include "Util.h"
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h
index dfa3bcfdb7..eb76a6fe73 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h
@@ -21,7 +21,7 @@
  */
 
 #include "Video/DVDVideoCodec.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFormats.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFormats.h"
 
 struct YV12Image;
 
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.h
index c59d5c1149..02af007414 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.h
@@ -26,7 +26,7 @@
 
 #include <string>
 #include <vector>
-#include "cores/dvdplayer/VideoRenderers/RenderFormats.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFormats.h"
 
 // 0x100000 is the video starting range
 
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.cpp
index 33638951e9..dab61cb159 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -25,7 +25,7 @@
 #include "Video/DVDVideoCodec.h"
 #include "Audio/DVDAudioCodec.h"
 #include "Overlay/DVDOverlayCodec.h"
-#include "cores/dvdplayer/DVDCodecs/DVDCodecs.h"
+#include "cores/VideoPlayer/DVDCodecs/DVDCodecs.h"
 
 #if defined(TARGET_DARWIN_OSX)
 #include "Video/DVDVideoCodecVDA.h"
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h
index 94df3360f0..7cdc7504b3 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h
@@ -21,8 +21,8 @@
  */
 
 #include <vector>
-#include "cores/dvdplayer/VideoRenderers/RenderFormats.h"
-#include "cores/dvdplayer/VideoRenderers/BaseRenderer.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFormats.h"
+#include "cores/VideoPlayer/VideoRenderers/BaseRenderer.h"
 
 class CDVDVideoCodec;
 class CDVDAudioCodec;
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Makefile.in b/xbmc/cores/VideoPlayer/DVDCodecs/Makefile.in
index ed183d8613..2f61f5646c 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Makefile.in
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Makefile.in
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/VideoPlayer
 
 SRCS  = DVDCodecUtils.cpp
 SRCS += DVDFactoryCodec.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlay.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlay.h
index 6d9e5473db..d06a744a18 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlay.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlay.h
@@ -94,7 +94,7 @@ public:
   bool IsOverlayType(DVDOverlayType type) { return (m_type == type); }
 
   /**
-   * return a copy to DVDPlayerSubtitle in order to have hw resources cleared
+   * return a copy to VideoPlayerSubtitle in order to have hw resources cleared
    * after rendering
    */
   virtual CDVDOverlay* Clone() { return Acquire(); }
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp
index 9b1d6aba0d..b066a5539c 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp
@@ -18,7 +18,7 @@
  *
  */
 #include "DVDOverlayCodec.h"
-#include "cores/dvdplayer/DVDClock.h"
+#include "cores/VideoPlayer/DVDClock.h"
 
 void CDVDOverlayCodec::GetAbsoluteTimes(double &starttime, double &stoptime, DemuxPacket *pkt, bool &replace, double offset/* = 0.0*/)
 {
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h
index 75806d0dd8..2c5f7e1331 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h
@@ -22,7 +22,7 @@
 
 #include "DVDOverlay.h"
 #include "PlatformDefs.h"
-#include "cores/dvdplayer/DVDDemuxers/DVDDemux.h"
+#include "cores/VideoPlayer/DVDDemuxers/DVDDemux.h"
 
 #include <string>
 
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
index dca4bdf0d1..dca4bdf0d1 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h
index f84e9a4de2..f84e9a4de2 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
index a955e9f072..a955e9f072 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.h
index 9e579d437d..9e579d437d 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp
index e8abb13260..e8abb13260 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.h
index 3bc4ad649f..3bc4ad649f 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp
index 3fb323437e..9207c1ac1a 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp
@@ -24,7 +24,7 @@
 #include "DVDStreamInfo.h"
 #include "DVDCodecs/DVDCodecs.h"
 #include "utils/log.h"
-#include "cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.h"
+#include "cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagSami.h"
 
 CDVDOverlayCodecText::CDVDOverlayCodecText() : CDVDOverlayCodec("Text Subtitle Decoder")
 {
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.h
index db0e64604c..db0e64604c 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayImage.h
index 2299afe2a2..2299afe2a2 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayImage.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySSA.h
index 0b875223d9..0b875223d9 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySSA.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySpu.h
index 111faf543e..111faf543e 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySpu.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayText.h
index 2df0be7407..2df0be7407 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayText.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/Makefile.in
index 282a6300f1..000f3efdbc 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/Makefile.in
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/VideoPlayer
 
 SRCS  = DVDOverlayCodec.cpp
 SRCS += DVDOverlayCodecFFmpeg.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/contrib/cc_decoder.c b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.c
index c207204364..c207204364 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/contrib/cc_decoder.c
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.c
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/contrib/cc_decoder.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.h
index 67a9daa362..67a9daa362 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/contrib/cc_decoder.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/contrib/cc_decoder708.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder708.cpp
index 61a3acf099..61a3acf099 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/contrib/cc_decoder708.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder708.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/contrib/cc_decoder708.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder708.h
index 0640f9f9d1..0640f9f9d1 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/contrib/cc_decoder708.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder708.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
index 3f5d7dc81c..d661ce5dab 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
@@ -23,9 +23,9 @@
 #include "AMLCodec.h"
 #include "DynamicDll.h"
 
-#include "cores/dvdplayer/DVDClock.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFlags.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/DVDClock.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "guilib/GraphicContext.h"
 #include "settings/DisplaySettings.h"
 #include "settings/MediaSettings.h"
@@ -1642,7 +1642,7 @@ bool CAMLCodec::OpenDecoder(CDVDStreamInfo &hints)
 
   m_opened = true;
   // vcodec is open, update speed if it was
-  // changed before dvdplayer called OpenDecoder.
+  // changed before VideoPlayer called OpenDecoder.
   SetSpeed(m_speed);
 
   return true;
@@ -1850,7 +1850,7 @@ bool CAMLCodec::GetPicture(DVDVideoPicture *pDvdVideoPicture)
   if (m_speed == DVD_PLAYSPEED_NORMAL)
   {
     pDvdVideoPicture->pts = GetPlayerPtsSeconds() * (double)DVD_TIME_BASE;
-    // video pts cannot be late or dvdplayer goes nuts,
+    // video pts cannot be late or VideoPlayer goes nuts,
     // so run it one frame ahead
     pDvdVideoPicture->pts += 1 * pDvdVideoPicture->iDuration;
   }
@@ -1922,7 +1922,7 @@ double CAMLCodec::GetTimeSize()
   else
     m_timesize = (double)(am_private->am_pkt.lastpts - m_cur_pts) / PTS_FREQ;
 
-  // lie to DVDPlayer, it is hardcoded to a max of 8 seconds,
+  // lie to VideoPlayer, it is hardcoded to a max of 8 seconds,
   // if you buffer more than 8 seconds, it goes nuts.
   double timesize = m_timesize;
   if (timesize < 0.0)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.h
index b25eaa2fbb..da0e3ab7a0 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.h
@@ -20,8 +20,8 @@
  */
 
 #include "DVDVideoCodec.h"
-#include "cores/dvdplayer/DVDStreamInfo.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFeatures.h"
+#include "cores/VideoPlayer/DVDStreamInfo.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFeatures.h"
 #include "guilib/Geometry.h"
 #include "rendering/RenderSystem.h"
 #include "threads/Thread.h"
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.cpp
index 2428696dbe..2428696dbe 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h
index 11f2ca3e43..b9170e99fd 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h
@@ -24,7 +24,7 @@
 
 #include <vector>
 #include <string>
-#include "cores/dvdplayer/VideoRenderers/RenderFormats.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFormats.h"
 
 
 
@@ -63,7 +63,7 @@ typedef void* EGLImageKHR;
 // should be entirely filled by all codecs
 struct DVDVideoPicture
 {
-  double pts; // timestamp in seconds, used in the CDVDPlayer class to keep track of pts
+  double pts; // timestamp in seconds, used in the CVideoPlayer class to keep track of pts
   double dts;
 
   union
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp
index 8f2e516d44..6a48254d50 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp
@@ -229,7 +229,7 @@ void CDVDVideoCodecAmlogic::Dispose(void)
 int CDVDVideoCodecAmlogic::Decode(uint8_t *pData, int iSize, double dts, double pts)
 {
   // Handle Input, add demuxer packet to input queue, we must accept it or
-  // it will be discarded as DVDPlayerVideo has no concept of "try again".
+  // it will be discarded as VideoPlayerVideo has no concept of "try again".
   if (pData)
   {
     if (m_bitstream)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h
index 9714b42634..9714b42634 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp
index 4ae4039001..140b78b4e1 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp
@@ -639,7 +639,7 @@ void CDVDVideoCodecAndroidMediaCodec::Dispose()
 int CDVDVideoCodecAndroidMediaCodec::Decode(uint8_t *pData, int iSize, double dts, double pts)
 {
   // Handle input, add demuxer packet to input queue, we must accept it or
-  // it will be discarded as DVDPlayerVideo has no concept of "try again".
+  // it will be discarded as VideoPlayerVideo has no concept of "try again".
   // we must return VC_BUFFER or VC_PICTURE, default to VC_BUFFER.
   int rtn = VC_BUFFER;
 
@@ -738,11 +738,11 @@ int CDVDVideoCodecAndroidMediaCodec::Decode(uint8_t *pData, int iSize, double dt
         }
       }
 
-      // Translate from dvdplayer dts/pts to MediaCodec pts,
+      // Translate from VideoPlayer dts/pts to MediaCodec pts,
       // pts WILL get re-ordered by MediaCodec if needed.
       // Do not try to pass pts as a unioned double/int64_t,
       // some android devices will diddle with presentationTimeUs
-      // and you will get NaN back and DVDPlayerVideo will barf.
+      // and you will get NaN back and VideoPlayerVideo will barf.
       int64_t presentationTimeUs = 0;
       if (pts != DVD_NOPTS_VALUE)
         presentationTimeUs = pts;
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h
index c320a84495..c320a84495 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
index 9cf4c0a691..2909db5cf8 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
@@ -44,8 +44,8 @@
 #define RINT lrint
 #endif
 
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFormats.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFormats.h"
 
 #ifdef HAVE_LIBVDPAU
 #include "VDPAU.h"
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
index 6906e795ce..15829cf692 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
@@ -20,8 +20,8 @@
  *
  */
 
-#include "cores/dvdplayer/DVDCodecs/DVDCodecs.h"
-#include "cores/dvdplayer/DVDStreamInfo.h"
+#include "cores/VideoPlayer/DVDCodecs/DVDCodecs.h"
+#include "cores/VideoPlayer/DVDStreamInfo.h"
 #include "DVDVideoCodec.h"
 #include "DVDResource.h"
 #include <string>
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp
index c4258145ae..c4258145ae 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h
index 8a39dd8e91..8a39dd8e91 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp
index 25e55cf50a..25e55cf50a 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.h
index 62a3d12af2..62a3d12af2 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp
index 2f955d1450..2f955d1450 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecOpenMax.h
index 34a1b222bb..34a1b222bb 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecOpenMax.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp
index 8a23753fef..8a23753fef 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecStageFright.h
index 5289651817..5289651817 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecStageFright.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
index 858e0754c2..ee1339f95d 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
@@ -30,7 +30,7 @@ extern "C" {
 
 #include "DVDClock.h"
 #include "DVDStreamInfo.h"
-#include "cores/dvdplayer/DVDCodecs/DVDCodecUtils.h"
+#include "cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h"
 #include "cores/FFmpeg.h"
 #include "osx/CocoaInterface.h"
 #include "osx/DarwinUtils.h"
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecVDA.h
index eb9975ed80..eb9975ed80 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecVDA.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp
index f0802b30e0..f0802b30e0 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.h
index 5e9a9465ad..5e9a9465ad 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp
index 4fe863f980..4fe863f980 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoPPFFmpeg.h
index 0ba6fd31aa..0ba6fd31aa 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoPPFFmpeg.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp
index 5259ef15e0..7cf39ea523 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp
@@ -29,7 +29,7 @@
 #include <d3d11.h>
 #include <Initguid.h>
 #include <windows.h>
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "../DVDCodecUtils.h"
 #include "DXVA.h"
 #include "settings/AdvancedSettings.h"
@@ -1031,7 +1031,7 @@ int CDecoder::Check(AVCodecContext* avctx)
   CSingleLock lock(m_section);
 
   // we may not have a hw decoder on systems (AMD HD2xxx, HD3xxx) which are only capable
-  // of opening a single decoder and DVDPlayer opened a new stream without having flushed
+  // of opening a single decoder and VideoPlayer opened a new stream without having flushed
   // current one.
   if (!m_decoder)
     return VC_BUFFER;
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.h
index b6f42c4450..b6f42c4450 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DllLibMpeg2.h
index 763fc93c8e..763fc93c8e 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DllLibMpeg2.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibStageFrightCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DllLibStageFrightCodec.h
index 35cb16aa6c..35cb16aa6c 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibStageFrightCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DllLibStageFrightCodec.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
index 8a3981febf..9e3ed584fe 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
@@ -29,7 +29,7 @@
 #include "DVDClock.h"
 #include "DVDStreamInfo.h"
 #include "windowing/WindowingFactory.h"
-#include "cores/dvdplayer/DVDCodecs/DVDCodecs.h"
+#include "cores/VideoPlayer/DVDCodecs/DVDCodecs.h"
 #include "DVDVideoCodec.h"
 #include "utils/log.h"
 #include "utils/TimeUtils.h"
@@ -39,9 +39,9 @@
 #include "Application.h"
 #include "threads/Atomics.h"
 #include "guilib/GUIWindowManager.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFlags.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "settings/DisplaySettings.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "settings/AdvancedSettings.h"
 
 #include "linux/RBP.h"
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h
index 6bb28dca51..a1fa70e1e6 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h
@@ -28,7 +28,7 @@
 #include <interface/mmal/util/mmal_connection.h>
 #include <interface/mmal/mmal_parameters.h>
 
-#include "cores/dvdplayer/DVDStreamInfo.h"
+#include "cores/VideoPlayer/DVDStreamInfo.h"
 #include "DVDVideoCodec.h"
 #include "threads/Event.h"
 #include "xbmc/settings/VideoSettings.h"
@@ -39,7 +39,7 @@
 #include <string>
 #include "guilib/Geometry.h"
 #include "rendering/RenderSystem.h"
-#include "cores/dvdplayer/VideoRenderers/BaseRenderer.h"
+#include "cores/VideoPlayer/VideoRenderers/BaseRenderer.h"
 
 class CMMALVideo;
 
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in b/xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile.in
index 56ec6a36d4..b05184022d 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile.in
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/VideoPlayer
 
 SRCS  = DVDVideoCodec.cpp
 SRCS += DVDVideoCodecFFmpeg.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMax.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMax.cpp
index ade2990738..ade2990738 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMax.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMax.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMax.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMax.h
index b9eb7e2806..a659191876 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMax.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMax.h
@@ -21,7 +21,7 @@
 
 #if defined(HAVE_LIBOPENMAX)
 
-#include "cores/dvdplayer/DVDStreamInfo.h"
+#include "cores/VideoPlayer/DVDStreamInfo.h"
 #include "DVDVideoCodec.h"
 #include "threads/Event.h"
 
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.cpp
index 87d97afd8f..87d97afd8f 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.h
index a235a015b4..a235a015b4 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
index a7e5144ad3..7f608d80fa 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
@@ -22,8 +22,8 @@
 #include "VAAPI.h"
 #include "windowing/WindowingFactory.h"
 #include "DVDVideoCodec.h"
-#include "cores/dvdplayer/DVDCodecs/DVDCodecUtils.h"
-#include "cores/dvdplayer/DVDClock.h"
+#include "cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h"
+#include "cores/VideoPlayer/DVDClock.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "threads/SingleLock.h"
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
index c1227179fa..c1227179fa 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDA.cpp
index e24bbce705..e24bbce705 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDA.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDA.h
index 8311d72914..8311d72914 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDA.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp
index a642e6b78f..f461a18c7e 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp
@@ -25,7 +25,7 @@
 #include "windowing/WindowingFactory.h"
 #include "guilib/GraphicContext.h"
 #include "guilib/TextureManager.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "DVDVideoCodecFFmpeg.h"
 #include "DVDClock.h"
 #include "settings/Settings.h"
@@ -35,7 +35,7 @@
 #include "utils/MathUtils.h"
 #include "utils/TimeUtils.h"
 #include "DVDCodecs/DVDCodecUtils.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFlags.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "utils/log.h"
 
 using namespace Actor;
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h
index 8c17dacd96..8c17dacd96 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libmpeg2/mpeg2.h
index aff0c33f20..aff0c33f20 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libmpeg2/mpeg2.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2convert.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libmpeg2/mpeg2convert.h
index 108dee8f2a..108dee8f2a 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2convert.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libmpeg2/mpeg2convert.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile.in b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/Makefile.in
index 29ee0808ab..4f2d6386e0 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile.in
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/Makefile.in
@@ -1,6 +1,6 @@
 ARCH=@ARCH@
 
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/VideoPlayer
 INCLUDES+=-I..
 
 SRCS += StageFrightInterface.cpp
@@ -14,7 +14,7 @@ INCLUDES += -I${prefix}/opt/android-source/system/core/include
 INCLUDES += -I${prefix}/opt/android-source/libhardware/include
 
 LIBNAME=libXBMCvcodec_stagefrightICS
-LIB_SHARED=@abs_top_srcdir@/system/players/dvdplayer/$(LIBNAME)-$(ARCH).so
+LIB_SHARED=@abs_top_srcdir@/system/players/VideoPlayer/$(LIBNAME)-$(ARCH).so
 
 LIBS += -landroid -lEGL -lGLESv2 -L${prefix}/opt/android-libs -lstdc++ -lutils -lcutils -lstagefright -lbinder -lui -lgui -L@abs_top_srcdir@ -l@APP_NAME_LC@
 
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.cpp
index d10a3786ab..d10a3786ab 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.h
index 9b0def2244..9b0def2244 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.h
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp
index b80637fb66..b80637fb66 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.h
index 44f070e6c4..7abfc29239 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.h
@@ -21,7 +21,7 @@
 
 #if defined(HAS_LIBSTAGEFRIGHT)
 
-#include "cores/dvdplayer/DVDStreamInfo.h"
+#include "cores/VideoPlayer/DVDStreamInfo.h"
 #include "DVDVideoCodec.h"
 
 namespace KODI
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp
index f0a03a8cec..f0a03a8cec 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h
index 8d2342aea6..3c53735bff 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h
@@ -22,7 +22,7 @@
 
 #include "threads/Thread.h"
 #include "xbmc/guilib/FrameBufferObject.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFormats.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFormats.h"
 
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
diff --git a/xbmc/cores/dvdplayer/DVDDemuxSPU.cpp b/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp
index b0a67252b2..05968b1b08 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxSPU.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp
@@ -60,7 +60,7 @@ void CDVDDemuxSPU::Reset()
   // We can't reset this during playback, cause we don't always
   // get a new clut from libdvdnav leading to invalid colors
   // so let's just never reset it. It will only be reset
-  // when dvdplayer is destructed and constructed
+  // when VideoPlayer is destructed and constructed
   // m_bHasClut = false;
   // memset(m_clut, 0, sizeof(m_clut));
 }
@@ -208,7 +208,7 @@ CDVDOverlaySpu* CDVDDemuxSPU::ParsePacket(SPUData* pSPUData)
         pSPUInfo->iPTSStartTime = pSPUData->pts;
         pSPUInfo->iPTSStopTime = 0x9000000000000LL;
         pSPUInfo->bForced = true;
-        // delay is always 0, the dvdplayer should decide when to display the packet (menu highlight)
+        // delay is always 0, the VideoPlayer should decide when to display the packet (menu highlight)
         break;
       case STA_DSP:
         {
diff --git a/xbmc/cores/dvdplayer/DVDDemuxSPU.h b/xbmc/cores/VideoPlayer/DVDDemuxSPU.h
index 1fc90d7d12..1fc90d7d12 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxSPU.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxSPU.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp
index 0b687e3333..0b687e3333 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h
index e380056d5a..e380056d5a 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.cpp
index 0131ce9c73..0131ce9c73 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.cpp
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.h
index bdb65b4134..bdb65b4134 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCC.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.cpp
index b04a1f8bd6..1bd9e22e39 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCC.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.cpp
@@ -21,7 +21,7 @@
 #include "DVDDemuxUtils.h"
 #include "DVDClock.h"
 #include "DVDDemuxCC.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/contrib/cc_decoder708.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/contrib/cc_decoder708.h"
 
 #include <algorithm>
 
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCC.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.h
index ae78298c45..ae78298c45 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCC.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.cpp
index 05318cd214..05318cd214 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.cpp
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.h
index 8682d99c43..8682d99c43 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
index 88d486befa..b336c201fd 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -324,7 +324,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein
         // the advancedsetting is for allowing the user to force outputting the
         // 44.1 kHz DTS wav file as PCM, so that an A/V receiver can decode
         // it (this is temporary until we handle 44.1 kHz passthrough properly)
-        if (trySPDIFonly || (iformat && strcmp(iformat->name, "wav") == 0 && !g_advancedSettings.m_dvdplayerIgnoreDTSinWAV))
+        if (trySPDIFonly || (iformat && strcmp(iformat->name, "wav") == 0 && !g_advancedSettings.m_VideoPlayerIgnoreDTSinWAV))
         {
           // check for spdif and dts
           // This is used with wav files and audio CDs that may contain
@@ -678,7 +678,7 @@ double CDVDDemuxFFmpeg::ConvertTimestamp(int64_t pts, int den, int num)
 DemuxPacket* CDVDDemuxFFmpeg::Read()
 {
   DemuxPacket* pPacket = NULL;
-  // on some cases where the received packet is invalid we will need to return an empty packet (0 length) otherwise the main loop (in CDVDPlayer)
+  // on some cases where the received packet is invalid we will need to return an empty packet (0 length) otherwise the main loop (in CVideoPlayer)
   // would consider this the end of stream and stop.
   bool bReturnEmpty = false;
   { CSingleLock lock(m_critSection); // open lock scope
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h
index 12398c7dcb..12398c7dcb 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPVRClient.cpp
index f5319dc853..f5319dc853 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPVRClient.cpp
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPVRClient.h
index 2fc3c6309c..2fc3c6309c 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPVRClient.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
index d64fbb3c26..d64fbb3c26 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxShoutcast.cpp
index 3adf742865..3adf742865 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxShoutcast.cpp
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxShoutcast.h
index a802167c07..a802167c07 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxShoutcast.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp
index ab298b205d..ab298b205d 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.h
index 2c12df3980..2c12df3980 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp
index e974193ef0..e974193ef0 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.h
index 4b24160073..4b24160073 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.cpp
index feed543617..feed543617 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.cpp
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.h
index 8281d28f63..8281d28f63 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.h
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/Makefile.in b/xbmc/cores/VideoPlayer/DVDDemuxers/Makefile.in
index 6283d6fca4..6a84a5b9dd 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/Makefile.in
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/Makefile.in
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/VideoPlayer
 
 SRCS  = DVDDemux.cpp
 SRCS += DVDDemuxBXA.cpp
diff --git a/xbmc/cores/dvdplayer/DVDFileInfo.cpp b/xbmc/cores/VideoPlayer/DVDFileInfo.cpp
index 83d78a2bfb..83d78a2bfb 100644
--- a/xbmc/cores/dvdplayer/DVDFileInfo.cpp
+++ b/xbmc/cores/VideoPlayer/DVDFileInfo.cpp
diff --git a/xbmc/cores/dvdplayer/DVDFileInfo.h b/xbmc/cores/VideoPlayer/DVDFileInfo.h
index 1afecaf65a..1afecaf65a 100644
--- a/xbmc/cores/dvdplayer/DVDFileInfo.h
+++ b/xbmc/cores/VideoPlayer/DVDFileInfo.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.cpp
index 017c05b6a5..f239402939 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.cpp
@@ -39,7 +39,7 @@
 #include "utils/URIUtils.h"
 
 
-CDVDInputStream* CDVDFactoryInputStream::CreateInputStream(IDVDPlayer* pPlayer, const std::string& file, const std::string& content, bool contentlookup)
+CDVDInputStream* CDVDFactoryInputStream::CreateInputStream(IVideoPlayer* pPlayer, const std::string& file, const std::string& content, bool contentlookup)
 {
   CFileItem item(file.c_str(), false);
 
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.h
index 0569995f3f..f68a8d1c4f 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.h
@@ -23,10 +23,10 @@
 #include <string>
 
 class CDVDInputStream;
-class IDVDPlayer;
+class IVideoPlayer;
 
 class CDVDFactoryInputStream
 {
 public:
-  static CDVDInputStream* CreateInputStream(IDVDPlayer* pPlayer, const std::string& file, const std::string& content, bool contentlookup = true);
+  static CDVDInputStream* CreateInputStream(IVideoPlayer* pPlayer, const std::string& file, const std::string& content, bool contentlookup = true);
 };
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.cpp
index f5ee38972b..f5ee38972b 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.cpp
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h
index 08375c50bc..08375c50bc 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
index eb04673500..6854e311e8 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
@@ -23,7 +23,7 @@
 #include <functional>
 
 #include "DVDInputStreamBluray.h"
-#include "IDVDPlayer.h"
+#include "IVideoPlayer.h"
 #include "DVDCodecs/Overlay/DVDOverlay.h"
 #include "DVDCodecs/Overlay/DVDOverlayImage.h"
 #include "settings/Settings.h"
@@ -183,7 +183,7 @@ void  bluray_overlay_argb_cb(void *this_gen, const struct bd_argb_overlay_s * co
 }
 #endif
 
-CDVDInputStreamBluray::CDVDInputStreamBluray(IDVDPlayer* player) :
+CDVDInputStreamBluray::CDVDInputStreamBluray(IVideoPlayer* player) :
   CDVDInputStream(DVDSTREAM_TYPE_BLURAY)
 {
   m_title = NULL;
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h
index b41f64cabb..be8c428576 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h
@@ -37,7 +37,7 @@ extern "C"
 
 class CDVDOverlayImage;
 class DllLibbluray;
-class IDVDPlayer;
+class IVideoPlayer;
 
 class CDVDInputStreamBluray 
   : public CDVDInputStream
@@ -47,7 +47,7 @@ class CDVDInputStreamBluray
   , public CDVDInputStream::IMenus
 {
 public:
-  CDVDInputStreamBluray(IDVDPlayer* player);
+  CDVDInputStreamBluray(IVideoPlayer* player);
   virtual ~CDVDInputStreamBluray();
   virtual bool Open(const char* strFile, const std::string &content, bool contentLookup);
   virtual void Close();
@@ -126,7 +126,7 @@ protected:
   static void OverlayClear(SPlane& plane, int x, int y, int w, int h);
   static void OverlayInit (SPlane& plane, int w, int h);
 
-  IDVDPlayer*         m_player;
+  IVideoPlayer*         m_player;
   DllLibbluray*       m_dll;
   BLURAY*             m_bd;
   BLURAY_TITLE_INFO*  m_title;
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
index 4dbb1c6d33..4dbb1c6d33 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.h
index 0bd2792b5d..0bd2792b5d 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp
index be07423506..be07423506 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.h
index a44fe8f9e8..a44fe8f9e8 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamHttp.cpp
index 5165859be6..5165859be6 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamHttp.cpp
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamHttp.h
index ce623e7769..ce623e7769 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamHttp.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamMemory.cpp
index 6cf84bc090..6cf84bc090 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamMemory.cpp
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamMemory.h
index 4c4dc5755b..4c4dc5755b 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamMemory.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
index e20d1db0b2..91af414ede 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
@@ -38,10 +38,10 @@
 #define HOLDMODE_SKIP 2 /* set by inputstream user, when they wish to skip the held mode */
 #define HOLDMODE_DATA 3 /* set after hold mode has been exited, and action that inited it has been executed */
 
-CDVDInputStreamNavigator::CDVDInputStreamNavigator(IDVDPlayer* player) : CDVDInputStream(DVDSTREAM_TYPE_DVD)
+CDVDInputStreamNavigator::CDVDInputStreamNavigator(IVideoPlayer* player) : CDVDInputStream(DVDSTREAM_TYPE_DVD)
 {
   m_dvdnav = 0;
-  m_pDVDPlayer = player;
+  m_pVideoPlayer = player;
   m_bCheckButtons = false;
   m_iCellStart = 0;
   m_iVobUnitStart = 0LL;
@@ -252,7 +252,7 @@ int CDVDInputStreamNavigator::Read(uint8_t* buf, int buf_size)
       {
         m_bEOF = true;
         CLog::Log(LOGERROR,"CDVDInputStreamNavigator: Stopping playback due to infinite loop, caused by badly authored DVD navigation structure. Try enabling 'Attempt to skip introduction before DVD menu'.");
-        m_pDVDPlayer->OnDVDNavResult(NULL, DVDNAV_STOP);
+        m_pVideoPlayer->OnDVDNavResult(NULL, DVDNAV_STOP);
         return -1; // fail and stop playback.
       }
     }
@@ -325,7 +325,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read)
         // A length of 0xff means an indefinite still which has to be skipped
         // indirectly by some user interaction.
         m_holdmode = HOLDMODE_NONE;
-        iNavresult = m_pDVDPlayer->OnDVDNavResult(buf, DVDNAV_STILL_FRAME);
+        iNavresult = m_pVideoPlayer->OnDVDNavResult(buf, DVDNAV_STILL_FRAME);
 
         /* if user didn't care for action, just skip it */
         if(iNavresult == NAVRESULT_NOP)
@@ -348,7 +348,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read)
           iNavresult = NAVRESULT_HOLD;
         }
         else
-          iNavresult = m_pDVDPlayer->OnDVDNavResult(buf, DVDNAV_WAIT);
+          iNavresult = m_pVideoPlayer->OnDVDNavResult(buf, DVDNAV_WAIT);
 
         /* if user didn't care for action, just skip it */
         if(iNavresult == NAVRESULT_NOP)
@@ -360,7 +360,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read)
       // Player applications should pass the new colour lookup table to their
       // SPU decoder. The CLUT is given as 16 uint32_t's in the buffer.
       {
-        iNavresult = m_pDVDPlayer->OnDVDNavResult(buf, DVDNAV_SPU_CLUT_CHANGE);
+        iNavresult = m_pVideoPlayer->OnDVDNavResult(buf, DVDNAV_SPU_CLUT_CHANGE);
       }
       break;
 
@@ -387,7 +387,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read)
           SetActiveSubtitleStream(0);
         }
         m_bCheckButtons = true;
-        iNavresult = m_pDVDPlayer->OnDVDNavResult(buf, DVDNAV_SPU_STREAM_CHANGE);
+        iNavresult = m_pVideoPlayer->OnDVDNavResult(buf, DVDNAV_SPU_STREAM_CHANGE);
       }
       break;
 
@@ -413,14 +413,14 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read)
           SetActiveAudioStream(0);
         }
 
-        iNavresult = m_pDVDPlayer->OnDVDNavResult(buf, DVDNAV_AUDIO_STREAM_CHANGE);
+        iNavresult = m_pVideoPlayer->OnDVDNavResult(buf, DVDNAV_AUDIO_STREAM_CHANGE);
       }
 
       break;
 
     case DVDNAV_HIGHLIGHT:
       {
-        iNavresult = m_pDVDPlayer->OnDVDNavResult(buf, DVDNAV_HIGHLIGHT);
+        iNavresult = m_pVideoPlayer->OnDVDNavResult(buf, DVDNAV_HIGHLIGHT);
       }
       break;
 
@@ -439,7 +439,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read)
         else
         {
           m_bInMenu   = (0 == m_dll.dvdnav_is_domain_vts(m_dvdnav));
-          iNavresult = m_pDVDPlayer->OnDVDNavResult(buf, DVDNAV_VTS_CHANGE);
+          iNavresult = m_pVideoPlayer->OnDVDNavResult(buf, DVDNAV_VTS_CHANGE);
         }
       }
       break;
@@ -502,7 +502,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read)
         m_iTime      = (int) (m_iCellStart / 90);
         m_iTotalTime = (int) (cell_change_event->pgc_length / 90);
 
-        iNavresult = m_pDVDPlayer->OnDVDNavResult(buf, DVDNAV_CELL_CHANGE);
+        iNavresult = m_pVideoPlayer->OnDVDNavResult(buf, DVDNAV_CELL_CHANGE);
       }
       break;
 
@@ -564,7 +564,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read)
           m_bCheckButtons = false;
         }
 
-        iNavresult = m_pDVDPlayer->OnDVDNavResult((void*)pci, DVDNAV_NAV_PACKET);
+        iNavresult = m_pVideoPlayer->OnDVDNavResult((void*)pci, DVDNAV_NAV_PACKET);
       }
       break;
 
@@ -572,7 +572,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read)
       // This event is issued whenever a non-seamless operation has been executed.
       // Applications with fifos should drop the fifos content to speed up responsiveness.
       {
-        iNavresult = m_pDVDPlayer->OnDVDNavResult(NULL, DVDNAV_HOP_CHANNEL);
+        iNavresult = m_pVideoPlayer->OnDVDNavResult(NULL, DVDNAV_HOP_CHANNEL);
       }
       break;
 
@@ -584,7 +584,7 @@ int CDVDInputStreamNavigator::ProcessBlock(uint8_t* dest_buffer, int* read)
         // the disc. reading further results in a crash
         m_bEOF = true;
 
-        m_pDVDPlayer->OnDVDNavResult(NULL, DVDNAV_STOP);
+        m_pVideoPlayer->OnDVDNavResult(NULL, DVDNAV_STOP);
         iNavresult = NAVRESULT_ERROR;
       }
       break;
@@ -1165,7 +1165,7 @@ bool CDVDInputStreamNavigator::SeekChapter(int iChapter)
   if (!m_dvdnav)
     return false;
 
-  // cannot allow to return true in case of buttons (overlays) because otherwise back in DVDPlayer FlushBuffers will remove menu overlays
+  // cannot allow to return true in case of buttons (overlays) because otherwise back in VideoPlayer FlushBuffers will remove menu overlays
   // therefore we just skip the request in case there are buttons and return false
   if (IsInMenu() && GetTotalButtons() > 0)
   {
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.h
index 42cd92f5fc..42a3bae068 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.h
@@ -21,7 +21,7 @@
  */
 
 #include "DVDInputStream.h"
-#include "../IDVDPlayer.h"
+#include "../IVideoPlayer.h"
 #include "../DVDCodecs/Overlay/DVDOverlaySpu.h"
 #include <string>
 #include "guilib/Geometry.h"
@@ -74,7 +74,7 @@ class CDVDInputStreamNavigator
   , public CDVDInputStream::IMenus
 {
 public:
-  CDVDInputStreamNavigator(IDVDPlayer* player);
+  CDVDInputStreamNavigator(IVideoPlayer* player);
   virtual ~CDVDInputStreamNavigator();
 
   virtual bool Open(const char* strFile, const std::string& content, bool contentLookup);
@@ -190,7 +190,7 @@ protected:
 
   struct dvdnav_s* m_dvdnav;
 
-  IDVDPlayer* m_pDVDPlayer;
+  IVideoPlayer* m_pVideoPlayer;
 
   uint8_t m_lastblock[DVD_VIDEO_BLOCKSIZE];
   int     m_lastevent;
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
index c4b839b37b..fb36fcea46 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
@@ -38,7 +38,7 @@ using namespace PVR;
  * Description: Class constructor, initialize member variables
  *              public class is CDVDInputStream
  */
-CDVDInputStreamPVRManager::CDVDInputStreamPVRManager(IDVDPlayer* pPlayer) : CDVDInputStream(DVDSTREAM_TYPE_PVRMANAGER)
+CDVDInputStreamPVRManager::CDVDInputStreamPVRManager(IVideoPlayer* pPlayer) : CDVDInputStream(DVDSTREAM_TYPE_PVRMANAGER)
 {
   m_pPlayer         = pPlayer;
   m_pFile           = NULL;
@@ -97,7 +97,7 @@ bool CDVDInputStreamPVRManager::Open(const char* strFile, const std::string& con
 
   /*
    * Translate the "pvr://....." entry.
-   * The PVR Client can use http or whatever else is supported by DVDPlayer.
+   * The PVR Client can use http or whatever else is supported by VideoPlayer.
    * to access streams.
    * If after translation the file protocol is still "pvr://" use this class
    * to read the stream data over the CPVRFile class and the PVR Library itself.
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.h
index a3a37c9b9b..e0455b3e93 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.h
@@ -34,7 +34,7 @@ class ILiveTVInterface;
 class IRecordable;
 }
 
-class IDVDPlayer;
+class IVideoPlayer;
 
 class CDVDInputStreamPVRManager
   : public CDVDInputStream
@@ -43,7 +43,7 @@ class CDVDInputStreamPVRManager
   , public CDVDInputStream::ISeekable
 {
 public:
-  CDVDInputStreamPVRManager(IDVDPlayer* pPlayer);
+  CDVDInputStreamPVRManager(IVideoPlayer* pPlayer);
   virtual ~CDVDInputStreamPVRManager();
   virtual bool Open(const char* strFile, const std::string &content, bool contentLookup);
   virtual void Close();
@@ -78,7 +78,7 @@ public:
 
   /*! \brief Get the input format from the Backend
    If it is empty ffmpeg scanning the stream to find the right input format.
-   See "xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/allformats.c" for a
+   See "xbmc/cores/VideoPlayer/Codecs/ffmpeg/libavformat/allformats.c" for a
    list of the input formats.
    \return The name of the input format
    */
@@ -92,7 +92,7 @@ protected:
   bool CloseAndOpen(const char* strFile);
   static bool SupportsChannelSwitch(void);
 
-  IDVDPlayer*               m_pPlayer;
+  IVideoPlayer*               m_pPlayer;
   CDVDInputStream*          m_pOtherStream;
   XFILE::IFile*             m_pFile;
   XFILE::ILiveTVInterface*  m_pLiveTV;
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamRTMP.cpp
index d44f13cffb..d44f13cffb 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamRTMP.cpp
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamRTMP.h
index 6f2e590b4a..6f2e590b4a 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamRTMP.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.cpp
index 3e3f0097b7..3e3f0097b7 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.cpp
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.h
index 1bcb861b41..1bcb861b41 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.cpp
index 70cf7af45a..70cf7af45a 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.cpp
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.h
index ec9c73240a..ec9c73240a 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DllDvdNav.h
index dcbf829cd8..dcbf829cd8 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DllDvdNav.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DllLibRTMP.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DllLibRTMP.h
index ac5813293f..ac5813293f 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DllLibRTMP.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DllLibRTMP.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/Makefile b/xbmc/cores/VideoPlayer/DVDInputStreams/Makefile
index e33537d002..e33537d002 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/Makefile
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/Makefile
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/config.h
index 821cd57193..821cd57193 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/config.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/decoder.h
index 5faa3395c9..5faa3395c9 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/decoder.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h
index c702a15bb9..c702a15bb9 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_types.h
index 145059032e..145059032e 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_types.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav.h
index ea3bce0ee6..ea3bce0ee6 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h
index f32edc6bee..f32edc6bee 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h
index 558e2bdf3c..558e2bdf3c 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h
index f82459e520..f82459e520 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h
index d973f5158d..d973f5158d 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/remap.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/remap.h
index cb78c37969..cb78c37969 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/remap.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/remap.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h
index b3e4715a49..b3e4715a49 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vmcmd.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vmcmd.h
index 74d513d03f..74d513d03f 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vmcmd.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vmcmd.h
diff --git a/xbmc/cores/dvdplayer/DVDMessage.cpp b/xbmc/cores/VideoPlayer/DVDMessage.cpp
index ae745c6a50..ae745c6a50 100644
--- a/xbmc/cores/dvdplayer/DVDMessage.cpp
+++ b/xbmc/cores/VideoPlayer/DVDMessage.cpp
diff --git a/xbmc/cores/dvdplayer/DVDMessage.h b/xbmc/cores/VideoPlayer/DVDMessage.h
index 7dc8589829..3bc44f0c8b 100644
--- a/xbmc/cores/dvdplayer/DVDMessage.h
+++ b/xbmc/cores/VideoPlayer/DVDMessage.h
@@ -55,12 +55,12 @@ public:
     GENERAL_EOF,                    // eof of stream
 
 
-    // player core related messages (cdvdplayer.cpp)
+    // player core related messages (cVideoPlayer.cpp)
 
     PLAYER_SET_AUDIOSTREAM,         //
     PLAYER_SET_SUBTITLESTREAM,      //
     PLAYER_SET_SUBTITLESTREAM_VISIBLE, //
-    PLAYER_SET_STATE,               // restore the dvdplayer to a certain state
+    PLAYER_SET_STATE,               // restore the VideoPlayer to a certain state
     PLAYER_SET_RECORD,              // set record state
     PLAYER_SEEK,                    //
     PLAYER_SEEK_CHAPTER,            //
diff --git a/xbmc/cores/dvdplayer/DVDMessageQueue.cpp b/xbmc/cores/VideoPlayer/DVDMessageQueue.cpp
index b2239e9309..b2239e9309 100644
--- a/xbmc/cores/dvdplayer/DVDMessageQueue.cpp
+++ b/xbmc/cores/VideoPlayer/DVDMessageQueue.cpp
diff --git a/xbmc/cores/dvdplayer/DVDMessageQueue.h b/xbmc/cores/VideoPlayer/DVDMessageQueue.h
index 6c6ba5034e..6c6ba5034e 100644
--- a/xbmc/cores/dvdplayer/DVDMessageQueue.h
+++ b/xbmc/cores/VideoPlayer/DVDMessageQueue.h
diff --git a/xbmc/cores/dvdplayer/DVDOverlayContainer.cpp b/xbmc/cores/VideoPlayer/DVDOverlayContainer.cpp
index 46dced4ef3..46dced4ef3 100644
--- a/xbmc/cores/dvdplayer/DVDOverlayContainer.cpp
+++ b/xbmc/cores/VideoPlayer/DVDOverlayContainer.cpp
diff --git a/xbmc/cores/dvdplayer/DVDOverlayContainer.h b/xbmc/cores/VideoPlayer/DVDOverlayContainer.h
index 243baaf627..243baaf627 100644
--- a/xbmc/cores/dvdplayer/DVDOverlayContainer.h
+++ b/xbmc/cores/VideoPlayer/DVDOverlayContainer.h
diff --git a/xbmc/cores/dvdplayer/DVDResource.h b/xbmc/cores/VideoPlayer/DVDResource.h
index 0032855097..0032855097 100644
--- a/xbmc/cores/dvdplayer/DVDResource.h
+++ b/xbmc/cores/VideoPlayer/DVDResource.h
diff --git a/xbmc/cores/dvdplayer/DVDStreamInfo.cpp b/xbmc/cores/VideoPlayer/DVDStreamInfo.cpp
index fa0defa66b..fa0defa66b 100644
--- a/xbmc/cores/dvdplayer/DVDStreamInfo.cpp
+++ b/xbmc/cores/VideoPlayer/DVDStreamInfo.cpp
diff --git a/xbmc/cores/dvdplayer/DVDStreamInfo.h b/xbmc/cores/VideoPlayer/DVDStreamInfo.h
index c0e22a2330..c0e22a2330 100644
--- a/xbmc/cores/dvdplayer/DVDStreamInfo.h
+++ b/xbmc/cores/VideoPlayer/DVDStreamInfo.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDFactorySubtitle.cpp
index 61ca3695e7..61ca3695e7 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDFactorySubtitle.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDFactorySubtitle.h
index 656f6be3e3..656f6be3e3 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDFactorySubtitle.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleLineCollection.cpp
index 40bbe09d66..40bbe09d66 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleLineCollection.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleLineCollection.h
index ec78482d3d..ec78482d3d 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleLineCollection.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParser.h
index 6cc686ff25..6cc686ff25 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParser.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMPL2.cpp
index 909e0fa9af..909e0fa9af 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMPL2.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMPL2.h
index 8ba234a37d..8ba234a37d 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMPL2.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp
index 9427cf76f8..9427cf76f8 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h
index 5ead065ccc..5ead065ccc 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSSA.cpp
index 849e6ef51d..849e6ef51d 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSSA.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSSA.h
index 52dfd3a439..52dfd3a439 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSSA.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSami.cpp
index c77cd1e7a0..c77cd1e7a0 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSami.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSami.h
index da5653a3ca..da5653a3ca 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSami.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp
index cc789c7b60..cc789c7b60 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSubrip.h
index 3bc54affe5..3bc54affe5 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSubrip.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserVplayer.cpp
index 19c4c1404b..19c4c1404b 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserVplayer.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserVplayer.h
index 150e44821a..150e44821a 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserVplayer.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.cpp
index 0f33c09f43..0f33c09f43 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.h
index a59bcadf1c..a59bcadf1c 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp
index 5c4b773ff8..5c4b773ff8 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagMicroDVD.h
index 689ed790dd..689ed790dd 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagMicroDVD.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagSami.cpp
index 326f0eb32f..326f0eb32f 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagSami.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagSami.h
index 05c434257f..05c434257f 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagSami.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp
index 0f5e1ace4c..0f5e1ace4c 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.h
index b9129928ad..b9129928ad 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h
index f9de4f15e7..f9de4f15e7 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/Makefile.in b/xbmc/cores/VideoPlayer/DVDSubtitles/Makefile.in
index 7fc91aabf1..9b27337a67 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/Makefile.in
+++ b/xbmc/cores/VideoPlayer/DVDSubtitles/Makefile.in
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/VideoPlayer
 
 SRCS  = DVDFactorySubtitle.cpp
 SRCS += DVDSubtitleLineCollection.cpp
diff --git a/xbmc/cores/dvdplayer/DVDTSCorrection.cpp b/xbmc/cores/VideoPlayer/DVDTSCorrection.cpp
index 43c052c051..43c052c051 100644
--- a/xbmc/cores/dvdplayer/DVDTSCorrection.cpp
+++ b/xbmc/cores/VideoPlayer/DVDTSCorrection.cpp
diff --git a/xbmc/cores/dvdplayer/DVDTSCorrection.h b/xbmc/cores/VideoPlayer/DVDTSCorrection.h
index 7f6376dad0..0ff555b112 100644
--- a/xbmc/cores/dvdplayer/DVDTSCorrection.h
+++ b/xbmc/cores/VideoPlayer/DVDTSCorrection.h
@@ -68,7 +68,7 @@ class CPullupCorrection
     int m_patternpos;              //the position of the pattern in the ringbuffer, moves one to the past each time a pts is added
     double m_ptscorrection;        //the correction needed for the last added pts
     double m_trackingpts;          //tracked pts for smoothing the timestamps
-    double m_frameduration;        //frameduration exposed to dvdplayer, used for calculating the fps
+    double m_frameduration;        //frameduration exposed to VideoPlayer, used for calculating the fps
     double m_maxframeduration;     //Max value detected for frame duration (for VFR files case)
     double m_minframeduration;     //Min value detected for frame duration (for VFR files case)
     bool m_haspattern;             //for the log and detecting VFR files case
diff --git a/xbmc/cores/dvdplayer/Edl.cpp b/xbmc/cores/VideoPlayer/Edl.cpp
index 6d07bd6ed6..6d07bd6ed6 100644
--- a/xbmc/cores/dvdplayer/Edl.cpp
+++ b/xbmc/cores/VideoPlayer/Edl.cpp
diff --git a/xbmc/cores/dvdplayer/Edl.h b/xbmc/cores/VideoPlayer/Edl.h
index ff26078dc4..ff26078dc4 100644
--- a/xbmc/cores/dvdplayer/Edl.h
+++ b/xbmc/cores/VideoPlayer/Edl.h
diff --git a/xbmc/cores/dvdplayer/IDVDPlayer.h b/xbmc/cores/VideoPlayer/IVideoPlayer.h
index f590e02a51..d25bebb096 100644
--- a/xbmc/cores/dvdplayer/IDVDPlayer.h
+++ b/xbmc/cores/VideoPlayer/IVideoPlayer.h
@@ -28,11 +28,11 @@ typedef CRectGen<float>  CRect;
 
 class DVDNavResult;
 
-class IDVDPlayer
+class IVideoPlayer
 {
 public:
   virtual int OnDVDNavResult(void* pData, int iMessage) = 0;
-  virtual ~IDVDPlayer() { }
+  virtual ~IVideoPlayer() { }
 };
 
 class IDVDStreamPlayer
diff --git a/xbmc/cores/dvdplayer/Makefile.in b/xbmc/cores/VideoPlayer/Makefile.in
index 0f7948fe11..99cefc205f 100644
--- a/xbmc/cores/dvdplayer/Makefile.in
+++ b/xbmc/cores/VideoPlayer/Makefile.in
@@ -7,17 +7,17 @@ SRCS += DVDFileInfo.cpp
 SRCS += DVDMessage.cpp
 SRCS += DVDMessageQueue.cpp
 SRCS += DVDOverlayContainer.cpp
-SRCS += DVDPlayer.cpp
-SRCS += DVDPlayerAudio.cpp
+SRCS += VideoPlayer.cpp
+SRCS += VideoPlayerAudio.cpp
+SRCS += VideoPlayerSubtitle.cpp
+SRCS += VideoPlayerTeletext.cpp
+SRCS += VideoPlayerVideo.cpp
 SRCS += DVDPlayerRadioRDS.cpp
-SRCS += DVDPlayerSubtitle.cpp
-SRCS += DVDPlayerTeletext.cpp
-SRCS += DVDPlayerVideo.cpp
 SRCS += DVDStreamInfo.cpp
 SRCS += DVDTSCorrection.cpp
 SRCS += Edl.cpp
 
-LIB = DVDPlayer.a
+LIB = VideoPlayer.a
 
 include @abs_top_srcdir@/Makefile.include
 -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
index 0182c742af..dacba94bcb 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -19,8 +19,8 @@
  */
 
 #include "system.h"
-#include "DVDPlayer.h"
 #include "DVDPlayerRadioRDS.h"
+#include "VideoPlayer.h"
 
 #include "DVDInputStreams/DVDInputStream.h"
 #include "DVDInputStreams/DVDFactoryInputStream.h"
@@ -48,7 +48,7 @@
 #include "messaging/ApplicationMessenger.h"
 
 #include "DVDDemuxers/DVDDemuxCC.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #ifdef HAS_PERFORMANCE_SAMPLE
 #include "xbmc/utils/PerformanceSample.h"
 #else
@@ -78,7 +78,7 @@
 #include "cores/omxplayer/OMXPlayerVideo.h"
 #include "cores/omxplayer/OMXHelper.h"
 #endif
-#include "DVDPlayerAudio.h"
+#include "VideoPlayerAudio.h"
 
 using namespace PVR;
 using namespace KODI::MESSAGING;
@@ -352,7 +352,7 @@ int CSelectionStreams::IndexOf(StreamType type, int source, int id) const
     return -1;
 }
 
-int CSelectionStreams::IndexOf(StreamType type, CDVDPlayer& p) const
+int CSelectionStreams::IndexOf(StreamType type, CVideoPlayer& p) const
 {
   if (p.m_pInputStream && p.m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
   {
@@ -531,7 +531,7 @@ int CSelectionStreams::CountSource(StreamType type, StreamSource source) const
   return count;
 }
 
-void CDVDPlayer::CreatePlayers()
+void CVideoPlayer::CreatePlayers()
 {
 #ifdef HAS_OMXPLAYER
   bool omx_suitable = !OMXPlayerUnsuitable(m_HasVideo, m_HasAudio, m_pDemuxer, m_pInputStream, m_SelectionStreams);
@@ -547,40 +547,42 @@ void CDVDPlayer::CreatePlayers()
   if (m_omxplayer_mode)
   {
 #ifdef HAS_OMXPLAYER
-    m_dvdPlayerVideo = new OMXPlayerVideo(&m_OmxPlayerState.av_clock, &m_overlayContainer, m_messenger);
-    m_dvdPlayerAudio = new OMXPlayerAudio(&m_OmxPlayerState.av_clock, m_messenger);
+    m_VideoPlayerVideo = new OMXPlayerVideo(&m_OmxPlayerState.av_clock, &m_overlayContainer, m_messenger);
+    m_VideoPlayerAudio = new OMXPlayerAudio(&m_OmxPlayerState.av_clock, m_messenger);
 #endif
   }
   else
   {
-    m_dvdPlayerVideo = new CDVDPlayerVideo(&m_clock, &m_overlayContainer, m_messenger, m_renderManager);
-    m_dvdPlayerAudio = new CDVDPlayerAudio(&m_clock, m_messenger);
+    m_VideoPlayerVideo = new CVideoPlayerVideo(&m_clock, &m_overlayContainer, m_messenger, m_renderManager);
+    m_VideoPlayerAudio = new CVideoPlayerAudio(&m_clock, m_messenger);
   }
-  m_dvdPlayerSubtitle = new CDVDPlayerSubtitle(&m_overlayContainer);
-  m_dvdPlayerTeletext = new CDVDTeletextData();
-  m_dvdPlayerRadioRDS = new CDVDRadioRDSData();
+  m_VideoPlayerSubtitle = new CVideoPlayerSubtitle(&m_overlayContainer);
+  m_VideoPlayerTeletext = new CDVDTeletextData();
+  m_VideoPlayerRadioRDS = new CDVDRadioRDSData();
   m_players_created = true;
 }
 
-void CDVDPlayer::DestroyPlayers()
+void CVideoPlayer::DestroyPlayers()
 {
   if (!m_players_created)
     return;
-  delete m_dvdPlayerVideo;
-  delete m_dvdPlayerAudio;
-  delete m_dvdPlayerSubtitle;
-  delete m_dvdPlayerTeletext;
-  delete m_dvdPlayerRadioRDS;
+
+  delete m_VideoPlayerVideo;
+  delete m_VideoPlayerAudio;
+  delete m_VideoPlayerSubtitle;
+  delete m_VideoPlayerTeletext;
+  delete m_VideoPlayerRadioRDS;
+
   m_players_created = false;
 }
 
-CDVDPlayer::CDVDPlayer(IPlayerCallback& callback)
+CVideoPlayer::CVideoPlayer(IPlayerCallback& callback)
     : IPlayer(callback),
-      CThread("DVDPlayer"),
-      m_CurrentAudio(STREAM_AUDIO, DVDPLAYER_AUDIO),
-      m_CurrentVideo(STREAM_VIDEO, DVDPLAYER_VIDEO),
-      m_CurrentSubtitle(STREAM_SUBTITLE, DVDPLAYER_SUBTITLE),
-      m_CurrentTeletext(STREAM_TELETEXT, DVDPLAYER_TELETEXT),
+      CThread("VideoPlayer"),
+      m_CurrentAudio(STREAM_AUDIO, VideoPlayer_AUDIO),
+      m_CurrentVideo(STREAM_VIDEO, VideoPlayer_VIDEO),
+      m_CurrentSubtitle(STREAM_SUBTITLE, VideoPlayer_SUBTITLE),
+      m_CurrentTeletext(STREAM_TELETEXT, VideoPlayer_TELETEXT),
       m_CurrentRadioRDS(STREAM_RADIO_RDS, DVDPLAYER_RDS),
       m_messenger("player"),
       m_ready(true),
@@ -627,15 +629,15 @@ CDVDPlayer::CDVDPlayer(IPlayerCallback& callback)
   CreatePlayers();
 }
 
-CDVDPlayer::~CDVDPlayer()
+CVideoPlayer::~CVideoPlayer()
 {
   CloseFile();
   DestroyPlayers();
 }
 
-bool CDVDPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
+bool CVideoPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
 {
-    CLog::Log(LOGNOTICE, "DVDPlayer: Opening: %s", CURL::GetRedacted(file.GetPath()).c_str());
+    CLog::Log(LOGNOTICE, "VideoPlayer: Opening: %s", CURL::GetRedacted(file.GetPath()).c_str());
 
     // if playing a file close it first
     // this has to be changed so we won't have to close it.
@@ -673,9 +675,9 @@ bool CDVDPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
     return true;
 }
 
-bool CDVDPlayer::CloseFile(bool reopen)
+bool CVideoPlayer::CloseFile(bool reopen)
 {
-  CLog::Log(LOGNOTICE, "CDVDPlayer::CloseFile()");
+  CLog::Log(LOGNOTICE, "CVideoPlayer::CloseFile()");
 
   // set the abort request so that other threads can finish up
   m_bAbortRequest = true;
@@ -690,7 +692,7 @@ bool CDVDPlayer::CloseFile(bool reopen)
   if(m_pInputStream)
     m_pInputStream->Abort();
 
-  CLog::Log(LOGNOTICE, "DVDPlayer: waiting for threads to exit");
+  CLog::Log(LOGNOTICE, "VideoPlayer: waiting for threads to exit");
 
   // wait for the main thread to finish up
   // since this main thread cleans up all other resources and threads
@@ -703,17 +705,17 @@ bool CDVDPlayer::CloseFile(bool reopen)
   m_HasVideo = false;
   m_HasAudio = false;
 
-  CLog::Log(LOGNOTICE, "DVDPlayer: finished waiting");
+  CLog::Log(LOGNOTICE, "VideoPlayer: finished waiting");
   m_renderManager.UnInit();
   return true;
 }
 
-bool CDVDPlayer::IsPlaying() const
+bool CVideoPlayer::IsPlaying() const
 {
   return !m_bStop;
 }
 
-void CDVDPlayer::OnStartup()
+void CVideoPlayer::OnStartup()
 {
   m_CurrentVideo.Clear();
   m_CurrentAudio.Clear();
@@ -726,7 +728,7 @@ void CDVDPlayer::OnStartup()
   CUtil::ClearTempFonts();
 }
 
-bool CDVDPlayer::OpenInputStream()
+bool CVideoPlayer::OpenInputStream()
 {
   if(m_pInputStream)
     SAFE_DELETE(m_pInputStream);
@@ -744,7 +746,7 @@ bool CDVDPlayer::OpenInputStream()
   m_pInputStream = CDVDFactoryInputStream::CreateInputStream(this, m_filename, m_mimetype, m_item.ContentLookup());
   if(m_pInputStream == NULL)
   {
-    CLog::Log(LOGERROR, "CDVDPlayer::OpenInputStream - unable to create input stream for [%s]", m_filename.c_str());
+    CLog::Log(LOGERROR, "CVideoPlayer::OpenInputStream - unable to create input stream for [%s]", m_filename.c_str());
     return false;
   }
   else
@@ -752,7 +754,7 @@ bool CDVDPlayer::OpenInputStream()
 
   if (!m_pInputStream->Open(m_filename.c_str(), m_mimetype, m_item.ContentLookup()))
   {
-    CLog::Log(LOGERROR, "CDVDPlayer::OpenInputStream - error opening [%s]", m_filename.c_str());
+    CLog::Log(LOGERROR, "CVideoPlayer::OpenInputStream - error opening [%s]", m_filename.c_str());
     return false;
   }
 
@@ -801,7 +803,7 @@ bool CDVDPlayer::OpenInputStream()
   return true;
 }
 
-bool CDVDPlayer::OpenDemuxStream()
+bool CVideoPlayer::OpenDemuxStream()
 {
   if(m_pDemuxer)
     SAFE_DELETE(m_pDemuxer);
@@ -842,7 +844,7 @@ bool CDVDPlayer::OpenDemuxStream()
   return true;
 }
 
-void CDVDPlayer::OpenDefaultStreams(bool reset)
+void CVideoPlayer::OpenDefaultStreams(bool reset)
 {
   // if input stream dictate, we will open later
   if(m_dvd.iSelectedAudioStream >= 0
@@ -927,11 +929,11 @@ void CDVDPlayer::OpenDefaultStreams(bool reset)
     CloseStream(m_CurrentRadioRDS, false);
 }
 
-bool CDVDPlayer::ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream)
+bool CVideoPlayer::ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream)
 {
 
   // check if we should read from subtitle demuxer
-  if( m_pSubtitleDemuxer && m_dvdPlayerSubtitle->AcceptsData() )
+  if( m_pSubtitleDemuxer && m_VideoPlayerSubtitle->AcceptsData() )
   {
     packet = m_pSubtitleDemuxer->Read();
 
@@ -1012,7 +1014,7 @@ bool CDVDPlayer::ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream)
   return false;
 }
 
-bool CDVDPlayer::IsValidStream(CCurrentStream& stream)
+bool CVideoPlayer::IsValidStream(CCurrentStream& stream)
 {
   if(stream.id<0)
     return true; // we consider non selected as valid
@@ -1060,7 +1062,7 @@ bool CDVDPlayer::IsValidStream(CCurrentStream& stream)
   return false;
 }
 
-bool CDVDPlayer::IsBetterStream(CCurrentStream& current, CDemuxStream* stream)
+bool CVideoPlayer::IsBetterStream(CCurrentStream& current, CDemuxStream* stream)
 {
   // Do not reopen non-video streams if we're in video-only mode
   if(m_PlayerOptions.video_only && current.type != STREAM_VIDEO)
@@ -1110,7 +1112,7 @@ bool CDVDPlayer::IsBetterStream(CCurrentStream& current, CDemuxStream* stream)
   return false;
 }
 
-void CDVDPlayer::CheckBetterStream(CCurrentStream& current, CDemuxStream* stream)
+void CVideoPlayer::CheckBetterStream(CCurrentStream& current, CDemuxStream* stream)
 {
   IDVDStreamPlayer* player = GetStreamPlayer(current.player);
   if (!IsValidStream(current) && (player == NULL || player->IsStalled()))
@@ -1120,7 +1122,7 @@ void CDVDPlayer::CheckBetterStream(CCurrentStream& current, CDemuxStream* stream
     OpenStream(current, stream->iId, stream->source);
 }
 
-void CDVDPlayer::Process()
+void CVideoPlayer::Process()
 {
   if (!OpenInputStream())
   {
@@ -1130,7 +1132,7 @@ void CDVDPlayer::Process()
 
   if (CDVDInputStream::IMenus* ptr = dynamic_cast<CDVDInputStream::IMenus*>(m_pInputStream))
   {
-    CLog::Log(LOGNOTICE, "DVDPlayer: playing a file with menu's");
+    CLog::Log(LOGNOTICE, "VideoPlayer: playing a file with menu's");
     if(dynamic_cast<CDVDInputStreamNavigator*>(m_pInputStream))
       m_PlayerOptions.starttime = 0;
 
@@ -1151,7 +1153,7 @@ void CDVDPlayer::Process()
   CreatePlayers();
 
   // allow renderer to switch to fullscreen if requested
-  m_dvdPlayerVideo->EnableFullscreen(m_PlayerOptions.fullscreen);
+  m_VideoPlayerVideo->EnableFullscreen(m_PlayerOptions.fullscreen);
 
   if (m_omxplayer_mode)
   {
@@ -1252,7 +1254,7 @@ void CDVDPlayer::Process()
   while (!m_bAbortRequest)
   {
 #ifdef HAS_OMXPLAYER
-    if (m_omxplayer_mode && OMXDoProcessing(m_OmxPlayerState, m_playSpeed, m_dvdPlayerVideo, m_dvdPlayerAudio, m_CurrentAudio, m_CurrentVideo, m_HasVideo, m_HasAudio))
+    if (m_omxplayer_mode && OMXDoProcessing(m_OmxPlayerState, m_playSpeed, m_VideoPlayerVideo, m_VideoPlayerAudio, m_CurrentAudio, m_CurrentVideo, m_HasVideo, m_HasAudio))
     {
       CloseStream(m_CurrentVideo, false);
       OpenStream(m_CurrentVideo, m_CurrentVideo.id, m_CurrentVideo.source);
@@ -1298,8 +1300,8 @@ void CDVDPlayer::Process()
         OpenDefaultStreams();
 
       // never allow first frames after open to be skipped
-      if( m_dvdPlayerVideo->IsInited() )
-        m_dvdPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::VIDEO_NOSKIP));
+      if( m_VideoPlayerVideo->IsInited() )
+        m_VideoPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::VIDEO_NOSKIP));
 
       if (CachePVRStream())
         SetCaching(CACHESTATE_PVR);
@@ -1318,14 +1320,14 @@ void CDVDPlayer::Process()
     UpdateApplication(1000);
 
     // make sure we run subtitle process here
-    m_dvdPlayerSubtitle->Process(m_clock.GetClock() + m_State.time_offset - m_dvdPlayerVideo->GetSubtitleDelay(), m_State.time_offset);
+    m_VideoPlayerSubtitle->Process(m_clock.GetClock() + m_State.time_offset - m_VideoPlayerVideo->GetSubtitleDelay(), m_State.time_offset);
 
     if (CheckDelayedChannelEntry())
       continue;
 
     // if the queues are full, no need to read more
-    if ((!m_dvdPlayerAudio->AcceptsData() && m_CurrentAudio.id >= 0) ||
-        (!m_dvdPlayerVideo->AcceptsData() && m_CurrentVideo.id >= 0))
+    if ((!m_VideoPlayerAudio->AcceptsData() && m_CurrentAudio.id >= 0) ||
+        (!m_VideoPlayerVideo->AcceptsData() && m_CurrentVideo.id >= 0))
     {
       if(m_pDemuxer && m_DemuxerPausePending)
       {
@@ -1338,8 +1340,8 @@ void CDVDPlayer::Process()
     }
 
     // always yield to players if they have data levels > 50 percent
-    if((m_dvdPlayerAudio->GetLevel() > 50 || m_CurrentAudio.id < 0)
-    && (m_dvdPlayerVideo->GetLevel() > 50 || m_CurrentVideo.id < 0))
+    if((m_VideoPlayerAudio->GetLevel() > 50 || m_CurrentAudio.id < 0)
+    && (m_VideoPlayerVideo->GetLevel() > 50 || m_CurrentVideo.id < 0))
       Sleep(0);
 
     DemuxPacket* pPacket = NULL;
@@ -1409,15 +1411,15 @@ void CDVDPlayer::Process()
       }
 
       if(m_CurrentAudio.inited)
-        m_dvdPlayerAudio->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
+        m_VideoPlayerAudio->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
       if(m_CurrentVideo.inited)
-        m_dvdPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
+        m_VideoPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
       if(m_CurrentSubtitle.inited)
-        m_dvdPlayerSubtitle->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
+        m_VideoPlayerSubtitle->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
       if(m_CurrentTeletext.inited)
-        m_dvdPlayerTeletext->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
+        m_VideoPlayerTeletext->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
       if(m_CurrentRadioRDS.inited)
-        m_dvdPlayerRadioRDS->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
+        m_VideoPlayerRadioRDS->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
 
       m_CurrentAudio.inited = false;
       m_CurrentVideo.inited = false;
@@ -1429,14 +1431,14 @@ void CDVDPlayer::Process()
       SetCaching(CACHESTATE_DONE);
 
       // while players are still playing, keep going to allow seekbacks
-      if(m_dvdPlayerAudio->HasData()
-      || m_dvdPlayerVideo->HasData())
+      if(m_VideoPlayerAudio->HasData()
+      || m_VideoPlayerVideo->HasData())
       {
         Sleep(100);
         continue;
       }
 #ifdef HAS_OMXPLAYER
-      if (m_omxplayer_mode && OMXStillPlaying(m_OmxPlayerState.bOmxWaitVideo, m_OmxPlayerState.bOmxWaitAudio, m_dvdPlayerVideo->IsEOS(), m_dvdPlayerAudio->IsEOS()))
+      if (m_omxplayer_mode && OMXStillPlaying(m_OmxPlayerState.bOmxWaitVideo, m_OmxPlayerState.bOmxWaitAudio, m_VideoPlayerVideo->IsEOS(), m_VideoPlayerAudio->IsEOS()))
       {
         Sleep(100);
         continue;
@@ -1501,7 +1503,7 @@ void CDVDPlayer::Process()
   }
 }
 
-bool CDVDPlayer::CheckDelayedChannelEntry(void)
+bool CVideoPlayer::CheckDelayedChannelEntry(void)
 {
   bool bReturn(false);
 
@@ -1521,7 +1523,7 @@ bool CDVDPlayer::CheckDelayedChannelEntry(void)
   return bReturn;
 }
 
-bool CDVDPlayer::CheckIsCurrent(CCurrentStream& current, CDemuxStream* stream, DemuxPacket* pkg)
+bool CVideoPlayer::CheckIsCurrent(CCurrentStream& current, CDemuxStream* stream, DemuxPacket* pkg)
 {
   if(current.id     == pkg->iStreamId
   && current.source == stream->source
@@ -1531,7 +1533,7 @@ bool CDVDPlayer::CheckIsCurrent(CCurrentStream& current, CDemuxStream* stream, D
     return false;
 }
 
-void CDVDPlayer::ProcessPacket(CDemuxStream* pStream, DemuxPacket* pPacket)
+void CVideoPlayer::ProcessPacket(CDemuxStream* pStream, DemuxPacket* pPacket)
 {
   // process packet if it belongs to selected stream.
   // for dvd's don't allow automatic opening of streams*/
@@ -1553,7 +1555,7 @@ void CDVDPlayer::ProcessPacket(CDemuxStream* pStream, DemuxPacket* pPacket)
   }
 }
 
-void CDVDPlayer::CheckStreamChanges(CCurrentStream& current, CDemuxStream* stream)
+void CVideoPlayer::CheckStreamChanges(CCurrentStream& current, CDemuxStream* stream)
 {
   if (current.stream  != (void*)stream
   ||  current.changes != stream->changes)
@@ -1569,7 +1571,7 @@ void CDVDPlayer::CheckStreamChanges(CCurrentStream& current, CDemuxStream* strea
   }
 }
 
-void CDVDPlayer::ProcessAudioData(CDemuxStream* pStream, DemuxPacket* pPacket)
+void CVideoPlayer::ProcessAudioData(CDemuxStream* pStream, DemuxPacket* pPacket)
 {
   CheckStreamChanges(m_CurrentAudio, pStream);
 
@@ -1595,20 +1597,20 @@ void CDVDPlayer::ProcessAudioData(CDemuxStream* pStream, DemuxPacket* pPacket)
   else if (m_Edl.InCut(DVD_TIME_TO_MSEC(m_CurrentAudio.dts + m_offset_pts), &cut) && cut.action == CEdl::MUTE // Inside EDL mute
   &&      !m_EdlAutoSkipMarkers.mute) // Mute not already triggered
   {
-    m_dvdPlayerAudio->SendMessage(new CDVDMsgBool(CDVDMsg::AUDIO_SILENCE, true));
+    m_VideoPlayerAudio->SendMessage(new CDVDMsgBool(CDVDMsg::AUDIO_SILENCE, true));
     m_EdlAutoSkipMarkers.mute = true;
   }
   else if (!m_Edl.InCut(DVD_TIME_TO_MSEC(m_CurrentAudio.dts + m_offset_pts), &cut) // Outside of any EDL
   &&        m_EdlAutoSkipMarkers.mute) // But the mute hasn't been removed yet
   {
-    m_dvdPlayerAudio->SendMessage(new CDVDMsgBool(CDVDMsg::AUDIO_SILENCE, false));
+    m_VideoPlayerAudio->SendMessage(new CDVDMsgBool(CDVDMsg::AUDIO_SILENCE, false));
     m_EdlAutoSkipMarkers.mute = false;
   }
 
-  m_dvdPlayerAudio->SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
+  m_VideoPlayerAudio->SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
 }
 
-void CDVDPlayer::ProcessVideoData(CDemuxStream* pStream, DemuxPacket* pPacket)
+void CVideoPlayer::ProcessVideoData(CDemuxStream* pStream, DemuxPacket* pPacket)
 {
   CheckStreamChanges(m_CurrentVideo, pStream);
 
@@ -1628,10 +1630,10 @@ void CDVDPlayer::ProcessVideoData(CDemuxStream* pStream, DemuxPacket* pPacket)
   if (CheckSceneSkip(m_CurrentVideo))
     drop = true;
 
-  m_dvdPlayerVideo->SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
+  m_VideoPlayerVideo->SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
 }
 
-void CDVDPlayer::ProcessSubData(CDemuxStream* pStream, DemuxPacket* pPacket)
+void CVideoPlayer::ProcessSubData(CDemuxStream* pStream, DemuxPacket* pPacket)
 {
   CheckStreamChanges(m_CurrentSubtitle, pStream);
 
@@ -1644,13 +1646,13 @@ void CDVDPlayer::ProcessSubData(CDemuxStream* pStream, DemuxPacket* pPacket)
   if (CheckSceneSkip(m_CurrentSubtitle))
     drop = true;
 
-  m_dvdPlayerSubtitle->SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
+  m_VideoPlayerSubtitle->SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
 
   if(m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
-    m_dvdPlayerSubtitle->UpdateOverlayInfo((CDVDInputStreamNavigator*)m_pInputStream, LIBDVDNAV_BUTTON_NORMAL);
+    m_VideoPlayerSubtitle->UpdateOverlayInfo((CDVDInputStreamNavigator*)m_pInputStream, LIBDVDNAV_BUTTON_NORMAL);
 }
 
-void CDVDPlayer::ProcessTeletextData(CDemuxStream* pStream, DemuxPacket* pPacket)
+void CVideoPlayer::ProcessTeletextData(CDemuxStream* pStream, DemuxPacket* pPacket)
 {
   CheckStreamChanges(m_CurrentTeletext, pStream);
 
@@ -1663,10 +1665,10 @@ void CDVDPlayer::ProcessTeletextData(CDemuxStream* pStream, DemuxPacket* pPacket
   if (CheckSceneSkip(m_CurrentTeletext))
     drop = true;
 
-  m_dvdPlayerTeletext->SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
+  m_VideoPlayerTeletext->SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
 }
 
-void CDVDPlayer::ProcessRadioRDSData(CDemuxStream* pStream, DemuxPacket* pPacket)
+void CVideoPlayer::ProcessRadioRDSData(CDemuxStream* pStream, DemuxPacket* pPacket)
 {
   CheckStreamChanges(m_CurrentRadioRDS, pStream);
 
@@ -1679,10 +1681,10 @@ void CDVDPlayer::ProcessRadioRDSData(CDemuxStream* pStream, DemuxPacket* pPacket
   if (CheckSceneSkip(m_CurrentRadioRDS))
     drop = true;
 
-  m_dvdPlayerRadioRDS->SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
+  m_VideoPlayerRadioRDS->SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
 }
 
-bool CDVDPlayer::GetCachingTimes(double& level, double& delay, double& offset)
+bool CVideoPlayer::GetCachingTimes(double& level, double& delay, double& offset)
 {
   if(!m_pInputStream || !m_pDemuxer)
     return false;
@@ -1730,7 +1732,7 @@ bool CDVDPlayer::GetCachingTimes(double& level, double& delay, double& offset)
   return true;
 }
 
-void CDVDPlayer::HandlePlaySpeed()
+void CVideoPlayer::HandlePlaySpeed()
 {
   ECacheState caching = m_caching;
   bool isInMenu = IsInMenu();
@@ -1753,8 +1755,8 @@ void CDVDPlayer::HandlePlaySpeed()
     }
     else
     {
-      if ((!m_dvdPlayerAudio->AcceptsData() && m_CurrentAudio.id >= 0)
-      ||  (!m_dvdPlayerVideo->AcceptsData() && m_CurrentVideo.id >= 0))
+      if ((!m_VideoPlayerAudio->AcceptsData() && m_CurrentAudio.id >= 0)
+      ||  (!m_VideoPlayerVideo->AcceptsData() && m_CurrentVideo.id >= 0))
         caching = CACHESTATE_INIT;
     }
   }
@@ -1769,8 +1771,8 @@ void CDVDPlayer::HandlePlaySpeed()
     // handle situation that we get no data on one stream
     if(m_CurrentAudio.id >= 0 && m_CurrentVideo.id >= 0)
     {
-      if ((!m_dvdPlayerAudio->AcceptsData() && !m_CurrentVideo.started)
-      ||  (!m_dvdPlayerVideo->AcceptsData() && !m_CurrentAudio.started))
+      if ((!m_VideoPlayerAudio->AcceptsData() && !m_CurrentVideo.started)
+      ||  (!m_VideoPlayerVideo->AcceptsData() && !m_CurrentAudio.started))
       {
         caching = CACHESTATE_DONE;
       }
@@ -1781,10 +1783,10 @@ void CDVDPlayer::HandlePlaySpeed()
   {
     bool bGotAudio(m_pDemuxer->GetNrOfAudioStreams() > 0);
     bool bGotVideo(m_pDemuxer->GetNrOfVideoStreams() > 0);
-    bool bAudioLevelOk(m_dvdPlayerAudio->GetLevel() > g_advancedSettings.m_iPVRMinAudioCacheLevel);
-    bool bVideoLevelOk(m_dvdPlayerVideo->GetLevel() > g_advancedSettings.m_iPVRMinVideoCacheLevel);
-    bool bAudioFull(!m_dvdPlayerAudio->AcceptsData());
-    bool bVideoFull(!m_dvdPlayerVideo->AcceptsData());
+    bool bAudioLevelOk(m_VideoPlayerAudio->GetLevel() > g_advancedSettings.m_iPVRMinAudioCacheLevel);
+    bool bVideoLevelOk(m_VideoPlayerVideo->GetLevel() > g_advancedSettings.m_iPVRMinVideoCacheLevel);
+    bool bAudioFull(!m_VideoPlayerAudio->AcceptsData());
+    bool bVideoFull(!m_VideoPlayerVideo->AcceptsData());
 
     if (/* if all streams got at least g_advancedSettings.m_iPVRMinCacheLevel in their buffers, we're done */
         ((bGotVideo || bGotAudio) && (!bGotAudio || bAudioLevelOk) && (!bGotVideo || bVideoLevelOk)) ||
@@ -1792,8 +1794,8 @@ void CDVDPlayer::HandlePlaySpeed()
         (bAudioFull || bVideoFull))
     {
       CLog::Log(LOGDEBUG, "set caching from pvr to done. audio (%d) = %d. video (%d) = %d",
-          bGotAudio, m_dvdPlayerAudio->GetLevel(),
-          bGotVideo, m_dvdPlayerVideo->GetLevel());
+          bGotAudio, m_VideoPlayerAudio->GetLevel(),
+          bGotVideo, m_VideoPlayerVideo->GetLevel());
 
       caching = CACHESTATE_DONE;
     }
@@ -1801,17 +1803,17 @@ void CDVDPlayer::HandlePlaySpeed()
     {
       /* ensure that automatically started players are stopped while caching */
       if (m_CurrentAudio.started)
-        m_dvdPlayerAudio->SetSpeed(DVD_PLAYSPEED_PAUSE);
+        m_VideoPlayerAudio->SetSpeed(DVD_PLAYSPEED_PAUSE);
       if (m_CurrentVideo.started)
-        m_dvdPlayerVideo->SetSpeed(DVD_PLAYSPEED_PAUSE);
+        m_VideoPlayerVideo->SetSpeed(DVD_PLAYSPEED_PAUSE);
     }
   }
 
   if(caching == CACHESTATE_PLAY)
   {
     // if all enabled streams have started playing we are done
-    if((m_CurrentVideo.id < 0 || !m_dvdPlayerVideo->IsStalled())
-    && (m_CurrentAudio.id < 0 || !m_dvdPlayerAudio->IsStalled()))
+    if((m_CurrentVideo.id < 0 || !m_VideoPlayerVideo->IsStalled())
+    && (m_CurrentAudio.id < 0 || !m_VideoPlayerAudio->IsStalled()))
       caching = CACHESTATE_DONE;
   }
 
@@ -1824,9 +1826,9 @@ void CDVDPlayer::HandlePlaySpeed()
     // due to i.e. discontinuities of pts the stream may have drifted away
     // from clock too far for audio to sync back.
     if (m_CurrentAudio.id >= 0 && m_CurrentAudio.inited &&
-        m_dvdPlayerAudio->IsStalled() && m_dvdPlayerAudio->GetLevel() == 0)
+        m_VideoPlayerAudio->IsStalled() && m_VideoPlayerAudio->GetLevel() == 0)
     {
-      CLog::Log(LOGDEBUG,"CDVDPlayer::HandlePlaySpeed - audio stream stalled, triggering re-sync");
+      CLog::Log(LOGDEBUG,"CVideoPlayer::HandlePlaySpeed - audio stream stalled, triggering re-sync");
       TriggerResync();
     }
 
@@ -1835,10 +1837,10 @@ void CDVDPlayer::HandlePlaySpeed()
       if (m_CurrentAudio.id >= 0)
       {
         double adjust = -1.0; // a unique value
-        if (m_clock.GetSpeedAdjust() == 0.0 && m_dvdPlayerAudio->GetLevel() < 5)
+        if (m_clock.GetSpeedAdjust() == 0.0 && m_VideoPlayerAudio->GetLevel() < 5)
           adjust = -0.01;
 
-        if (m_clock.GetSpeedAdjust() < 0 && m_dvdPlayerAudio->GetLevel() > 20)
+        if (m_clock.GetSpeedAdjust() < 0 && m_VideoPlayerAudio->GetLevel() > 20)
           adjust = 0.0;
 
         if (adjust != -1.0)
@@ -1846,7 +1848,7 @@ void CDVDPlayer::HandlePlaySpeed()
           m_clock.SetSpeedAdjust(adjust);
           if (m_omxplayer_mode)
             m_OmxPlayerState.av_clock.OMXSetSpeedAdjust(adjust);
-          CLog::Log(LOGDEBUG, "CDVDPlayer::HandlePlaySpeed set clock adjust: %f", adjust);
+          CLog::Log(LOGDEBUG, "CVideoPlayer::HandlePlaySpeed set clock adjust: %f", adjust);
         }
       }
     }
@@ -1874,16 +1876,16 @@ void CDVDPlayer::HandlePlaySpeed()
       else if (m_SpeedState.lasttime == GetTime())
         check = false;
       // skip if frame at screen has no valid timestamp
-      else if (m_dvdPlayerVideo->GetCurrentPts() == DVD_NOPTS_VALUE)
+      else if (m_VideoPlayerVideo->GetCurrentPts() == DVD_NOPTS_VALUE)
         check = false;
       // skip if frame on screen has not changed
-      else if (m_SpeedState.lastpts == m_dvdPlayerVideo->GetCurrentPts() &&
+      else if (m_SpeedState.lastpts == m_VideoPlayerVideo->GetCurrentPts() &&
                (m_SpeedState.lastpts > m_State.dts || m_playSpeed > 0))
         check = false;
 
       if (check)
       {
-        m_SpeedState.lastpts  = m_dvdPlayerVideo->GetCurrentPts();
+        m_SpeedState.lastpts  = m_VideoPlayerVideo->GetCurrentPts();
         m_SpeedState.lasttime = GetTime();
         m_SpeedState.lastabstime = CDVDClock::GetAbsoluteClock();
         // check how much off clock video is when ff/rw:ing
@@ -1914,7 +1916,7 @@ void CDVDPlayer::HandlePlaySpeed()
 
           if(std::abs(error) > 1000)
           {
-            CLog::Log(LOGDEBUG, "CDVDPlayer::Process - Seeking to catch up");
+            CLog::Log(LOGDEBUG, "CVideoPlayer::Process - Seeking to catch up");
             m_SpeedState.lastseekpts = (int)DVD_TIME_TO_MSEC(m_clock.GetClock());
             int iTime = DVD_TIME_TO_MSEC(m_clock.GetClock() + m_State.time_offset + 1000000.0 * m_playSpeed / m_playSpeed);
             m_messenger.Put(new CDVDMsgPlayerSeek(iTime, (GetPlaySpeed() < 0), true, false, false, true, false));
@@ -1925,7 +1927,7 @@ void CDVDPlayer::HandlePlaySpeed()
   }
 }
 
-bool CDVDPlayer::CheckStartCaching(CCurrentStream& current)
+bool CVideoPlayer::CheckStartCaching(CCurrentStream& current)
 {
   if(m_caching   != CACHESTATE_DONE
   || m_playSpeed != DVD_PLAYSPEED_NORMAL)
@@ -1934,13 +1936,13 @@ bool CDVDPlayer::CheckStartCaching(CCurrentStream& current)
   if(IsInMenu())
     return false;
 
-  if((current.type == STREAM_AUDIO && m_dvdPlayerAudio->IsStalled())
-  || (current.type == STREAM_VIDEO && m_dvdPlayerVideo->IsStalled()))
+  if((current.type == STREAM_AUDIO && m_VideoPlayerAudio->IsStalled())
+  || (current.type == STREAM_VIDEO && m_VideoPlayerVideo->IsStalled()))
   {
     if (CachePVRStream())
     {
-      if ((current.type == STREAM_AUDIO && current.started && m_dvdPlayerAudio->GetLevel() == 0) ||
-         (current.type == STREAM_VIDEO && current.started && m_dvdPlayerVideo->GetLevel() == 0))
+      if ((current.type == STREAM_AUDIO && current.started && m_VideoPlayerAudio->GetLevel() == 0) ||
+         (current.type == STREAM_VIDEO && current.started && m_VideoPlayerVideo->GetLevel() == 0))
       {
         CLog::Log(LOGDEBUG, "%s stream stalled. start buffering", current.type == STREAM_AUDIO ? "audio" : "video");
         SetCaching(CACHESTATE_PVR);
@@ -1950,8 +1952,8 @@ bool CDVDPlayer::CheckStartCaching(CCurrentStream& current)
     }
 
     // don't start caching if it's only a single stream that has run dry
-    if(m_dvdPlayerAudio->GetLevel() > 50
-    || m_dvdPlayerVideo->GetLevel() > 50)
+    if(m_VideoPlayerAudio->GetLevel() > 50
+    || m_VideoPlayerVideo->GetLevel() > 50)
       return false;
 
     if(current.inited)
@@ -1963,7 +1965,7 @@ bool CDVDPlayer::CheckStartCaching(CCurrentStream& current)
   return false;
 }
 
-bool CDVDPlayer::CheckPlayerInit(CCurrentStream& current)
+bool CVideoPlayer::CheckPlayerInit(CCurrentStream& current)
 {
   if(current.inited)
     return false;
@@ -2007,17 +2009,17 @@ bool CDVDPlayer::CheckPlayerInit(CCurrentStream& current)
     bool setclock = false;
     if(m_playSpeed == DVD_PLAYSPEED_NORMAL)
     {
-      if(     current.player == DVDPLAYER_AUDIO)
+      if(     current.player == VideoPlayer_AUDIO)
         setclock = m_clock.GetMaster() == MASTER_CLOCK_AUDIO
                 || m_clock.GetMaster() == MASTER_CLOCK_AUDIO_VIDEOREF
                 || !m_CurrentVideo.inited;
-      else if(current.player == DVDPLAYER_VIDEO)
+      else if(current.player == VideoPlayer_VIDEO)
         setclock = m_clock.GetMaster() == MASTER_CLOCK_VIDEO
                 || !m_CurrentAudio.inited;
     }
     else
     {
-      if(current.player == DVDPLAYER_VIDEO)
+      if(current.player == VideoPlayer_VIDEO)
         setclock = true;
     }
 
@@ -2035,7 +2037,7 @@ bool CDVDPlayer::CheckPlayerInit(CCurrentStream& current)
     if(starttime > 0 && setclock)
     {
       if(starttime > DVD_SEC_TO_TIME(2))
-        CLog::Log(LOGWARNING, "CDVDPlayer::CheckPlayerInit(%d) - Ignoring too large delay of %f", current.player, starttime);
+        CLog::Log(LOGWARNING, "CVideoPlayer::CheckPlayerInit(%d) - Ignoring too large delay of %f", current.player, starttime);
       else
         SendPlayerMessage(new CDVDMsgDouble(CDVDMsg::GENERAL_DELAY, starttime), current.player);
     }
@@ -2045,13 +2047,13 @@ bool CDVDPlayer::CheckPlayerInit(CCurrentStream& current)
   return false;
 }
 
-void CDVDPlayer::UpdateCorrection(DemuxPacket* pkt, double correction)
+void CVideoPlayer::UpdateCorrection(DemuxPacket* pkt, double correction)
 {
   if(pkt->dts != DVD_NOPTS_VALUE) pkt->dts -= correction;
   if(pkt->pts != DVD_NOPTS_VALUE) pkt->pts -= correction;
 }
 
-void CDVDPlayer::UpdateTimestamps(CCurrentStream& current, DemuxPacket* pPacket)
+void CVideoPlayer::UpdateTimestamps(CCurrentStream& current, DemuxPacket* pPacket)
 {
   double dts = current.dts;
   /* update stored values */
@@ -2095,7 +2097,7 @@ static void UpdateLimits(double& minimum, double& maximum, double dts)
   if(maximum == DVD_NOPTS_VALUE || maximum < dts) maximum = dts;
 }
 
-void CDVDPlayer::CheckContinuity(CCurrentStream& current, DemuxPacket* pPacket)
+void CVideoPlayer::CheckContinuity(CCurrentStream& current, DemuxPacket* pPacket)
 {
   if (m_playSpeed < DVD_PLAYSPEED_PAUSE)
     return;
@@ -2116,7 +2118,7 @@ void CDVDPlayer::CheckContinuity(CCurrentStream& current, DemuxPacket* pPacket)
   double correction = 0.0;
   if( pPacket->dts > maxdts + DVD_MSEC_TO_TIME(1000))
   {
-    CLog::Log(LOGDEBUG, "CDVDPlayer::CheckContinuity - resync forward :%d, prev:%f, curr:%f, diff:%f"
+    CLog::Log(LOGDEBUG, "CVideoPlayer::CheckContinuity - resync forward :%d, prev:%f, curr:%f, diff:%f"
                             , current.type, current.dts, pPacket->dts, pPacket->dts - maxdts);
     correction = pPacket->dts - maxdts;
   }
@@ -2124,13 +2126,13 @@ void CDVDPlayer::CheckContinuity(CCurrentStream& current, DemuxPacket* pPacket)
   /* if it's large scale jump, correct for it after having confirmed the jump */
   if(pPacket->dts + DVD_MSEC_TO_TIME(100) < current.dts_end())
   {
-    CLog::Log(LOGDEBUG, "CDVDPlayer::CheckContinuity - resync backward :%d, prev:%f, curr:%f, diff:%f"
+    CLog::Log(LOGDEBUG, "CVideoPlayer::CheckContinuity - resync backward :%d, prev:%f, curr:%f, diff:%f"
                             , current.type, current.dts, pPacket->dts, pPacket->dts - current.dts);
     correction = pPacket->dts - current.dts_end();
   }
   else if(pPacket->dts < current.dts)
   {
-    CLog::Log(LOGDEBUG, "CDVDPlayer::CheckContinuity - wrapback :%d, prev:%f, curr:%f, diff:%f"
+    CLog::Log(LOGDEBUG, "CVideoPlayer::CheckContinuity - wrapback :%d, prev:%f, curr:%f, diff:%f"
                             , current.type, current.dts, pPacket->dts, pPacket->dts - current.dts);
   }
 
@@ -2159,7 +2161,7 @@ void CDVDPlayer::CheckContinuity(CCurrentStream& current, DemuxPacket* pPacket)
   current.lastdts = lastdts;
 }
 
-bool CDVDPlayer::CheckSceneSkip(CCurrentStream& current)
+bool CVideoPlayer::CheckSceneSkip(CCurrentStream& current)
 {
   if(!m_Edl.HasCut())
     return false;
@@ -2174,7 +2176,7 @@ bool CDVDPlayer::CheckSceneSkip(CCurrentStream& current)
   return m_Edl.InCut(DVD_TIME_TO_MSEC(current.dts + m_offset_pts), &cut) && cut.action == CEdl::CUT;
 }
 
-void CDVDPlayer::CheckAutoSceneSkip()
+void CVideoPlayer::CheckAutoSceneSkip()
 {
   if(!m_Edl.HasCut())
     return;
@@ -2187,7 +2189,7 @@ void CDVDPlayer::CheckAutoSceneSkip()
     return;
 
   /*
-   * If there is a startpts defined for either the audio or video stream then dvdplayer is still
+   * If there is a startpts defined for either the audio or video stream then VideoPlayer is still
    * still decoding frames to get to the previously requested seek point.
    */
   if(m_CurrentAudio.inited == false
@@ -2248,7 +2250,7 @@ void CDVDPlayer::CheckAutoSceneSkip()
 }
 
 
-void CDVDPlayer::SynchronizeDemuxer(unsigned int timeout)
+void CVideoPlayer::SynchronizeDemuxer(unsigned int timeout)
 {
   if(IsCurrentThread())
     return;
@@ -2261,57 +2263,57 @@ void CDVDPlayer::SynchronizeDemuxer(unsigned int timeout)
   message->Release();
 }
 
-void CDVDPlayer::SynchronizePlayers(unsigned int sources)
+void CVideoPlayer::SynchronizePlayers(unsigned int sources)
 {
   /* we need a big timeout as audio queue is about 8seconds for 2ch ac3 */
   const int timeout = 10*1000; // in milliseconds
 
   CDVDMsgGeneralSynchronize* message = new CDVDMsgGeneralSynchronize(timeout, sources);
   if (m_CurrentAudio.id >= 0)
-    m_dvdPlayerAudio->SendMessage(message->Acquire());
+    m_VideoPlayerAudio->SendMessage(message->Acquire());
 
   if (m_CurrentVideo.id >= 0)
-    m_dvdPlayerVideo->SendMessage(message->Acquire());
+    m_VideoPlayerVideo->SendMessage(message->Acquire());
 /* TODO - we have to rewrite the sync class, to not require
           all other players waiting for subtitle, should only
           be the oposite way
   if (m_CurrentSubtitle.id >= 0)
-    m_dvdPlayerSubtitle->SendMessage(message->Acquire());
+    m_VideoPlayerSubtitle->SendMessage(message->Acquire());
 */
   message->Release();
 }
 
-IDVDStreamPlayer* CDVDPlayer::GetStreamPlayer(unsigned int target)
+IDVDStreamPlayer* CVideoPlayer::GetStreamPlayer(unsigned int target)
 {
-  if(target == DVDPLAYER_AUDIO)
-    return m_dvdPlayerAudio;
-  if(target == DVDPLAYER_VIDEO)
-    return m_dvdPlayerVideo;
-  if(target == DVDPLAYER_SUBTITLE)
-    return m_dvdPlayerSubtitle;
-  if(target == DVDPLAYER_TELETEXT)
-    return m_dvdPlayerTeletext;
+  if(target == VideoPlayer_AUDIO)
+    return m_VideoPlayerAudio;
+  if(target == VideoPlayer_VIDEO)
+    return m_VideoPlayerVideo;
+  if(target == VideoPlayer_SUBTITLE)
+    return m_VideoPlayerSubtitle;
+  if(target == VideoPlayer_TELETEXT)
+    return m_VideoPlayerTeletext;
   if(target == DVDPLAYER_RDS)
-    return m_dvdPlayerRadioRDS;
+    return m_VideoPlayerRadioRDS;
   return NULL;
 }
 
-void CDVDPlayer::SendPlayerMessage(CDVDMsg* pMsg, unsigned int target)
+void CVideoPlayer::SendPlayerMessage(CDVDMsg* pMsg, unsigned int target)
 {
   IDVDStreamPlayer* player = GetStreamPlayer(target);
   if(player)
     player->SendMessage(pMsg, 0);
 }
 
-void CDVDPlayer::OnExit()
+void CVideoPlayer::OnExit()
 {
-    CLog::Log(LOGNOTICE, "CDVDPlayer::OnExit()");
+    CLog::Log(LOGNOTICE, "CVideoPlayer::OnExit()");
 
     // set event to inform openfile something went wrong in case openfile is still waiting for this event
     SetCaching(CACHESTATE_DONE);
 
     // close each stream
-    if (!m_bAbortRequest) CLog::Log(LOGNOTICE, "DVDPlayer: eof, waiting for queues to empty");
+    if (!m_bAbortRequest) CLog::Log(LOGNOTICE, "VideoPlayer: eof, waiting for queues to empty");
     CloseStream(m_CurrentAudio,    !m_bAbortRequest);
     CloseStream(m_CurrentVideo,    !m_bAbortRequest);
 
@@ -2356,7 +2358,7 @@ void CDVDPlayer::OnExit()
   m_ready.Set();
 }
 
-void CDVDPlayer::HandleMessages()
+void CVideoPlayer::HandleMessages()
 {
   CDVDMsg* pMsg;
 
@@ -2575,7 +2577,7 @@ void CDVDPlayer::HandleMessages()
           }
 
           m_OmxPlayerState.av_clock.OMXSetSpeed(speed);
-          CLog::Log(LOGDEBUG, "%s::%s CDVDMsg::PLAYER_SETSPEED speed : %d (%d)", "CDVDPlayer", __FUNCTION__, speed, m_playSpeed);
+          CLog::Log(LOGDEBUG, "%s::%s CDVDMsg::PLAYER_SETSPEED speed : %d (%d)", "CVideoPlayer", __FUNCTION__, speed, m_playSpeed);
         }
         else if ((speed == DVD_PLAYSPEED_NORMAL) &&
                  (m_playSpeed != DVD_PLAYSPEED_NORMAL) &&
@@ -2596,8 +2598,8 @@ void CDVDPlayer::HandleMessages()
         m_playSpeed = speed;
         m_caching = CACHESTATE_DONE;
         m_clock.SetSpeed(speed);
-        m_dvdPlayerAudio->SetSpeed(speed);
-        m_dvdPlayerVideo->SetSpeed(speed);
+        m_VideoPlayerAudio->SetSpeed(speed);
+        m_VideoPlayerVideo->SetSpeed(speed);
 
         // We can't pause demuxer until our buffers are full. Doing so will result in continued
         // calls to Read() which may then block indefinitely (CDVDInputStreamRTMP for example).
@@ -2699,39 +2701,39 @@ void CDVDPlayer::HandleMessages()
       else if (pMsg->IsType(CDVDMsg::PLAYER_STARTED))
       {
         int player = ((CDVDMsgInt*)pMsg)->m_value;
-        if(player == DVDPLAYER_AUDIO)
+        if(player == VideoPlayer_AUDIO)
           m_CurrentAudio.started = true;
-        if(player == DVDPLAYER_VIDEO)
+        if(player == VideoPlayer_VIDEO)
           m_CurrentVideo.started = true;
-        CLog::Log(LOGDEBUG, "CDVDPlayer::HandleMessages - player started %d", player);
+        CLog::Log(LOGDEBUG, "CVideoPlayer::HandleMessages - player started %d", player);
 
         if (m_omxplayer_mode)
         {
-          if ((player == DVDPLAYER_AUDIO || player == DVDPLAYER_VIDEO) &&
+          if ((player == VideoPlayer_AUDIO || player == VideoPlayer_VIDEO) &&
              ((m_playSpeed != DVD_PLAYSPEED_PAUSE && m_playSpeed != DVD_PLAYSPEED_NORMAL) || !m_HasAudio || m_CurrentAudio.started) &&
              (!m_HasVideo || m_CurrentVideo.started))
           {
-            CLog::Log(LOGDEBUG, "%s::%s player started RESET", "CDVDPlayer", __FUNCTION__);
+            CLog::Log(LOGDEBUG, "%s::%s player started RESET", "CVideoPlayer", __FUNCTION__);
             m_OmxPlayerState.av_clock.OMXReset(m_HasVideo, m_playSpeed != DVD_PLAYSPEED_NORMAL && m_playSpeed != DVD_PLAYSPEED_PAUSE ? false:m_HasAudio);
           }
-          CLog::Log(LOGDEBUG, "%s::%s player started %d (s:%d a:%d v:%d)", "CDVDPlayer", __FUNCTION__, player, m_playSpeed, m_CurrentAudio.started, m_CurrentVideo.started);
+          CLog::Log(LOGDEBUG, "%s::%s player started %d (s:%d a:%d v:%d)", "CVideoPlayer", __FUNCTION__, player, m_playSpeed, m_CurrentAudio.started, m_CurrentVideo.started);
         }
       }
       else if (pMsg->IsType(CDVDMsg::PLAYER_DISPLAYTIME))
       {
-        CDVDPlayer::SPlayerState& state = ((CDVDMsgType<CDVDPlayer::SPlayerState>*)pMsg)->m_value;
+        CVideoPlayer::SPlayerState& state = ((CDVDMsgType<CVideoPlayer::SPlayerState>*)pMsg)->m_value;
 
         CSingleLock lock(m_StateSection);
         /* prioritize data from video player, but only accept data        *
          * after it has been started to avoid race conditions after seeks */
-        if(m_CurrentVideo.started && !m_dvdPlayerVideo->SubmittedEOS())
+        if(m_CurrentVideo.started && !m_VideoPlayerVideo->SubmittedEOS())
         {
-          if(state.player == DVDPLAYER_VIDEO)
+          if(state.player == VideoPlayer_VIDEO)
             m_State = state;
         }
         else if(m_CurrentAudio.started)
         {
-          if(state.player == DVDPLAYER_AUDIO)
+          if(state.player == VideoPlayer_AUDIO)
             m_State = state;
         }
       }
@@ -2747,7 +2749,7 @@ void CDVDPlayer::HandleMessages()
       else if (pMsg->IsType(CDVDMsg::GENERAL_SYNCHRONIZE))
       {
         if (((CDVDMsgGeneralSynchronize*)pMsg)->Wait(100, SYNCSOURCE_OWNER))
-          CLog::Log(LOGDEBUG, "CDVDPlayer - CDVDMsg::GENERAL_SYNCHRONIZE");
+          CLog::Log(LOGDEBUG, "CVideoPlayer - CDVDMsg::GENERAL_SYNCHRONIZE");
       }
 
     pMsg->Release();
@@ -2755,7 +2757,7 @@ void CDVDPlayer::HandleMessages()
 
 }
 
-void CDVDPlayer::SetCaching(ECacheState state)
+void CVideoPlayer::SetCaching(ECacheState state)
 {
   if(state == CACHESTATE_FLUSH)
   {
@@ -2769,7 +2771,7 @@ void CDVDPlayer::SetCaching(ECacheState state)
   if(m_caching == state)
     return;
 
-  CLog::Log(LOGDEBUG, "CDVDPlayer::SetCaching - caching state %d", state);
+  CLog::Log(LOGDEBUG, "CVideoPlayer::SetCaching - caching state %d", state);
   if(state == CACHESTATE_FULL
   || state == CACHESTATE_INIT
   || state == CACHESTATE_PVR)
@@ -2779,10 +2781,10 @@ void CDVDPlayer::SetCaching(ECacheState state)
     if (m_omxplayer_mode)
       m_OmxPlayerState.av_clock.OMXPause();
 
-    m_dvdPlayerAudio->SetSpeed(DVD_PLAYSPEED_PAUSE);
-    m_dvdPlayerAudio->SendMessage(new CDVDMsg(CDVDMsg::PLAYER_STARTED), 1);
-    m_dvdPlayerVideo->SetSpeed(DVD_PLAYSPEED_PAUSE);
-    m_dvdPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::PLAYER_STARTED), 1);
+    m_VideoPlayerAudio->SetSpeed(DVD_PLAYSPEED_PAUSE);
+    m_VideoPlayerAudio->SendMessage(new CDVDMsg(CDVDMsg::PLAYER_STARTED), 1);
+    m_VideoPlayerVideo->SetSpeed(DVD_PLAYSPEED_PAUSE);
+    m_VideoPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::PLAYER_STARTED), 1);
 
     if (state == CACHESTATE_PVR)
       m_pInputStream->ResetScanTimeout((unsigned int) CSettings::GetInstance().GetInt(CSettings::SETTING_PVRPLAYBACK_SCANTIME) * 1000);
@@ -2792,8 +2794,8 @@ void CDVDPlayer::SetCaching(ECacheState state)
   ||(state == CACHESTATE_DONE && m_caching != CACHESTATE_PLAY))
   {
     m_clock.SetSpeed(m_playSpeed);
-    m_dvdPlayerAudio->SetSpeed(m_playSpeed);
-    m_dvdPlayerVideo->SetSpeed(m_playSpeed);
+    m_VideoPlayerAudio->SetSpeed(m_playSpeed);
+    m_VideoPlayerVideo->SetSpeed(m_playSpeed);
     m_pInputStream->ResetScanTimeout(0);
   }
   m_caching = state;
@@ -2803,25 +2805,25 @@ void CDVDPlayer::SetCaching(ECacheState state)
     m_OmxPlayerState.av_clock.OMXSetSpeedAdjust(0);
 }
 
-void CDVDPlayer::SetPlaySpeed(int speed)
+void CVideoPlayer::SetPlaySpeed(int speed)
 {
   if (IsPlaying())
     m_messenger.Put(new CDVDMsgInt(CDVDMsg::PLAYER_SETSPEED, speed));
   else
     m_playSpeed = speed;
 
-  m_dvdPlayerAudio->SetSpeed(speed);
-  m_dvdPlayerVideo->SetSpeed(speed);
+  m_VideoPlayerAudio->SetSpeed(speed);
+  m_VideoPlayerVideo->SetSpeed(speed);
   SynchronizeDemuxer(100);
 }
 
-bool CDVDPlayer::CanPause()
+bool CVideoPlayer::CanPause()
 {
   CSingleLock lock(m_StateSection);
   return m_State.canpause;
 }
 
-void CDVDPlayer::Pause()
+void CVideoPlayer::Pause()
 {
   CSingleLock lock(m_StateSection);
   if (!m_State.canpause)
@@ -2847,42 +2849,42 @@ void CDVDPlayer::Pause()
   }
 }
 
-bool CDVDPlayer::IsPaused() const
+bool CVideoPlayer::IsPaused() const
 {
   return m_playSpeed == DVD_PLAYSPEED_PAUSE || IsCaching();
 }
 
-bool CDVDPlayer::HasVideo() const
+bool CVideoPlayer::HasVideo() const
 {
   return m_HasVideo;
 }
 
-bool CDVDPlayer::HasAudio() const
+bool CVideoPlayer::HasAudio() const
 {
   return m_HasAudio;
 }
 
-bool CDVDPlayer::HasRDS() const
+bool CVideoPlayer::HasRDS() const
 {
   return m_CurrentRadioRDS.id >= 0;
 }
 
-bool CDVDPlayer::IsPassthrough() const
+bool CVideoPlayer::IsPassthrough() const
 {
-  return m_dvdPlayerAudio->IsPassthrough();
+  return m_VideoPlayerAudio->IsPassthrough();
 }
 
-bool CDVDPlayer::CanSeek()
+bool CVideoPlayer::CanSeek()
 {
   CSingleLock lock(m_StateSection);
   return m_State.canseek;
 }
 
-void CDVDPlayer::Seek(bool bPlus, bool bLargeStep, bool bChapterOverride)
+void CVideoPlayer::Seek(bool bPlus, bool bLargeStep, bool bChapterOverride)
 {
   if( m_playSpeed == DVD_PLAYSPEED_PAUSE && bPlus && !bLargeStep)
   {
-    if (m_dvdPlayerVideo->StepFrame())
+    if (m_VideoPlayerVideo->StepFrame())
       return;
   }
   if (!m_State.canseek)
@@ -2975,8 +2977,8 @@ void CDVDPlayer::Seek(bool bPlus, bool bLargeStep, bool bChapterOverride)
   && (seek > GetTotalTimeInMsec() || seek < 0))
   {
     g_application.SeekTime((seek - time) * 0.001 + g_application.GetTime());
-    // warning, don't access any dvdplayer variables here as
-    // the dvdplayer object may have been destroyed
+    // warning, don't access any VideoPlayer variables here as
+    // the VideoPlayer object may have been destroyed
     return;
   }
 
@@ -2986,7 +2988,7 @@ void CDVDPlayer::Seek(bool bPlus, bool bLargeStep, bool bChapterOverride)
   m_callback.OnPlayBackSeek((int)seek, (int)(seek - time));
 }
 
-bool CDVDPlayer::SeekScene(bool bPlus)
+bool CVideoPlayer::SeekScene(bool bPlus)
 {
   if (!m_Edl.HasSceneMarker())
     return false;
@@ -3012,32 +3014,32 @@ bool CDVDPlayer::SeekScene(bool bPlus)
   return false;
 }
 
-void CDVDPlayer::GetAudioInfo(std::string& strAudioInfo)
+void CVideoPlayer::GetAudioInfo(std::string& strAudioInfo)
 {
   { CSingleLock lock(m_StateSection);
     strAudioInfo = StringUtils::Format("D(%s)", m_StateInput.demux_audio.c_str());
   }
-  strAudioInfo += StringUtils::Format("\nP(%s)", m_dvdPlayerAudio->GetPlayerInfo().c_str());
+  strAudioInfo += StringUtils::Format("\nP(%s)", m_VideoPlayerAudio->GetPlayerInfo().c_str());
 }
 
-void CDVDPlayer::GetVideoInfo(std::string& strVideoInfo)
+void CVideoPlayer::GetVideoInfo(std::string& strVideoInfo)
 {
   { CSingleLock lock(m_StateSection);
     strVideoInfo = StringUtils::Format("D(%s)", m_StateInput.demux_video.c_str());
   }
-  strVideoInfo += StringUtils::Format("\nP(%s)", m_dvdPlayerVideo->GetPlayerInfo().c_str());
+  strVideoInfo += StringUtils::Format("\nP(%s)", m_VideoPlayerVideo->GetPlayerInfo().c_str());
 }
 
-void CDVDPlayer::GetGeneralInfo(std::string& strGeneralInfo)
+void CVideoPlayer::GetGeneralInfo(std::string& strGeneralInfo)
 {
   if (!m_bStop)
   {
     if (m_omxplayer_mode)
     {
-      double dDelay = m_dvdPlayerAudio->GetDelay();
+      double dDelay = m_VideoPlayerAudio->GetDelay();
 
-      double apts = m_dvdPlayerAudio->GetCurrentPts();
-      double vpts = m_dvdPlayerVideo->GetCurrentPts();
+      double apts = m_VideoPlayerAudio->GetCurrentPts();
+      double vpts = m_VideoPlayerVideo->GetCurrentPts();
       double dDiff = 0;
 
       if( apts != DVD_NOPTS_VALUE && vpts != DVD_NOPTS_VALUE )
@@ -3062,19 +3064,19 @@ void CDVDPlayer::GetGeneralInfo(std::string& strGeneralInfo)
           , dDiff
           , strEDL.c_str()
           , (int)(CThread::GetRelativeUsage()*100)
-          , (int)(m_dvdPlayerAudio->GetRelativeUsage()*100)
-          , (int)(m_dvdPlayerVideo->GetRelativeUsage()*100)
+          , (int)(m_VideoPlayerAudio->GetRelativeUsage()*100)
+          , (int)(m_VideoPlayerVideo->GetRelativeUsage()*100)
           , strBuf.c_str()
           , m_OmxPlayerState.audio_fifo
           , m_OmxPlayerState.video_fifo
-          , m_dvdPlayerAudio->GetDynamicRangeAmplification());
+          , m_VideoPlayerAudio->GetDynamicRangeAmplification());
     }
     else
     {
-      double dDelay = m_dvdPlayerVideo->GetDelay() / DVD_TIME_BASE - m_renderManager.GetDisplayLatency();
+      double dDelay = m_VideoPlayerVideo->GetDelay() / DVD_TIME_BASE - m_renderManager.GetDisplayLatency();
 
-      double apts = m_dvdPlayerAudio->GetCurrentPts();
-      double vpts = m_dvdPlayerVideo->GetCurrentPts();
+      double apts = m_VideoPlayerAudio->GetCurrentPts();
+      double vpts = m_VideoPlayerVideo->GetCurrentPts();
       double dDiff = 0;
 
       if( apts != DVD_NOPTS_VALUE && vpts != DVD_NOPTS_VALUE )
@@ -3098,14 +3100,14 @@ void CDVDPlayer::GetGeneralInfo(std::string& strGeneralInfo)
                                            , dDiff
                                            , strEDL.c_str()
                                            , (int)(CThread::GetRelativeUsage()*100)
-                                           , (int)(m_dvdPlayerAudio->GetRelativeUsage()*100)
-                                           , (int)(m_dvdPlayerVideo->GetRelativeUsage()*100)
+                                           , (int)(m_VideoPlayerAudio->GetRelativeUsage()*100)
+                                           , (int)(m_VideoPlayerVideo->GetRelativeUsage()*100)
                                            , strBuf.c_str());
     }
   }
 }
 
-void CDVDPlayer::SeekPercentage(float iPercent)
+void CVideoPlayer::SeekPercentage(float iPercent)
 {
   int64_t iTotalTime = GetTotalTimeInMsec();
 
@@ -3115,7 +3117,7 @@ void CDVDPlayer::SeekPercentage(float iPercent)
   SeekTime((int64_t)(iTotalTime * iPercent / 100));
 }
 
-float CDVDPlayer::GetPercentage()
+float CVideoPlayer::GetPercentage()
 {
   int64_t iTotalTime = GetTotalTimeInMsec();
 
@@ -3125,44 +3127,44 @@ float CDVDPlayer::GetPercentage()
   return GetTime() * 100 / (float)iTotalTime;
 }
 
-float CDVDPlayer::GetCachePercentage()
+float CVideoPlayer::GetCachePercentage()
 {
   CSingleLock lock(m_StateSection);
   return (float) (m_StateInput.cache_offset * 100); // NOTE: Percentage returned is relative
 }
 
-void CDVDPlayer::SetAVDelay(float fValue)
+void CVideoPlayer::SetAVDelay(float fValue)
 {
-  m_dvdPlayerVideo->SetDelay( (fValue * DVD_TIME_BASE) ) ;
+  m_VideoPlayerVideo->SetDelay( (fValue * DVD_TIME_BASE) ) ;
 }
 
-float CDVDPlayer::GetAVDelay()
+float CVideoPlayer::GetAVDelay()
 {
-  return (float) m_dvdPlayerVideo->GetDelay() / (float)DVD_TIME_BASE;
+  return (float) m_VideoPlayerVideo->GetDelay() / (float)DVD_TIME_BASE;
 }
 
-void CDVDPlayer::SetSubTitleDelay(float fValue)
+void CVideoPlayer::SetSubTitleDelay(float fValue)
 {
-  m_dvdPlayerVideo->SetSubtitleDelay(-fValue * DVD_TIME_BASE);
+  m_VideoPlayerVideo->SetSubtitleDelay(-fValue * DVD_TIME_BASE);
 }
 
-float CDVDPlayer::GetSubTitleDelay()
+float CVideoPlayer::GetSubTitleDelay()
 {
-  return (float) -m_dvdPlayerVideo->GetSubtitleDelay() / DVD_TIME_BASE;
+  return (float) -m_VideoPlayerVideo->GetSubtitleDelay() / DVD_TIME_BASE;
 }
 
 // priority: 1: libdvdnav, 2: external subtitles, 3: muxed subtitles
-int CDVDPlayer::GetSubtitleCount()
+int CVideoPlayer::GetSubtitleCount()
 {
   return m_SelectionStreams.Count(STREAM_SUBTITLE);
 }
 
-int CDVDPlayer::GetSubtitle()
+int CVideoPlayer::GetSubtitle()
 {
   return m_SelectionStreams.IndexOf(STREAM_SUBTITLE, *this);
 }
 
-void CDVDPlayer::GetSubtitleStreamInfo(int index, SPlayerSubtitleStreamInfo &info)
+void CVideoPlayer::GetSubtitleStreamInfo(int index, SPlayerSubtitleStreamInfo &info)
 {
   if (index < 0 || index > (int) GetSubtitleCount() - 1)
     return;
@@ -3177,12 +3179,12 @@ void CDVDPlayer::GetSubtitleStreamInfo(int index, SPlayerSubtitleStreamInfo &inf
   info.language = s.language;
 }
 
-void CDVDPlayer::SetSubtitle(int iStream)
+void CVideoPlayer::SetSubtitle(int iStream)
 {
   m_messenger.Put(new CDVDMsgPlayerSetSubtitleStream(iStream));
 }
 
-bool CDVDPlayer::GetSubtitleVisible()
+bool CVideoPlayer::GetSubtitleVisible()
 {
   if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
   {
@@ -3190,55 +3192,55 @@ bool CDVDPlayer::GetSubtitleVisible()
     return pStream->IsSubtitleStreamEnabled();
   }
 
-  return m_dvdPlayerVideo->IsSubtitleEnabled();
+  return m_VideoPlayerVideo->IsSubtitleEnabled();
 }
 
-void CDVDPlayer::SetSubtitleVisible(bool bVisible)
+void CVideoPlayer::SetSubtitleVisible(bool bVisible)
 {
   m_messenger.Put(new CDVDMsgBool(CDVDMsg::PLAYER_SET_SUBTITLESTREAM_VISIBLE, bVisible));
 }
 
-void CDVDPlayer::SetSubtitleVisibleInternal(bool bVisible)
+void CVideoPlayer::SetSubtitleVisibleInternal(bool bVisible)
 {
-  m_dvdPlayerVideo->EnableSubtitle(bVisible);
+  m_VideoPlayerVideo->EnableSubtitle(bVisible);
 
   if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
     static_cast<CDVDInputStreamNavigator*>(m_pInputStream)->EnableSubtitleStream(bVisible);
 }
 
-int CDVDPlayer::GetAudioStreamCount()
+int CVideoPlayer::GetAudioStreamCount()
 {
   return m_SelectionStreams.Count(STREAM_AUDIO);
 }
 
-int CDVDPlayer::GetAudioStream()
+int CVideoPlayer::GetAudioStream()
 {
   return m_SelectionStreams.IndexOf(STREAM_AUDIO, *this);
 }
 
-void CDVDPlayer::SetAudioStream(int iStream)
+void CVideoPlayer::SetAudioStream(int iStream)
 {
   m_messenger.Put(new CDVDMsgPlayerSetAudioStream(iStream));
   SynchronizeDemuxer(100);
 }
 
-TextCacheStruct_t* CDVDPlayer::GetTeletextCache()
+TextCacheStruct_t* CVideoPlayer::GetTeletextCache()
 {
   if (m_CurrentTeletext.id < 0)
     return 0;
 
-  return m_dvdPlayerTeletext->GetTeletextCache();
+  return m_VideoPlayerTeletext->GetTeletextCache();
 }
 
-void CDVDPlayer::LoadPage(int p, int sp, unsigned char* buffer)
+void CVideoPlayer::LoadPage(int p, int sp, unsigned char* buffer)
 {
   if (m_CurrentTeletext.id < 0)
       return;
 
-  return m_dvdPlayerTeletext->LoadPage(p, sp, buffer);
+  return m_VideoPlayerTeletext->LoadPage(p, sp, buffer);
 }
 
-std::string CDVDPlayer::GetRadioText(unsigned int line)
+std::string CVideoPlayer::GetRadioText(unsigned int line)
 {
   if (m_CurrentRadioRDS.id < 0)
       return "";
@@ -3246,7 +3248,7 @@ std::string CDVDPlayer::GetRadioText(unsigned int line)
   return m_dvdPlayerRadioRDS->GetRadioText(line);
 }
 
-void CDVDPlayer::SeekTime(int64_t iTime)
+void CVideoPlayer::SeekTime(int64_t iTime)
 {
   int seekOffset = (int)(iTime - GetTime());
   m_messenger.Put(new CDVDMsgPlayerSeek((int)iTime, true, true, true));
@@ -3254,7 +3256,7 @@ void CDVDPlayer::SeekTime(int64_t iTime)
   m_callback.OnPlayBackSeek((int)iTime, seekOffset);
 }
 
-bool CDVDPlayer::SeekTimeRelative(int64_t iTime)
+bool CVideoPlayer::SeekTimeRelative(int64_t iTime)
 {
   int64_t abstime = GetTime() + iTime;
   m_messenger.Put(new CDVDMsgPlayerSeek((int)abstime, (iTime < 0) ? true : false, true, false));
@@ -3264,7 +3266,7 @@ bool CDVDPlayer::SeekTimeRelative(int64_t iTime)
 }
 
 // return the time in milliseconds
-int64_t CDVDPlayer::GetTime()
+int64_t CVideoPlayer::GetTime()
 {
   CSingleLock lock(m_StateSection);
   double offset = 0;
@@ -3280,7 +3282,7 @@ int64_t CDVDPlayer::GetTime()
 }
 
 // return the time in milliseconds
-int64_t CDVDPlayer::GetDisplayTime()
+int64_t CVideoPlayer::GetDisplayTime()
 {
   CSingleLock lock(m_StateSection);
   double offset = 0;
@@ -3301,19 +3303,19 @@ int64_t CDVDPlayer::GetDisplayTime()
 }
 
 // return length in msec
-int64_t CDVDPlayer::GetTotalTimeInMsec()
+int64_t CVideoPlayer::GetTotalTimeInMsec()
 {
   CSingleLock lock(m_StateSection);
   return llrint(m_State.time_total);
 }
 
 // return length in seconds.. this should be changed to return in milleseconds throughout xbmc
-int64_t CDVDPlayer::GetTotalTime()
+int64_t CVideoPlayer::GetTotalTime()
 {
   return GetTotalTimeInMsec();
 }
 
-void CDVDPlayer::ToFFRW(int iSpeed)
+void CVideoPlayer::ToFFRW(int iSpeed)
 {
   // can't rewind in menu as seeking isn't possible
   // forward is fine
@@ -3321,7 +3323,7 @@ void CDVDPlayer::ToFFRW(int iSpeed)
   SetPlaySpeed(iSpeed * DVD_PLAYSPEED_NORMAL);
 }
 
-bool CDVDPlayer::OpenStream(CCurrentStream& current, int iStream, int source, bool reset)
+bool CVideoPlayer::OpenStream(CCurrentStream& current, int iStream, int source, bool reset)
 {
   CDemuxStream* stream = NULL;
   CDVDStreamInfo hint;
@@ -3344,7 +3346,7 @@ bool CDVDPlayer::OpenStream(CCurrentStream& current, int iStream, int source, bo
       m_pSubtitleDemuxer = demux.release();
     }
 
-    double pts = m_dvdPlayerVideo->GetCurrentPts();
+    double pts = m_VideoPlayerVideo->GetCurrentPts();
     if(pts == DVD_NOPTS_VALUE)
       pts = m_CurrentVideo.dts;
     if(pts == DVD_NOPTS_VALUE)
@@ -3450,7 +3452,7 @@ bool CDVDPlayer::OpenStream(CCurrentStream& current, int iStream, int source, bo
   return res;
 }
 
-bool CDVDPlayer::OpenStreamPlayer(CCurrentStream& current, CDVDStreamInfo& hint, bool reset)
+bool CVideoPlayer::OpenStreamPlayer(CCurrentStream& current, CDVDStreamInfo& hint, bool reset)
 {
   IDVDStreamPlayer* player = GetStreamPlayer(current.player);
   if(player == NULL)
@@ -3470,7 +3472,7 @@ bool CDVDPlayer::OpenStreamPlayer(CCurrentStream& current, CDVDStreamInfo& hint,
   return true;
 }
 
-bool CDVDPlayer::OpenAudioStream(CDVDStreamInfo& hint, bool reset)
+bool CVideoPlayer::OpenAudioStream(CDVDStreamInfo& hint, bool reset)
 {
   if(!OpenStreamPlayer(m_CurrentAudio, hint, reset))
     return false;
@@ -3478,12 +3480,12 @@ bool CDVDPlayer::OpenAudioStream(CDVDStreamInfo& hint, bool reset)
   m_HasAudio = true;
 
   /* we are potentially going to be waiting on this */
-  m_dvdPlayerAudio->SendMessage(new CDVDMsg(CDVDMsg::PLAYER_STARTED), 1);
+  m_VideoPlayerAudio->SendMessage(new CDVDMsg(CDVDMsg::PLAYER_STARTED), 1);
 
   return true;
 }
 
-bool CDVDPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset)
+bool CVideoPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset)
 {
   if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
   {
@@ -3538,13 +3540,13 @@ bool CDVDPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset)
   }
 
   /* we are potentially going to be waiting on this */
-  m_dvdPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::PLAYER_STARTED), 1);
+  m_VideoPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::PLAYER_STARTED), 1);
 
   return true;
 
 }
 
-bool CDVDPlayer::OpenSubtitleStream(CDVDStreamInfo& hint)
+bool CVideoPlayer::OpenSubtitleStream(CDVDStreamInfo& hint)
 {
   if(!OpenStreamPlayer(m_CurrentSubtitle, hint, true))
     return false;
@@ -3552,7 +3554,7 @@ bool CDVDPlayer::OpenSubtitleStream(CDVDStreamInfo& hint)
   return true;
 }
 
-bool CDVDPlayer::AdaptForcedSubtitles()
+bool CVideoPlayer::AdaptForcedSubtitles()
 {
   bool valid = false;
   SelectionStream ss = m_SelectionStreams.Get(STREAM_SUBTITLE, GetSubtitle());
@@ -3581,9 +3583,9 @@ bool CDVDPlayer::AdaptForcedSubtitles()
   return valid;
 }
 
-bool CDVDPlayer::OpenTeletextStream(CDVDStreamInfo& hint)
+bool CVideoPlayer::OpenTeletextStream(CDVDStreamInfo& hint)
 {
-  if (!m_dvdPlayerTeletext->CheckStream(hint))
+  if (!m_VideoPlayerTeletext->CheckStream(hint))
     return false;
 
   if(!OpenStreamPlayer(m_CurrentTeletext, hint, true))
@@ -3592,7 +3594,7 @@ bool CDVDPlayer::OpenTeletextStream(CDVDStreamInfo& hint)
   return true;
 }
 
-bool CDVDPlayer::OpenRadioRDSStream(CDVDStreamInfo& hint)
+bool CVideoPlayer::OpenRadioRDSStream(CDVDStreamInfo& hint)
 {
   if (!m_dvdPlayerRadioRDS->CheckStream(hint))
     return false;
@@ -3603,7 +3605,7 @@ bool CDVDPlayer::OpenRadioRDSStream(CDVDStreamInfo& hint)
   return true;
 }
 
-bool CDVDPlayer::CloseStream(CCurrentStream& current, bool bWaitForBuffers)
+bool CVideoPlayer::CloseStream(CCurrentStream& current, bool bWaitForBuffers)
 {
   if (current.id < 0)
     return false;
@@ -3622,7 +3624,7 @@ bool CDVDPlayer::CloseStream(CCurrentStream& current, bool bWaitForBuffers)
   return true;
 }
 
-void CDVDPlayer::UpdateClockMaster()
+void CVideoPlayer::UpdateClockMaster()
 {
   EMasterClock clock;
   if(m_CurrentAudio.id >= 0)
@@ -3648,7 +3650,7 @@ void CDVDPlayer::UpdateClockMaster()
   }
 }
 
-void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate, bool sync)
+void CVideoPlayer::FlushBuffers(bool queued, double pts, bool accurate, bool sync)
 {
   double startpts;
   if(accurate && !m_omxplayer_mode)
@@ -3686,21 +3688,21 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate, bool sync)
 
   if(queued)
   {
-    m_dvdPlayerAudio->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_RESET));
-    m_dvdPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_RESET));
-    m_dvdPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::VIDEO_NOSKIP));
-    m_dvdPlayerSubtitle->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_RESET));
-    m_dvdPlayerTeletext->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_RESET));
-    m_dvdPlayerRadioRDS->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_RESET));
+    m_VideoPlayerAudio->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_RESET));
+    m_VideoPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_RESET));
+    m_VideoPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::VIDEO_NOSKIP));
+    m_VideoPlayerSubtitle->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_RESET));
+    m_VideoPlayerTeletext->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_RESET));
+    m_VideoPlayerRadioRDS->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_RESET));
     SynchronizePlayers(SYNCSOURCE_ALL);
   }
   else
   {
-    m_dvdPlayerAudio->Flush();
-    m_dvdPlayerVideo->Flush();
-    m_dvdPlayerSubtitle->Flush();
-    m_dvdPlayerTeletext->Flush();
-    m_dvdPlayerRadioRDS->Flush();
+    m_VideoPlayerAudio->Flush();
+    m_VideoPlayerVideo->Flush();
+    m_VideoPlayerSubtitle->Flush();
+    m_VideoPlayerTeletext->Flush();
+    m_VideoPlayerRadioRDS->Flush();
 
     // clear subtitle and menu overlays
     m_overlayContainer.Clear();
@@ -3710,8 +3712,8 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate, bool sync)
     {
       // make sure players are properly flushed, should put them in stalled state
       CDVDMsgGeneralSynchronize* msg = new CDVDMsgGeneralSynchronize(1000, 0);
-      m_dvdPlayerAudio->SendMessage(msg->Acquire(), 1);
-      m_dvdPlayerVideo->SendMessage(msg->Acquire(), 1);
+      m_VideoPlayerAudio->SendMessage(msg->Acquire(), 1);
+      m_VideoPlayerVideo->SendMessage(msg->Acquire(), 1);
       msg->Wait(&m_bStop, 0);
       msg->Release();
 
@@ -3747,7 +3749,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate, bool sync)
   }
 }
 
-void CDVDPlayer::TriggerResync()
+void CVideoPlayer::TriggerResync()
 {
   m_CurrentAudio.inited      = false;
   m_CurrentVideo.inited      = false;
@@ -3759,21 +3761,21 @@ void CDVDPlayer::TriggerResync()
   m_CurrentSubtitle.startpts = DVD_NOPTS_VALUE;
   m_CurrentTeletext.startpts = DVD_NOPTS_VALUE;
 
-  m_dvdPlayerAudio->FlushMessages();
-  m_dvdPlayerVideo->FlushMessages();
-  m_dvdPlayerSubtitle->FlushMessages();
-  m_dvdPlayerTeletext->FlushMessages();
+  m_VideoPlayerAudio->FlushMessages();
+  m_VideoPlayerVideo->FlushMessages();
+  m_VideoPlayerSubtitle->FlushMessages();
+  m_VideoPlayerTeletext->FlushMessages();
 
   // make sure players are properly flushed, should put them in stalled state
   CDVDMsgGeneralSynchronize* msg = new CDVDMsgGeneralSynchronize(1000, 0);
-  m_dvdPlayerAudio->SendMessage(msg->Acquire(), 1);
-  m_dvdPlayerVideo->SendMessage(msg->Acquire(), 1);
+  m_VideoPlayerAudio->SendMessage(msg->Acquire(), 1);
+  m_VideoPlayerVideo->SendMessage(msg->Acquire(), 1);
   msg->Wait(&m_bStop, 0);
   msg->Release();
 }
 
 // since we call ffmpeg functions to decode, this is being called in the same thread as ::Process() is
-int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage)
+int CVideoPlayer::OnDVDNavResult(void* pData, int iMessage)
 {
   if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_BLURAY))
   {
@@ -3786,7 +3788,7 @@ int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage)
     else if(iMessage == 3)
       m_dvd.iSelectedSPUStream   = *(int*)pData;
     else if(iMessage == 4)
-      m_dvdPlayerVideo->EnableSubtitle(*(int*)pData ? true: false);
+      m_VideoPlayerVideo->EnableSubtitle(*(int*)pData ? true: false);
     else if(iMessage == 5)
     {
       if (m_dvd.state != DVDSTATE_STILL)
@@ -3800,7 +3802,7 @@ int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage)
         unsigned int time = 0;
         if( m_CurrentVideo.stream && m_dvd.iDVDStillTime > 0 )
         {
-          time = (unsigned int)(m_dvdPlayerVideo->GetOutputDelay() / ( DVD_TIME_BASE / 1000 ));
+          time = (unsigned int)(m_VideoPlayerVideo->GetOutputDelay() / ( DVD_TIME_BASE / 1000 ));
           if( time < 10000 && time > 0 )
             m_dvd.iDVDStillTime += time;
         }
@@ -3813,7 +3815,7 @@ int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage)
     else if (iMessage == 6)
     {
       m_dvd.state = DVDSTATE_NORMAL;
-      CLog::Log(LOGDEBUG, "CDVDPlayer::OnDVDNavResult - libbluray read error (DVDSTATE_NORMAL)");
+      CLog::Log(LOGDEBUG, "CVideoPlayer::OnDVDNavResult - libbluray read error (DVDSTATE_NORMAL)");
       CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(25008), g_localizeStrings.Get(25009));
     }
 
@@ -3849,7 +3851,7 @@ int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage)
           unsigned int time = 0;
           if( m_CurrentVideo.stream && m_dvd.iDVDStillTime > 0 )
           {
-            time = (unsigned int)(m_dvdPlayerVideo->GetOutputDelay() / ( DVD_TIME_BASE / 1000 ));
+            time = (unsigned int)(m_VideoPlayerVideo->GetOutputDelay() / ( DVD_TIME_BASE / 1000 ));
             if( time < 10000 && time > 0 )
               m_dvd.iDVDStillTime += time;
           }
@@ -3863,7 +3865,7 @@ int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage)
       break;
     case DVDNAV_SPU_CLUT_CHANGE:
       {
-        m_dvdPlayerSubtitle->SendMessage(new CDVDMsgSubtitleClutChange((uint8_t*)pData));
+        m_VideoPlayerSubtitle->SendMessage(new CDVDMsgSubtitleClutChange((uint8_t*)pData));
       }
       break;
     case DVDNAV_SPU_STREAM_CHANGE:
@@ -3903,7 +3905,7 @@ int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage)
         //dvdnav_highlight_event_t* pInfo = (dvdnav_highlight_event_t*)pData;
         int iButton = pStream->GetCurrentButton();
         CLog::Log(LOGDEBUG, "DVDNAV_HIGHLIGHT: Highlight button %d\n", iButton);
-        m_dvdPlayerSubtitle->UpdateOverlayInfo((CDVDInputStreamNavigator*)m_pInputStream, LIBDVDNAV_BUTTON_NORMAL);
+        m_VideoPlayerSubtitle->UpdateOverlayInfo((CDVDInputStreamNavigator*)m_pInputStream, LIBDVDNAV_BUTTON_NORMAL);
       }
       break;
     case DVDNAV_VTS_CHANGE:
@@ -3916,8 +3918,8 @@ int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage)
 
         //Force an aspect ratio that is set in the dvdheaders if available
         m_CurrentVideo.hint.aspect = pStream->GetVideoAspectRatio();
-        if( m_dvdPlayerVideo->IsInited() )
-          m_dvdPlayerVideo->SendMessage(new CDVDMsgDouble(CDVDMsg::VIDEO_SET_ASPECT, m_CurrentVideo.hint.aspect));
+        if( m_VideoPlayerVideo->IsInited() )
+          m_VideoPlayerVideo->SendMessage(new CDVDMsgDouble(CDVDMsg::VIDEO_SET_ASPECT, m_CurrentVideo.hint.aspect));
 
         m_SelectionStreams.Clear(STREAM_NONE, STREAM_SOURCE_NAV);
         m_SelectionStreams.Update(m_pInputStream, m_pDemuxer);
@@ -3932,8 +3934,8 @@ int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage)
 
         m_dvd.state = DVDSTATE_NORMAL;
 
-        if( m_dvdPlayerVideo->IsInited() )
-          m_dvdPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::VIDEO_NOSKIP));
+        if( m_VideoPlayerVideo->IsInited() )
+          m_VideoPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::VIDEO_NOSKIP));
       }
       break;
     case DVDNAV_NAV_PACKET:
@@ -3977,7 +3979,7 @@ int CDVDPlayer::OnDVDNavResult(void* pData, int iMessage)
   return NAVRESULT_NOP;
 }
 
-bool CDVDPlayer::ShowPVRChannelInfo(void)
+bool CVideoPlayer::ShowPVRChannelInfo(void)
 {
   bool bReturn(false);
 
@@ -3991,7 +3993,7 @@ bool CDVDPlayer::ShowPVRChannelInfo(void)
   return bReturn;
 }
 
-bool CDVDPlayer::OnAction(const CAction &action)
+bool CVideoPlayer::OnAction(const CAction &action)
 {
 #define THREAD_ACTION(action) \
   do { \
@@ -4151,7 +4153,7 @@ bool CDVDPlayer::OnAction(const CAction &action)
           CLog::Log(LOGDEBUG, " - button select");
           // show button pushed overlay
           if(m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
-            m_dvdPlayerSubtitle->UpdateOverlayInfo((CDVDInputStreamNavigator*)m_pInputStream, LIBDVDNAV_BUTTON_CLICKED);
+            m_VideoPlayerSubtitle->UpdateOverlayInfo((CDVDInputStreamNavigator*)m_pInputStream, LIBDVDNAV_BUTTON_CLICKED);
 
           pMenus->ActivateButton();
         }
@@ -4265,7 +4267,7 @@ bool CDVDPlayer::OnAction(const CAction &action)
   return false;
 }
 
-bool CDVDPlayer::IsInMenu() const
+bool CVideoPlayer::IsInMenu() const
 {
   CDVDInputStream::IMenus* pStream = dynamic_cast<CDVDInputStream::IMenus*>(m_pInputStream);
   if (pStream)
@@ -4278,7 +4280,7 @@ bool CDVDPlayer::IsInMenu() const
   return false;
 }
 
-bool CDVDPlayer::HasMenu()
+bool CVideoPlayer::HasMenu()
 {
   CDVDInputStream::IMenus* pStream = dynamic_cast<CDVDInputStream::IMenus*>(m_pInputStream);
   if (pStream)
@@ -4287,31 +4289,31 @@ bool CDVDPlayer::HasMenu()
     return false;
 }
 
-std::string CDVDPlayer::GetPlayerState()
+std::string CVideoPlayer::GetPlayerState()
 {
   CSingleLock lock(m_StateSection);
   return m_State.player_state;
 }
 
-bool CDVDPlayer::SetPlayerState(const std::string& state)
+bool CVideoPlayer::SetPlayerState(const std::string& state)
 {
   m_messenger.Put(new CDVDMsgPlayerSetState(state));
   return true;
 }
 
-int CDVDPlayer::GetChapterCount()
+int CVideoPlayer::GetChapterCount()
 {
   CSingleLock lock(m_StateSection);
   return m_State.chapters.size();
 }
 
-int CDVDPlayer::GetChapter()
+int CVideoPlayer::GetChapter()
 {
   CSingleLock lock(m_StateSection);
   return m_State.chapter;
 }
 
-void CDVDPlayer::GetChapterName(std::string& strChapterName, int chapterIdx)
+void CVideoPlayer::GetChapterName(std::string& strChapterName, int chapterIdx)
 {
   CSingleLock lock(m_StateSection);
   if (chapterIdx == -1 && m_State.chapter > 0 && m_State.chapter <= (int) m_State.chapters.size())
@@ -4320,7 +4322,7 @@ void CDVDPlayer::GetChapterName(std::string& strChapterName, int chapterIdx)
     strChapterName = m_State.chapters[chapterIdx - 1].first;
 }
 
-int CDVDPlayer::SeekChapter(int iChapter)
+int CVideoPlayer::SeekChapter(int iChapter)
 {
   if (GetChapter() > 0)
   {
@@ -4337,7 +4339,7 @@ int CDVDPlayer::SeekChapter(int iChapter)
   return 0;
 }
 
-int64_t CDVDPlayer::GetChapterPos(int chapterIdx)
+int64_t CVideoPlayer::GetChapterPos(int chapterIdx)
 {
   CSingleLock lock(m_StateSection);
   if (chapterIdx > 0 && chapterIdx <= (int) m_StateInput.chapters.size())
@@ -4346,27 +4348,27 @@ int64_t CDVDPlayer::GetChapterPos(int chapterIdx)
   return -1;
 }
 
-void CDVDPlayer::AddSubtitle(const std::string& strSubPath)
+void CVideoPlayer::AddSubtitle(const std::string& strSubPath)
 {
   m_messenger.Put(new CDVDMsgType<std::string>(CDVDMsg::SUBTITLE_ADDFILE, strSubPath));
 }
 
-int CDVDPlayer::GetCacheLevel() const
+int CVideoPlayer::GetCacheLevel() const
 {
   CSingleLock lock(m_StateSection);
   return (int)(m_StateInput.cache_level * 100);
 }
 
-double CDVDPlayer::GetQueueTime()
+double CVideoPlayer::GetQueueTime()
 {
-  int a = m_dvdPlayerAudio->GetLevel();
-  int v = m_dvdPlayerVideo->GetLevel();
+  int a = m_VideoPlayerAudio->GetLevel();
+  int v = m_VideoPlayerVideo->GetLevel();
   return std::max(a, v) * 8000.0 / 100;
 }
 
-void CDVDPlayer::GetVideoStreamInfo(SPlayerVideoStreamInfo &info)
+void CVideoPlayer::GetVideoStreamInfo(SPlayerVideoStreamInfo &info)
 {
-  info.bitrate = m_dvdPlayerVideo->GetVideoBitrate();
+  info.bitrate = m_VideoPlayerVideo->GetVideoBitrate();
 
   std::string retVal;
   if (m_pDemuxer && (m_CurrentVideo.id != -1))
@@ -4383,12 +4385,12 @@ void CDVDPlayer::GetVideoStreamInfo(SPlayerVideoStreamInfo &info)
   info.videoAspectRatio = m_renderManager.GetAspectRatio();
   CRect viewRect;
   m_renderManager.GetVideoRect(info.SrcRect, info.DestRect, viewRect);
-  info.stereoMode = m_dvdPlayerVideo->GetStereoMode();
+  info.stereoMode = m_VideoPlayerVideo->GetStereoMode();
   if (info.stereoMode == "mono")
     info.stereoMode = "";
 }
 
-int CDVDPlayer::GetSourceBitrate()
+int CVideoPlayer::GetSourceBitrate()
 {
   if (m_pInputStream)
     return (int)m_pInputStream->GetBitstreamStats().GetBitrate();
@@ -4396,7 +4398,7 @@ int CDVDPlayer::GetSourceBitrate()
   return 0;
 }
 
-void CDVDPlayer::GetAudioStreamInfo(int index, SPlayerAudioStreamInfo &info)
+void CVideoPlayer::GetAudioStreamInfo(int index, SPlayerAudioStreamInfo &info)
 {
   if (index == CURRENT_STREAM)
     index = GetAudioStream();
@@ -4406,8 +4408,8 @@ void CDVDPlayer::GetAudioStreamInfo(int index, SPlayerAudioStreamInfo &info)
 
   if (index == GetAudioStream())
   {
-    info.bitrate = m_dvdPlayerAudio->GetAudioBitrate();
-    info.channels = m_dvdPlayerAudio->GetAudioChannels();
+    info.bitrate = m_VideoPlayerAudio->GetAudioBitrate();
+    info.channels = m_VideoPlayerAudio->GetAudioChannels();
   }
   else if (m_pDemuxer)
   {
@@ -4441,7 +4443,7 @@ void CDVDPlayer::GetAudioStreamInfo(int index, SPlayerAudioStreamInfo &info)
   }
 }
 
-int CDVDPlayer::AddSubtitleFile(const std::string& filename, const std::string& subfilename)
+int CVideoPlayer::AddSubtitleFile(const std::string& filename, const std::string& subfilename)
 {
   std::string ext = URIUtils::GetExtension(filename);
   std::string vobsubfile = subfilename;
@@ -4502,7 +4504,7 @@ int CDVDPlayer::AddSubtitleFile(const std::string& filename, const std::string&
   return m_SelectionStreams.IndexOf(STREAM_SUBTITLE, s.source, s.id);
 }
 
-void CDVDPlayer::UpdatePlayState(double timeout)
+void CVideoPlayer::UpdatePlayState(double timeout)
 {
   if(m_StateInput.timestamp != 0
   && m_StateInput.timestamp + DVD_MSEC_TO_TIME(timeout) > CDVDClock::GetAbsoluteClock())
@@ -4596,7 +4598,7 @@ void CDVDPlayer::UpdatePlayState(double timeout)
   state.disptime = state.time;
   if (m_CurrentVideo.id >= 0 && state.time_src == ETIMESOURCE_CLOCK)
   {
-    double pts = m_dvdPlayerVideo->GetCurrentPts();
+    double pts = m_VideoPlayerVideo->GetCurrentPts();
     if (pts != DVD_NOPTS_VALUE)
     {
       state.disptime = DVD_TIME_TO_MSEC(pts + m_offset_pts);
@@ -4661,7 +4663,7 @@ void CDVDPlayer::UpdatePlayState(double timeout)
   m_StateInput = state;
 }
 
-void CDVDPlayer::UpdateApplication(double timeout)
+void CVideoPlayer::UpdateApplication(double timeout)
 {
   if(m_UpdateApplication != 0
   && m_UpdateApplication + DVD_MSEC_TO_TIME(timeout) > CDVDClock::GetAbsoluteClock())
@@ -4680,19 +4682,19 @@ void CDVDPlayer::UpdateApplication(double timeout)
   m_UpdateApplication = CDVDClock::GetAbsoluteClock();
 }
 
-bool CDVDPlayer::CanRecord()
+bool CVideoPlayer::CanRecord()
 {
   CSingleLock lock(m_StateSection);
   return m_State.canrecord;
 }
 
-bool CDVDPlayer::IsRecording()
+bool CVideoPlayer::IsRecording()
 {
   CSingleLock lock(m_StateSection);
   return m_State.recording;
 }
 
-bool CDVDPlayer::Record(bool bOnOff)
+bool CVideoPlayer::Record(bool bOnOff)
 {
   if (m_pInputStream && (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_TV) ||
                          m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER)) )
@@ -4703,7 +4705,7 @@ bool CDVDPlayer::Record(bool bOnOff)
   return false;
 }
 
-bool CDVDPlayer::GetStreamDetails(CStreamDetails &details)
+bool CVideoPlayer::GetStreamDetails(CStreamDetails &details)
 {
   if (m_pDemuxer)
   {
@@ -4723,8 +4725,8 @@ bool CDVDPlayer::GetStreamDetails(CStreamDetails &details)
     if (result && details.GetStreamCount(CStreamDetail::VIDEO) > 0) // this is more correct (dvds in particular)
     {
       /* 
-       * We can only obtain the aspect & duration from dvdplayer when the Process() thread is running
-       * and UpdatePlayState() has been called at least once. In this case dvdplayer duration/AR will
+       * We can only obtain the aspect & duration from VideoPlayer when the Process() thread is running
+       * and UpdatePlayState() has been called at least once. In this case VideoPlayer duration/AR will
        * return 0 and we'll have to fallback to the (less accurate) info from the demuxer.
        */
       float aspect = m_renderManager.GetAspectRatio();
@@ -4741,17 +4743,17 @@ bool CDVDPlayer::GetStreamDetails(CStreamDetails &details)
     return false;
 }
 
-std::string CDVDPlayer::GetPlayingTitle()
+std::string CVideoPlayer::GetPlayingTitle()
 {
   /* Currently we support only Title Name from Teletext line 30 */
-  TextCacheStruct_t* ttcache = m_dvdPlayerTeletext->GetTeletextCache();
+  TextCacheStruct_t* ttcache = m_VideoPlayerTeletext->GetTeletextCache();
   if (ttcache && !ttcache->line30.empty())
     return ttcache->line30;
 
   return "";
 }
 
-bool CDVDPlayer::SwitchChannel(const CPVRChannelPtr &channel)
+bool CVideoPlayer::SwitchChannel(const CPVRChannelPtr &channel)
 {
   if (g_PVRManager.IsPlayingChannel(channel))
     return false; // desired channel already active, nothing to do.
@@ -4772,111 +4774,110 @@ bool CDVDPlayer::SwitchChannel(const CPVRChannelPtr &channel)
   return true;
 }
 
-bool CDVDPlayer::CachePVRStream(void) const
+bool CVideoPlayer::CachePVRStream(void) const
 {
   return m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER) &&
-      !g_PVRManager.IsPlayingRecording() &&
-      g_advancedSettings.m_bPVRCacheInDvdPlayer;
+         !g_PVRManager.IsPlayingRecording();
 }
 
-void CDVDPlayer::FrameMove()
+void CVideoPlayer::FrameMove()
 {
   m_renderManager.FrameMove();
   m_renderManager.UpdateResolution();
   m_renderManager.ManageCaptures();
 }
 
-void CDVDPlayer::FrameWait(int ms)
+void CVideoPlayer::FrameWait(int ms)
 {
   m_renderManager.FrameWait(ms);
 }
 
-bool CDVDPlayer::HasFrame()
+bool CVideoPlayer::HasFrame()
 {
   m_renderManager.HasFrame();
 }
 
-void CDVDPlayer::Render(bool clear, uint32_t alpha, bool gui)
+void CVideoPlayer::Render(bool clear, uint32_t alpha, bool gui)
 {
   m_renderManager.Render(clear, 0, alpha, gui);
 }
 
-void CDVDPlayer::AfterRender()
+void CVideoPlayer::AfterRender()
 {
   m_renderManager.FrameFinish();
 }
 
-void CDVDPlayer::FlushRenderer()
+void CVideoPlayer::FlushRenderer()
 {
   m_renderManager.Flush();
 }
 
-void CDVDPlayer::SetRenderViewMode(int mode)
+void CVideoPlayer::SetRenderViewMode(int mode)
 {
   m_renderManager.SetViewMode(mode);
 }
 
-float CDVDPlayer::GetRenderAspectRatio()
+float CVideoPlayer::GetRenderAspectRatio()
 {
   return m_renderManager.GetAspectRatio();
 }
 
-RESOLUTION CDVDPlayer::GetRenderResolution()
+RESOLUTION CVideoPlayer::GetRenderResolution()
 {
   return m_renderManager.GetResolution();
 }
 
-bool CDVDPlayer::IsRenderingVideo()
+bool CVideoPlayer::IsRenderingVideo()
 {
   return m_renderManager.IsConfigured();
 }
 
-bool CDVDPlayer::IsRenderingGuiLayer()
+bool CVideoPlayer::IsRenderingGuiLayer()
 {
   return m_renderManager.IsGuiLayer();
 }
 
-bool CDVDPlayer::IsRenderingVideoLayer()
+bool CVideoPlayer::IsRenderingVideoLayer()
 {
   return m_renderManager.IsVideoLayer();
 }
 
-bool CDVDPlayer::Supports(EDEINTERLACEMODE mode)
+bool CVideoPlayer::Supports(EDEINTERLACEMODE mode)
 {
   return m_renderManager.Supports(mode);
 }
 
-bool CDVDPlayer::Supports(EINTERLACEMETHOD method)
+bool CVideoPlayer::Supports(EINTERLACEMETHOD method)
 {
   return m_renderManager.Supports(method);
 }
 
-bool CDVDPlayer::Supports(ESCALINGMETHOD method)
+bool CVideoPlayer::Supports(ESCALINGMETHOD method)
 {
   return m_renderManager.Supports(method);
 }
 
-bool CDVDPlayer::Supports(ERENDERFEATURE feature)
+bool CVideoPlayer::Supports(ERENDERFEATURE feature)
 {
   return m_renderManager.Supports(feature);
 }
 
-CRenderCapture *CDVDPlayer::RenderCaptureAlloc()
+CRenderCapture *CVideoPlayer::RenderCaptureAlloc()
 {
   return m_renderManager.AllocRenderCapture();
 }
 
-void CDVDPlayer::RenderCapture(CRenderCapture* capture, unsigned int width, unsigned int height, int flags)
+void CVideoPlayer::RenderCapture(CRenderCapture* capture, unsigned int width, unsigned int height, int flags)
 {
   m_renderManager.Capture(capture, width, height, flags);
 }
 
-void CDVDPlayer::RenderCaptureRelease(CRenderCapture* capture)
+void CVideoPlayer::RenderCaptureRelease(CRenderCapture* capture)
 {
   m_renderManager.ReleaseRenderCapture(capture);
 }
 
-std::string CDVDPlayer::GetRenderVSyncState()
+std::string CVideoPlayer::GetRenderVSyncState()
 {
   return m_renderManager.GetVSyncState();
 }
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/VideoPlayer/VideoPlayer.h
index 393e2d6c87..fb635a3707 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.h
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.h
@@ -22,19 +22,17 @@
 
 #include <utility>
 #include "cores/IPlayer.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "threads/Thread.h"
-
-#include "cores/IPlayer.h"
-#include "DVDClock.h"
+#include "IVideoPlayer.h"
 #include "DVDMessageQueue.h"
+#include "DVDClock.h"
+#include "VideoPlayerVideo.h"
+#include "VideoPlayerSubtitle.h"
+#include "VideoPlayerTeletext.h"
 #include "DVDPlayerRadioRDS.h"
-#include "DVDPlayerSubtitle.h"
-#include "DVDPlayerTeletext.h"
-#include "DVDPlayerVideo.h"
 #include "Edl.h"
 #include "FileItem.h"
-#include "IDVDPlayer.h"
 #include "system.h"
 #include "threads/SystemClock.h"
 #include "threads/Thread.h"
@@ -93,7 +91,7 @@ class CDemuxStreamVideo;
 class CDemuxStreamAudio;
 class CStreamInfo;
 class CDVDDemuxCC;
-class CDVDPlayer;
+class CVideoPlayer;
 
 namespace PVR
 {
@@ -188,7 +186,7 @@ public:
   std::vector<SelectionStream> m_Streams;
 
   int              IndexOf (StreamType type, int source, int id) const;
-  int              IndexOf (StreamType type, CDVDPlayer& p) const;
+  int              IndexOf (StreamType type, CVideoPlayer& p) const;
   int              Count   (StreamType type) const { return IndexOf(type, STREAM_SOURCE_NONE, -1) + 1; }
   int              CountSource(StreamType type, StreamSource source) const;
   SelectionStream& Get     (StreamType type, int index);
@@ -210,17 +208,17 @@ public:
 };
 
 
-#define DVDPLAYER_AUDIO    1
-#define DVDPLAYER_VIDEO    2
-#define DVDPLAYER_SUBTITLE 3
-#define DVDPLAYER_TELETEXT 4
-#define DVDPLAYER_RDS      5
+#define VideoPlayer_AUDIO    1
+#define VideoPlayer_VIDEO    2
+#define VideoPlayer_SUBTITLE 3
+#define VideoPlayer_TELETEXT 4
+#define VideoPlayer_RDS      5
 
-class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer
+class CVideoPlayer : public IPlayer, public CThread, public IVideoPlayer
 {
 public:
-  CDVDPlayer(IPlayerCallback& callback);
-  virtual ~CDVDPlayer();
+  CVideoPlayer(IPlayerCallback& callback);
+  virtual ~CVideoPlayer();
   virtual bool OpenFile(const CFileItem& file, const CPlayerOptions &options);
   virtual bool CloseFile(bool reopen = false);
   virtual bool IsPlaying() const;
@@ -237,9 +235,9 @@ public:
   virtual float GetPercentage();
   virtual float GetCachePercentage();
 
-  virtual void SetVolume(float nVolume)                         { m_dvdPlayerAudio->SetVolume(nVolume); }
-  virtual void SetMute(bool bOnOff)                             { m_dvdPlayerAudio->SetMute(bOnOff); }
-  virtual void SetDynamicRangeCompression(long drc)             { m_dvdPlayerAudio->SetDynamicRangeCompression(drc); }
+  virtual void SetVolume(float nVolume)                         { m_VideoPlayerAudio->SetVolume(nVolume); }
+  virtual void SetMute(bool bOnOff)                             { m_VideoPlayerAudio->SetMute(bOnOff); }
+  virtual void SetDynamicRangeCompression(long drc)             { m_VideoPlayerAudio->SetDynamicRangeCompression(drc); }
   virtual void GetAudioInfo(std::string& strAudioInfo);
   virtual void GetVideoInfo(std::string& strVideoInfo);
   virtual void GetGeneralInfo(std::string& strVideoInfo);
@@ -454,11 +452,11 @@ protected:
 
   CDVDMessageQueue m_messenger;     // thread messenger
 
-  IDVDStreamPlayerVideo *m_dvdPlayerVideo; // video part
-  IDVDStreamPlayerAudio *m_dvdPlayerAudio; // audio part
-  CDVDPlayerSubtitle *m_dvdPlayerSubtitle; // subtitle part
-  CDVDTeletextData *m_dvdPlayerTeletext; // teletext part
-  CDVDRadioRDSData *m_dvdPlayerRadioRDS; // rds part
+  IDVDStreamPlayerVideo *m_VideoPlayerVideo; // video part
+  IDVDStreamPlayerAudio *m_VideoPlayerAudio; // audio part
+  CVideoPlayerSubtitle *m_VideoPlayerSubtitle; // subtitle part
+  CDVDTeletextData *m_VideoPlayerTeletext; // teletext part
+  CDVDRadioRDSData *m_VideoPlayerRadioRDS; // rds part
 
   CDVDClock m_clock;                // master clock
   CDVDOverlayContainer m_overlayContainer;
@@ -495,8 +493,8 @@ protected:
     ETIMESOURCE_MENU,
   };
 
-  friend class CDVDPlayerVideo;
-  friend class CDVDPlayerAudio;
+  friend class CVideoPlayerVideo;
+  friend class CVideoPlayerAudio;
 #ifdef HAS_OMXPLAYER
   friend class OMXPlayerVideo;
   friend class OMXPlayerAudio;
diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp
index fe22dce116..5ba8bbc453 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp
@@ -19,8 +19,8 @@
  */
 
 #include "threads/SingleLock.h"
-#include "DVDPlayerAudio.h"
-#include "DVDPlayer.h"
+#include "VideoPlayerAudio.h"
+#include "VideoPlayer.h"
 #include "DVDCodecs/Audio/DVDAudioCodec.h"
 #include "DVDCodecs/DVDFactoryCodec.h"
 #include "settings/Settings.h"
@@ -95,8 +95,8 @@ public:
 };
 
 
-CDVDPlayerAudio::CDVDPlayerAudio(CDVDClock* pClock, CDVDMessageQueue& parent)
-: CThread("DVDPlayerAudio")
+CVideoPlayerAudio::CVideoPlayerAudio(CDVDClock* pClock, CDVDMessageQueue& parent)
+: CThread("VideoPlayerAudio")
 , m_messageQueue("audio")
 , m_messageParent(parent)
 , m_dvdAudio((bool&)m_bStop)
@@ -123,7 +123,7 @@ CDVDPlayerAudio::CDVDPlayerAudio(CDVDClock* pClock, CDVDMessageQueue& parent)
   m_messageQueue.SetMaxTimeSize(8.0);
 }
 
-CDVDPlayerAudio::~CDVDPlayerAudio()
+CVideoPlayerAudio::~CVideoPlayerAudio()
 {
   StopThread();
 
@@ -131,7 +131,7 @@ CDVDPlayerAudio::~CDVDPlayerAudio()
   // CloseStream(true);
 }
 
-bool CDVDPlayerAudio::OpenStream( CDVDStreamInfo &hints )
+bool CVideoPlayerAudio::OpenStream( CDVDStreamInfo &hints )
 {
   CLog::Log(LOGNOTICE, "Finding audio codec for: %i", hints.codec);
   CDVDAudioCodec* codec = CDVDFactoryCodec::CreateAudioCodec(hints);
@@ -153,7 +153,7 @@ bool CDVDPlayerAudio::OpenStream( CDVDStreamInfo &hints )
   return true;
 }
 
-void CDVDPlayerAudio::OpenStream( CDVDStreamInfo &hints, CDVDAudioCodec* codec )
+void CVideoPlayerAudio::OpenStream( CDVDStreamInfo &hints, CDVDAudioCodec* codec )
 {
   SAFE_DELETE(m_pAudioCodec);
   m_pAudioCodec = codec;
@@ -197,7 +197,7 @@ void CDVDPlayerAudio::OpenStream( CDVDStreamInfo &hints, CDVDAudioCodec* codec )
   g_dataCacheCore.SignalAudioInfoChange();
 }
 
-void CDVDPlayerAudio::CloseStream(bool bWaitForBuffers)
+void CVideoPlayerAudio::CloseStream(bool bWaitForBuffers)
 {
   bool bWait = bWaitForBuffers && m_speed > 0 && !CAEFactory::IsSuspended();
 
@@ -240,7 +240,7 @@ void CDVDPlayerAudio::CloseStream(bool bWaitForBuffers)
 }
 
 // decode one audio frame and returns its uncompressed size
-int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe)
+int CVideoPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe)
 {
   int result = 0;
 
@@ -265,7 +265,7 @@ int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe)
       if (len < 0 || len > m_decode.size)
       {
         /* if error, we skip the packet */
-        CLog::Log(LOGERROR, "CDVDPlayerAudio::DecodeFrame - Decode Error. Skipping audio packet (%d)", len);
+        CLog::Log(LOGERROR, "CVideoPlayerAudio::DecodeFrame - Decode Error. Skipping audio packet (%d)", len);
         m_decode.Release();
         m_pAudioCodec->Reset();
         return DECODE_FLAG_ERROR;
@@ -349,14 +349,14 @@ int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe)
     else if (pMsg->IsType(CDVDMsg::GENERAL_SYNCHRONIZE))
     {
       if(((CDVDMsgGeneralSynchronize*)pMsg)->Wait( 100, SYNCSOURCE_AUDIO ))
-        CLog::Log(LOGDEBUG, "CDVDPlayerAudio - CDVDMsg::GENERAL_SYNCHRONIZE");
+        CLog::Log(LOGDEBUG, "CVideoPlayerAudio - CDVDMsg::GENERAL_SYNCHRONIZE");
       else
         m_messageQueue.Put(pMsg->Acquire(), 1); /* push back as prio message, to process other prio messages */
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_RESYNC))
     { //player asked us to set internal clock
       CDVDMsgGeneralResync* pMsgGeneralResync = (CDVDMsgGeneralResync*)pMsg;
-      CLog::Log(LOGDEBUG, "CDVDPlayerAudio - CDVDMsg::GENERAL_RESYNC(%f, %d)"
+      CLog::Log(LOGDEBUG, "CVideoPlayerAudio - CDVDMsg::GENERAL_RESYNC(%f, %d)"
                         , pMsgGeneralResync->m_timestamp
                         , pMsgGeneralResync->m_clock);
 
@@ -393,22 +393,22 @@ int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe)
     else if (pMsg->IsType(CDVDMsg::PLAYER_STARTED))
     {
       if(m_started)
-        m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, DVDPLAYER_AUDIO));
+        m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, VideoPlayer_AUDIO));
     }
     else if (pMsg->IsType(CDVDMsg::PLAYER_DISPLAYTIME))
     {
-      CDVDPlayer::SPlayerState& state = ((CDVDMsgType<CDVDPlayer::SPlayerState>*)pMsg)->m_value;
+      CVideoPlayer::SPlayerState& state = ((CDVDMsgType<CVideoPlayer::SPlayerState>*)pMsg)->m_value;
 
-      if(state.time_src == CDVDPlayer::ETIMESOURCE_CLOCK)
+      if(state.time_src == CVideoPlayer::ETIMESOURCE_CLOCK)
         state.time      = DVD_TIME_TO_MSEC(m_pClock->GetClock(state.timestamp) + state.time_offset);
       else
         state.timestamp = CDVDClock::GetAbsoluteClock();
-      state.player    = DVDPLAYER_AUDIO;
+      state.player    = VideoPlayer_AUDIO;
       m_messageParent.Put(pMsg->Acquire());
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_EOF))
     {
-      CLog::Log(LOGDEBUG, "CDVDPlayerAudio - CDVDMsg::GENERAL_EOF");
+      CLog::Log(LOGDEBUG, "CVideoPlayerAudio - CDVDMsg::GENERAL_EOF");
       m_dvdAudio.Finish();
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_DELAY))
@@ -417,7 +417,7 @@ int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe)
       {
         double timeout = static_cast<CDVDMsgDouble*>(pMsg)->m_value;
 
-        CLog::Log(LOGDEBUG, "CDVDPlayerAudio - CDVDMsg::GENERAL_DELAY(%f)", timeout);
+        CLog::Log(LOGDEBUG, "CVideoPlayerAudio - CDVDMsg::GENERAL_DELAY(%f)", timeout);
 
         timeout *= (double)DVD_PLAYSPEED_NORMAL / abs(m_speed);
         timeout += CDVDClock::GetAbsoluteClock();
@@ -449,7 +449,7 @@ int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe)
     else if (pMsg->IsType(CDVDMsg::AUDIO_SILENCE))
     {
       m_silence = static_cast<CDVDMsgBool*>(pMsg)->m_value;
-      CLog::Log(LOGDEBUG, "CDVDPlayerAudio - CDVDMsg::AUDIO_SILENCE(%f, %d)"
+      CLog::Log(LOGDEBUG, "CVideoPlayerAudio - CDVDMsg::AUDIO_SILENCE(%f, %d)"
                         , m_audioClock, m_silence);
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_STREAMCHANGE))
@@ -464,7 +464,7 @@ int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe)
   return 0;
 }
 
-void CDVDPlayerAudio::OnStartup()
+void CVideoPlayerAudio::OnStartup()
 {
   m_decode.Release();
 
@@ -473,7 +473,7 @@ void CDVDPlayerAudio::OnStartup()
 #endif
 }
 
-void CDVDPlayerAudio::UpdatePlayerInfo()
+void CVideoPlayerAudio::UpdatePlayerInfo()
 {
   std::ostringstream s;
   s << "aq:"     << std::setw(2) << std::min(99,m_messageQueue.GetLevel() + MathUtils::round_int(100.0/8.0*m_dvdAudio.GetCacheTime())) << "%";
@@ -496,9 +496,9 @@ void CDVDPlayerAudio::UpdatePlayerInfo()
   }
 }
 
-void CDVDPlayerAudio::Process()
+void CVideoPlayerAudio::Process()
 {
-  CLog::Log(LOGNOTICE, "running thread: CDVDPlayerAudio::Process()");
+  CLog::Log(LOGNOTICE, "running thread: CVideoPlayerAudio::Process()");
 
   bool packetadded(false);
 
@@ -520,7 +520,7 @@ void CDVDPlayerAudio::Process()
 
     if( result & DECODE_FLAG_ERROR )
     {
-      CLog::Log(LOGDEBUG, "CDVDPlayerAudio::Process - Decode Error");
+      CLog::Log(LOGDEBUG, "CVideoPlayerAudio::Process - Decode Error");
       continue;
     }
 
@@ -539,7 +539,7 @@ void CDVDPlayerAudio::Process()
 
     if( result & DECODE_FLAG_ABORT )
     {
-      CLog::Log(LOGDEBUG, "CDVDPlayerAudio::Process - Abort received, exiting thread");
+      CLog::Log(LOGDEBUG, "CVideoPlayerAudio::Process - Abort received, exiting thread");
       break;
     }
 
@@ -599,7 +599,7 @@ void CDVDPlayerAudio::Process()
     if(m_started == false && !(result & DECODE_FLAG_DROP))
     {
       m_started = true;
-      m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, DVDPLAYER_AUDIO));
+      m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, VideoPlayer_AUDIO));
       m_errors.Flush();
     }
 
@@ -614,7 +614,7 @@ void CDVDPlayerAudio::Process()
   }
 }
 
-void CDVDPlayerAudio::SetSyncType(bool passthrough)
+void CVideoPlayerAudio::SetSyncType(bool passthrough)
 {
   //set the synctype from the gui
   //use skip/duplicate when resample is selected and passthrough is on
@@ -639,12 +639,12 @@ void CDVDPlayerAudio::SetSyncType(bool passthrough)
   {
     const char *synctypes[] = {"clock feedback", "skip/duplicate", "resample", "invalid"};
     int synctype = (m_synctype >= 0 && m_synctype <= 2) ? m_synctype : 3;
-    CLog::Log(LOGDEBUG, "CDVDPlayerAudio:: synctype set to %i: %s", m_synctype, synctypes[synctype]);
+    CLog::Log(LOGDEBUG, "CVideoPlayerAudio:: synctype set to %i: %s", m_synctype, synctypes[synctype]);
     m_prevsynctype = m_synctype;
   }
 }
 
-void CDVDPlayerAudio::HandleSyncError(double duration)
+void CVideoPlayerAudio::HandleSyncError(double duration)
 {
   double absolute;
   double clock = m_pClock->GetClock(absolute);
@@ -689,7 +689,7 @@ void CDVDPlayerAudio::HandleSyncError(double duration)
     m_errors.Flush(100);
     m_integral = 0.0;
     m_resampleratio = 0.0;
-    CLog::Log(LOGDEBUG,"CDVDPlayerAudio::HandleSyncError - average error %f above threshold of %f",
+    CLog::Log(LOGDEBUG,"CVideoPlayerAudio::HandleSyncError - average error %f above threshold of %f",
               m_error, threshold1);
     return;
   }
@@ -699,7 +699,7 @@ void CDVDPlayerAudio::HandleSyncError(double duration)
     // we are about to get stable, increase interval
     m_errors.Flush(1000);
     m_integral = 0.0;
-    CLog::Log(LOGDEBUG,"CDVDPlayerAudio::HandleSyncError - average error %f below threshold of %f",
+    CLog::Log(LOGDEBUG,"CVideoPlayerAudio::HandleSyncError - average error %f below threshold of %f",
               m_error, threshold2);
   }
 
@@ -724,7 +724,7 @@ void CDVDPlayerAudio::HandleSyncError(double duration)
       error = m_error;
     }
 
-    m_pClock->Update(clock+error, absolute, limit - 0.001, "CDVDPlayerAudio::HandleSyncError2");
+    m_pClock->Update(clock+error, absolute, limit - 0.001, "CVideoPlayerAudio::HandleSyncError2");
   }
   else if (m_synctype == SYNC_RESAMPLE)
   {
@@ -751,7 +751,7 @@ void CDVDPlayerAudio::HandleSyncError(double duration)
   }
 }
 
-bool CDVDPlayerAudio::OutputPacket(DVDAudioFrame &audioframe)
+bool CVideoPlayerAudio::OutputPacket(DVDAudioFrame &audioframe)
 {
   if (m_syncclock)
   {
@@ -779,7 +779,7 @@ bool CDVDPlayerAudio::OutputPacket(DVDAudioFrame &audioframe)
 
       int dups = std::min(DVD_MSEC_TO_TIME(100), error) / audioframe.duration;
       if (dups > 0)
-        CLog::Log(LOGNOTICE,"CDVDPlayerAudio::OutputPacket duplicate %d packets of duration %d",
+        CLog::Log(LOGNOTICE,"CVideoPlayerAudio::OutputPacket duplicate %d packets of duration %d",
                   dups, DVD_TIME_TO_MSEC(audioframe.duration));
       for (int i = 0; i < dups; i++)
       {
@@ -794,7 +794,7 @@ bool CDVDPlayerAudio::OutputPacket(DVDAudioFrame &audioframe)
     else if (error < -DVD_MSEC_TO_TIME(32))
     {
       m_dvdAudio.SetPlayingPts(audioframe.pts);
-      CLog::Log(LOGNOTICE,"CDVDPlayerAudio::OutputPacket skipping a packets of duration %d",
+      CLog::Log(LOGNOTICE,"CVideoPlayerAudio::OutputPacket skipping a packets of duration %d",
                 DVD_TIME_TO_MSEC(audioframe.duration));
     }
     else
@@ -816,13 +816,13 @@ bool CDVDPlayerAudio::OutputPacket(DVDAudioFrame &audioframe)
         m_dvdAudio.AddPackets(audioframe);
       else
       {
-        CLog::Log(LOGDEBUG, "CDVDPlayerAudio:: Dropping packet of %d ms", DVD_TIME_TO_MSEC(audioframe.duration));
+        CLog::Log(LOGDEBUG, "CVideoPlayerAudio:: Dropping packet of %d ms", DVD_TIME_TO_MSEC(audioframe.duration));
         m_error += audioframe.duration;
       }
     }
     else if(m_error > limit)
     {
-      CLog::Log(LOGDEBUG, "CDVDPlayerAudio:: Duplicating packet of %d ms", DVD_TIME_TO_MSEC(audioframe.duration));
+      CLog::Log(LOGDEBUG, "CVideoPlayerAudio:: Duplicating packet of %d ms", DVD_TIME_TO_MSEC(audioframe.duration));
       m_dvdAudio.AddPackets(audioframe);
       m_dvdAudio.AddPackets(audioframe);
       m_error -= audioframe.duration;
@@ -839,16 +839,16 @@ bool CDVDPlayerAudio::OutputPacket(DVDAudioFrame &audioframe)
   return true;
 }
 
-void CDVDPlayerAudio::OnExit()
+void CVideoPlayerAudio::OnExit()
 {
 #ifdef TARGET_WINDOWS
   CoUninitialize();
 #endif
 
-  CLog::Log(LOGNOTICE, "thread end: CDVDPlayerAudio::OnExit()");
+  CLog::Log(LOGNOTICE, "thread end: CVideoPlayerAudio::OnExit()");
 }
 
-void CDVDPlayerAudio::SetSpeed(int speed)
+void CVideoPlayerAudio::SetSpeed(int speed)
 {
   if(m_messageQueue.IsInited())
     m_messageQueue.Put( new CDVDMsgInt(CDVDMsg::PLAYER_SETSPEED, speed), 1 );
@@ -856,13 +856,13 @@ void CDVDPlayerAudio::SetSpeed(int speed)
     m_speed = speed;
 }
 
-void CDVDPlayerAudio::Flush()
+void CVideoPlayerAudio::Flush()
 {
   m_messageQueue.Flush();
   m_messageQueue.Put( new CDVDMsg(CDVDMsg::GENERAL_FLUSH), 1);
 }
 
-void CDVDPlayerAudio::WaitForBuffers()
+void CVideoPlayerAudio::WaitForBuffers()
 {
   // make sure there are no more packets available
   m_messageQueue.WaitUntilEmpty();
@@ -874,9 +874,9 @@ void CDVDPlayerAudio::WaitForBuffers()
     Sleep((int)(1000 * (delay - 0.5)));
 }
 
-bool CDVDPlayerAudio::SwitchCodecIfNeeded()
+bool CVideoPlayerAudio::SwitchCodecIfNeeded()
 {
-  CLog::Log(LOGDEBUG, "CDVDPlayerAudio: Sample rate changed, checking for passthrough");
+  CLog::Log(LOGDEBUG, "CVideoPlayerAudio: Sample rate changed, checking for passthrough");
   CDVDAudioCodec *codec = CDVDFactoryCodec::CreateAudioCodec(m_streaminfo);
   if (!codec || codec->NeedPassthrough() == m_pAudioCodec->NeedPassthrough()) {
     // passthrough state has not changed
@@ -890,23 +890,23 @@ bool CDVDPlayerAudio::SwitchCodecIfNeeded()
   return true;
 }
 
-std::string CDVDPlayerAudio::GetPlayerInfo()
+std::string CVideoPlayerAudio::GetPlayerInfo()
 {
   CSingleLock lock(m_info_section);
   return m_info.info;
 }
 
-int CDVDPlayerAudio::GetAudioBitrate()
+int CVideoPlayerAudio::GetAudioBitrate()
 {
   return (int)m_audioStats.GetBitrate();
 }
 
-int CDVDPlayerAudio::GetAudioChannels()
+int CVideoPlayerAudio::GetAudioChannels()
 {
   return m_streaminfo.channels;
 }
 
-bool CDVDPlayerAudio::IsPassthrough() const
+bool CVideoPlayerAudio::IsPassthrough() const
 {
   CSingleLock lock(m_info_section);
   return m_info.passthrough;
diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.h b/xbmc/cores/VideoPlayer/VideoPlayerAudio.h
index 014574d7be..f85e0869bd 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerAudio.h
+++ b/xbmc/cores/VideoPlayer/VideoPlayerAudio.h
@@ -26,11 +26,12 @@
 #include "DVDClock.h"
 #include "DVDMessageQueue.h"
 #include "DVDStreamInfo.h"
-#include "IDVDPlayer.h"
+#include "IVideoPlayer.h"
 #include "threads/Thread.h"
 #include "utils/BitstreamStats.h"
 
-class CDVDPlayer;
+
+class CVideoPlayer;
 class CDVDAudioCodec;
 class CDVDAudioCodec;
 
@@ -97,11 +98,11 @@ public:
   XbmcThreads::EndTime m_timer;
 };
 
-class CDVDPlayerAudio : public CThread, public IDVDStreamPlayerAudio
+class CVideoPlayerAudio : public CThread, public IDVDStreamPlayerAudio
 {
 public:
-  CDVDPlayerAudio(CDVDClock* pClock, CDVDMessageQueue& parent);
-  virtual ~CDVDPlayerAudio();
+  CVideoPlayerAudio(CDVDClock* pClock, CDVDMessageQueue& parent);
+  virtual ~CVideoPlayerAudio();
 
   bool OpenStream(CDVDStreamInfo &hints);
   void CloseStream(bool bWaitForBuffers);
diff --git a/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp b/xbmc/cores/VideoPlayer/VideoPlayerSubtitle.cpp
index 3d5c26bd4c..472a43efb1 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayerSubtitle.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include "DVDPlayerSubtitle.h"
+#include "VideoPlayerSubtitle.h"
 #include "DVDCodecs/Overlay/DVDOverlay.h"
 #include "DVDCodecs/Overlay/DVDOverlaySpu.h"
 #include "DVDCodecs/Overlay/DVDOverlayCodec.h"
@@ -31,7 +31,7 @@
 #include "config.h"
 #endif
 
-CDVDPlayerSubtitle::CDVDPlayerSubtitle(CDVDOverlayContainer* pOverlayContainer)
+CVideoPlayerSubtitle::CVideoPlayerSubtitle(CDVDOverlayContainer* pOverlayContainer)
 {
   m_pOverlayContainer = pOverlayContainer;
 
@@ -41,18 +41,18 @@ CDVDPlayerSubtitle::CDVDPlayerSubtitle(CDVDOverlayContainer* pOverlayContainer)
   m_lastPts = DVD_NOPTS_VALUE;
 }
 
-CDVDPlayerSubtitle::~CDVDPlayerSubtitle()
+CVideoPlayerSubtitle::~CVideoPlayerSubtitle()
 {
   CloseStream(true);
 }
 
 
-void CDVDPlayerSubtitle::Flush()
+void CVideoPlayerSubtitle::Flush()
 {
   SendMessage(new CDVDMsg(CDVDMsg::GENERAL_FLUSH), 0);
 }
 
-void CDVDPlayerSubtitle::SendMessage(CDVDMsg* pMsg, int priority)
+void CVideoPlayerSubtitle::SendMessage(CDVDMsg* pMsg, int priority)
 {
   CSingleLock lock(m_section);
 
@@ -81,7 +81,7 @@ void CDVDPlayerSubtitle::SendMessage(CDVDMsg* pMsg, int priority)
       CDVDOverlaySpu* pSPUInfo = m_dvdspus.AddData(pPacket->pData, pPacket->iSize, pPacket->pts);
       if (pSPUInfo)
       {
-        CLog::Log(LOGDEBUG, "CDVDPlayer::ProcessSubData: Got complete SPU packet");
+        CLog::Log(LOGDEBUG, "CVideoPlayer::ProcessSubData: Got complete SPU packet");
         m_pOverlayContainer->Add(pSPUInfo);
         pSPUInfo->Release();
       }
@@ -131,7 +131,7 @@ void CDVDPlayerSubtitle::SendMessage(CDVDMsg* pMsg, int priority)
   pMsg->Release();
 }
 
-bool CDVDPlayerSubtitle::OpenStream(CDVDStreamInfo &hints, std::string &filename)
+bool CVideoPlayerSubtitle::OpenStream(CDVDStreamInfo &hints, std::string &filename)
 {
   CSingleLock lock(m_section);
 
@@ -171,7 +171,7 @@ bool CDVDPlayerSubtitle::OpenStream(CDVDStreamInfo &hints, std::string &filename
   return false;
 }
 
-void CDVDPlayerSubtitle::CloseStream(bool bWaitForBuffers)
+void CVideoPlayerSubtitle::CloseStream(bool bWaitForBuffers)
 {
   CSingleLock lock(m_section);
 
@@ -188,7 +188,7 @@ void CDVDPlayerSubtitle::CloseStream(bool bWaitForBuffers)
     m_pOverlayContainer->Clear();
 }
 
-void CDVDPlayerSubtitle::Process(double pts, double offset)
+void CVideoPlayerSubtitle::Process(double pts, double offset)
 {
   CSingleLock lock(m_section);
 
@@ -223,7 +223,7 @@ void CDVDPlayerSubtitle::Process(double pts, double offset)
   }
 }
 
-bool CDVDPlayerSubtitle::AcceptsData() const
+bool CVideoPlayerSubtitle::AcceptsData() const
 {
   // FIXME : This may still be causing problems + magic number :(
   return m_pOverlayContainer->GetSize() < 5;
diff --git a/xbmc/cores/dvdplayer/DVDPlayerSubtitle.h b/xbmc/cores/VideoPlayer/VideoPlayerSubtitle.h
index dfe057baa1..52800e0d4a 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerSubtitle.h
+++ b/xbmc/cores/VideoPlayer/VideoPlayerSubtitle.h
@@ -25,7 +25,7 @@
 #include "DVDStreamInfo.h"
 #include "DVDMessageQueue.h"
 #include "DVDDemuxSPU.h"
-#include "IDVDPlayer.h"
+#include "IVideoPlayer.h"
 
 class CDVDInputStream;
 class CDVDSubtitleStream;
@@ -33,11 +33,11 @@ class CDVDSubtitleParser;
 class CDVDInputStreamNavigator;
 class CDVDOverlayCodec;
 
-class CDVDPlayerSubtitle : public IDVDStreamPlayer
+class CVideoPlayerSubtitle : public IDVDStreamPlayer
 {
 public:
-  CDVDPlayerSubtitle(CDVDOverlayContainer* pOverlayContainer);
-  ~CDVDPlayerSubtitle();
+  CVideoPlayerSubtitle(CDVDOverlayContainer* pOverlayContainer);
+  ~CVideoPlayerSubtitle();
 
   void Process(double pts, double offset);
   void Flush();
diff --git a/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp b/xbmc/cores/VideoPlayer/VideoPlayerTeletext.cpp
index cd71dbd4f2..ad134e3d57 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayerTeletext.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include "DVDPlayerTeletext.h"
+#include "VideoPlayerTeletext.h"
 #include "DVDClock.h"
 #include "DVDStreamInfo.h"
 #include "utils/log.h"
@@ -657,7 +657,7 @@ void CDVDTeletextData::Flush()
 {
   if(!m_messageQueue.IsInited())
     return;
-  /* flush using message as this get's called from dvdplayer thread */
+  /* flush using message as this get's called from VideoPlayer thread */
   /* and any demux packet that has been taken out of queue need to */
   /* be disposed of before we flush */
   m_messageQueue.Flush();
diff --git a/xbmc/cores/dvdplayer/DVDPlayerTeletext.h b/xbmc/cores/VideoPlayer/VideoPlayerTeletext.h
index 0e4609eb10..8edd08759b 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerTeletext.h
+++ b/xbmc/cores/VideoPlayer/VideoPlayerTeletext.h
@@ -23,7 +23,7 @@
 #include "threads/Thread.h"
 #include "DVDMessageQueue.h"
 #include "video/TeletextDefines.h"
-#include "IDVDPlayer.h"
+#include "IVideoPlayer.h"
 
 class CDVDStreamInfo;
 
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp
index 8d5c84820c..54e7ce133e 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp
@@ -19,15 +19,15 @@
  */
 
 #include "system.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFlags.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "windowing/WindowingFactory.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/MediaSettings.h"
 #include "settings/Settings.h"
 #include "video/VideoReferenceClock.h"
 #include "utils/MathUtils.h"
-#include "DVDPlayer.h"
-#include "DVDPlayerVideo.h"
+#include "VideoPlayer.h"
+#include "VideoPlayerVideo.h"
 #include "DVDCodecs/DVDFactoryCodec.h"
 #include "DVDCodecs/DVDCodecUtils.h"
 #include "DVDCodecs/Video/DVDVideoPPFFmpeg.h"
@@ -114,11 +114,11 @@ public:
 };
 
 
-CDVDPlayerVideo::CDVDPlayerVideo(CDVDClock* pClock
+CVideoPlayerVideo::CVideoPlayerVideo(CDVDClock* pClock
                                 ,CDVDOverlayContainer* pOverlayContainer
                                 ,CDVDMessageQueue& parent
                                 ,CRenderManager& renderManager)
-: CThread("DVDPlayerVideo")
+: CThread("VideoPlayerVideo")
 , m_messageQueue("video")
 , m_messageParent(parent)
 , m_renderManager(renderManager)
@@ -155,13 +155,13 @@ CDVDPlayerVideo::CDVDPlayerVideo(CDVDClock* pClock
   m_bAllowFullscreen = false;
 }
 
-CDVDPlayerVideo::~CDVDPlayerVideo()
+CVideoPlayerVideo::~CVideoPlayerVideo()
 {
   StopThread();
   g_VideoReferenceClock.Stop();
 }
 
-double CDVDPlayerVideo::GetOutputDelay()
+double CVideoPlayerVideo::GetOutputDelay()
 {
     double time = m_messageQueue.GetPacketCount(CDVDMsg::DEMUXER_PACKET);
     if( m_fFrameRate )
@@ -175,7 +175,7 @@ double CDVDPlayerVideo::GetOutputDelay()
     return time;
 }
 
-bool CDVDPlayerVideo::OpenStream( CDVDStreamInfo &hint )
+bool CVideoPlayerVideo::OpenStream( CDVDStreamInfo &hint )
 {
   CRenderInfo info;
   info = m_renderManager.GetRenderInfo();
@@ -206,7 +206,7 @@ bool CDVDPlayerVideo::OpenStream( CDVDStreamInfo &hint )
   return true;
 }
 
-void CDVDPlayerVideo::OpenStream(CDVDStreamInfo &hint, CDVDVideoCodec* codec)
+void CVideoPlayerVideo::OpenStream(CDVDStreamInfo &hint, CDVDVideoCodec* codec)
 {
   //reported fps is usually not completely correct
   if (hint.fpsrate && hint.fpsscale)
@@ -226,7 +226,7 @@ void CDVDPlayerVideo::OpenStream(CDVDStreamInfo &hint, CDVDVideoCodec* codec)
 
   if( m_fFrameRate > 120 || m_fFrameRate < 5 )
   {
-    CLog::Log(LOGERROR, "CDVDPlayerVideo::OpenStream - Invalid framerate %d, using forced 25fps and just trust timestamps", (int)m_fFrameRate);
+    CLog::Log(LOGERROR, "CVideoPlayerVideo::OpenStream - Invalid framerate %d, using forced 25fps and just trust timestamps", (int)m_fFrameRate);
     m_fFrameRate = 25;
   }
 
@@ -247,7 +247,7 @@ void CDVDPlayerVideo::OpenStream(CDVDStreamInfo &hint, CDVDVideoCodec* codec)
   m_packets.clear();
 }
 
-void CDVDPlayerVideo::CloseStream(bool bWaitForBuffers)
+void CVideoPlayerVideo::CloseStream(bool bWaitForBuffers)
 {
   // wait until buffers are empty
   if (bWaitForBuffers && m_speed > 0) m_messageQueue.WaitUntilEmpty();
@@ -276,7 +276,7 @@ void CDVDPlayerVideo::CloseStream(bool bWaitForBuffers)
   }
 }
 
-void CDVDPlayerVideo::OnStartup()
+void CVideoPlayerVideo::OnStartup()
 {
   m_iDroppedFrames = 0;
 
@@ -287,7 +287,7 @@ void CDVDPlayerVideo::OnStartup()
   m_FlipTimePts   = 0.0;
 }
 
-void CDVDPlayerVideo::Process()
+void CVideoPlayerVideo::Process()
 {
   CLog::Log(LOGNOTICE, "running thread: video_thread");
 
@@ -332,7 +332,7 @@ void CDVDPlayerVideo::Process()
       if( !m_stalled )
       {
         if(m_started)
-          CLog::Log(LOGINFO, "CDVDPlayerVideo - Stillframe detected, switching to forced %f fps", m_fFrameRate);
+          CLog::Log(LOGINFO, "CVideoPlayerVideo - Stillframe detected, switching to forced %f fps", m_fFrameRate);
         m_stalled = true;
         pts+= frametime*4;
       }
@@ -355,7 +355,7 @@ void CDVDPlayerVideo::Process()
     {
       if(((CDVDMsgGeneralSynchronize*)pMsg)->Wait(100, SYNCSOURCE_VIDEO))
       {
-        CLog::Log(LOGDEBUG, "CDVDPlayerVideo - CDVDMsg::GENERAL_SYNCHRONIZE");
+        CLog::Log(LOGDEBUG, "CVideoPlayerVideo - CDVDMsg::GENERAL_SYNCHRONIZE");
 
         /* we may be very much off correct pts here, but next picture may be a still*/
         /* make sure it isn't dropped */
@@ -379,11 +379,11 @@ void CDVDPlayerVideo::Process()
 
       if(pMsgGeneralResync->m_clock)
       {
-        CLog::Log(LOGDEBUG, "CDVDPlayerVideo - CDVDMsg::GENERAL_RESYNC(%f, 1)", pts);
+        CLog::Log(LOGDEBUG, "CVideoPlayerVideo - CDVDMsg::GENERAL_RESYNC(%f, 1)", pts);
         m_pClock->Discontinuity(m_FlipTimePts, absolute);
       }
       else
-        CLog::Log(LOGDEBUG, "CDVDPlayerVideo - CDVDMsg::GENERAL_RESYNC(%f, 0)", pts);
+        CLog::Log(LOGDEBUG, "CVideoPlayerVideo - CDVDMsg::GENERAL_RESYNC(%f, 0)", pts);
 
       pMsgGeneralResync->Release();
       continue;
@@ -394,7 +394,7 @@ void CDVDPlayerVideo::Process()
       {
         double timeout = static_cast<CDVDMsgDouble*>(pMsg)->m_value;
 
-        CLog::Log(LOGDEBUG, "CDVDPlayerVideo - CDVDMsg::GENERAL_DELAY(%f)", timeout);
+        CLog::Log(LOGDEBUG, "CVideoPlayerVideo - CDVDMsg::GENERAL_DELAY(%f)", timeout);
 
         timeout *= (double)DVD_PLAYSPEED_NORMAL / abs(m_speed);
         timeout += CDVDClock::GetAbsoluteClock();
@@ -405,7 +405,7 @@ void CDVDPlayerVideo::Process()
     }
     else if (pMsg->IsType(CDVDMsg::VIDEO_SET_ASPECT))
     {
-      CLog::Log(LOGDEBUG, "CDVDPlayerVideo - CDVDMsg::VIDEO_SET_ASPECT");
+      CLog::Log(LOGDEBUG, "CVideoPlayerVideo - CDVDMsg::VIDEO_SET_ASPECT");
       m_fForcedAspectRatio = *((CDVDMsgDouble*)pMsg);
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_RESET))
@@ -417,7 +417,7 @@ void CDVDPlayerVideo::Process()
       m_started = false;
       m_droppingStats.Reset();
     }
-    else if (pMsg->IsType(CDVDMsg::GENERAL_FLUSH)) // private message sent by (CDVDPlayerVideo::Flush())
+    else if (pMsg->IsType(CDVDMsg::GENERAL_FLUSH)) // private message sent by (CVideoPlayerVideo::Flush())
     {
       if(m_pVideoCodec)
         m_pVideoCodec->Reset();
@@ -455,13 +455,13 @@ void CDVDPlayerVideo::Process()
     else if (pMsg->IsType(CDVDMsg::PLAYER_STARTED))
     {
       if(m_started)
-        m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, DVDPLAYER_VIDEO));
+        m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, VideoPlayer_VIDEO));
     }
     else if (pMsg->IsType(CDVDMsg::PLAYER_DISPLAYTIME))
     {
-      CDVDPlayer::SPlayerState& state = ((CDVDMsgType<CDVDPlayer::SPlayerState>*)pMsg)->m_value;
+      CVideoPlayer::SPlayerState& state = ((CDVDMsgType<CVideoPlayer::SPlayerState>*)pMsg)->m_value;
 
-      if(state.time_src == CDVDPlayer::ETIMESOURCE_CLOCK)
+      if(state.time_src == CVideoPlayer::ETIMESOURCE_CLOCK)
       {
         double pts = GetCurrentPts();
         if (pts == DVD_NOPTS_VALUE)
@@ -472,7 +472,7 @@ void CDVDPlayerVideo::Process()
       }
       else
         state.timestamp = CDVDClock::GetAbsoluteClock();
-      state.player    = DVDPLAYER_VIDEO;
+      state.player    = VideoPlayer_VIDEO;
       m_messageParent.Put(pMsg->Acquire());
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_STREAMCHANGE))
@@ -490,7 +490,7 @@ void CDVDPlayerVideo::Process()
 
       if (m_stalled)
       {
-        CLog::Log(LOGINFO, "CDVDPlayerVideo - Stillframe left, switching to normal playback");
+        CLog::Log(LOGINFO, "CVideoPlayerVideo - Stillframe left, switching to normal playback");
         m_stalled = false;
 
         //don't allow the first frames after a still to be dropped
@@ -588,7 +588,7 @@ void CDVDPlayerVideo::Process()
         // if decoder was flushed, we need to seek back again to resume rendering
         if (iDecoderState & VC_FLUSHED)
         {
-          CLog::Log(LOGDEBUG, "CDVDPlayerVideo - video decoder was flushed");
+          CLog::Log(LOGDEBUG, "CVideoPlayerVideo - video decoder was flushed");
           while(!m_packets.empty())
           {
             CDVDMsgDemuxerPacket* msg = (CDVDMsgDemuxerPacket*)m_packets.front().message->Acquire();
@@ -627,7 +627,7 @@ void CDVDPlayerVideo::Process()
         // if decoder had an error, tell it to reset to avoid more problems
         if (iDecoderState & VC_ERROR)
         {
-          CLog::Log(LOGDEBUG, "CDVDPlayerVideo - video decoder returned error");
+          CLog::Log(LOGDEBUG, "CVideoPlayerVideo - video decoder returned error");
           break;
         }
 
@@ -719,7 +719,7 @@ void CDVDPlayerVideo::Process()
             {
               m_codecname = m_pVideoCodec->GetName();
               m_started = true;
-              m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, DVDPLAYER_VIDEO));
+              m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, VideoPlayer_VIDEO));
             }
 
             // guess next frame pts. iDuration is always valid
@@ -776,12 +776,12 @@ void CDVDPlayerVideo::Process()
   m_pVideoCodec->ClearPicture(&picture);
 }
 
-void CDVDPlayerVideo::OnExit()
+void CVideoPlayerVideo::OnExit()
 {
   CLog::Log(LOGNOTICE, "thread end: video_thread");
 }
 
-void CDVDPlayerVideo::SetSpeed(int speed)
+void CVideoPlayerVideo::SetSpeed(int speed)
 {
   if(m_messageQueue.IsInited())
     m_messageQueue.Put( new CDVDMsgInt(CDVDMsg::PLAYER_SETSPEED, speed), 1 );
@@ -789,7 +789,7 @@ void CDVDPlayerVideo::SetSpeed(int speed)
     m_speed = speed;
 }
 
-bool CDVDPlayerVideo::StepFrame()
+bool CVideoPlayerVideo::StepFrame()
 {
 #if 0
   // sadly this doesn't work for now, audio player must
@@ -801,9 +801,9 @@ bool CDVDPlayerVideo::StepFrame()
 #endif
 }
 
-void CDVDPlayerVideo::Flush()
+void CVideoPlayerVideo::Flush()
 {
-  /* flush using message as this get's called from dvdplayer thread */
+  /* flush using message as this get's called from VideoPlayer thread */
   /* and any demux packet that has been taken out of queue need to */
   /* be disposed of before we flush */
   m_messageQueue.Flush();
@@ -811,7 +811,7 @@ void CDVDPlayerVideo::Flush()
 }
 
 #ifdef HAS_VIDEO_PLAYBACK
-void CDVDPlayerVideo::ProcessOverlays(DVDVideoPicture* pSource, double pts)
+void CVideoPlayerVideo::ProcessOverlays(DVDVideoPicture* pSource, double pts)
 {
   // remove any overlays that are out of time
   if (m_started)
@@ -858,7 +858,7 @@ void CDVDPlayerVideo::ProcessOverlays(DVDVideoPicture* pSource, double pts)
 }
 #endif
 
-std::string CDVDPlayerVideo::GetStereoMode()
+std::string CVideoPlayerVideo::GetStereoMode()
 {
   std::string  stereo_mode;
 
@@ -874,7 +874,7 @@ std::string CDVDPlayerVideo::GetStereoMode()
   return stereo_mode;
 }
 
-int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
+int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
 {
   /* picture buffer is not allowed to be modified in this call */
   DVDVideoPicture picture(*src);
@@ -1017,7 +1017,7 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
     m_pClock->Update( iPlayingClock + iClockSleep - iFrameSleep
                     , iCurrentClock
                     , DVD_MSEC_TO_TIME(10)
-                    , "CDVDPlayerVideo::OutputPicture");
+                    , "CVideoPlayerVideo::OutputPicture");
   }
 
   // timestamp when we think next picture should be displayed based on current duration
@@ -1077,7 +1077,7 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
   return result;
 }
 
-std::string CDVDPlayerVideo::GetPlayerInfo()
+std::string CVideoPlayerVideo::GetPlayerInfo()
 {
   std::ostringstream s;
   s << "fr:"     << std::fixed << std::setprecision(3) << m_fFrameRate;
@@ -1096,12 +1096,12 @@ std::string CDVDPlayerVideo::GetPlayerInfo()
   return s.str();
 }
 
-int CDVDPlayerVideo::GetVideoBitrate()
+int CVideoPlayerVideo::GetVideoBitrate()
 {
   return (int)m_videoStats.GetBitrate();
 }
 
-void CDVDPlayerVideo::ResetFrameRateCalc()
+void CVideoPlayerVideo::ResetFrameRateCalc()
 {
   m_fStableFrameRate = 0.0;
   m_iFrameRateCount  = 0;
@@ -1112,7 +1112,7 @@ void CDVDPlayerVideo::ResetFrameRateCalc()
                         g_advancedSettings.m_videoFpsDetect == 0;
 }
 
-double CDVDPlayerVideo::GetCurrentPts()
+double CVideoPlayerVideo::GetCurrentPts()
 {
   double iSleepTime, iRenderPts;
   int queued, discard;
@@ -1137,7 +1137,7 @@ double CDVDPlayerVideo::GetCurrentPts()
 #define MAXFRAMERATEDIFF   0.01
 #define MAXFRAMESERR    1000
 
-void CDVDPlayerVideo::CalcFrameRate()
+void CVideoPlayerVideo::CalcFrameRate()
 {
   if (m_iFrameRateLength >= 128 || g_advancedSettings.m_videoFpsDetect == 0)
     return; //don't calculate the fps
@@ -1217,7 +1217,7 @@ void CDVDPlayerVideo::CalcFrameRate()
   }
 }
 
-int CDVDPlayerVideo::CalcDropRequirement(double pts, bool updateOnly)
+int CVideoPlayerVideo::CalcDropRequirement(double pts, bool updateOnly)
 {
   int result = 0;
   double iSleepTime;
@@ -1248,7 +1248,7 @@ int CDVDPlayerVideo::CalcDropRequirement(double pts, bool updateOnly)
   {
     result |= EOS_BUFFER_LEVEL;
     if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG,"CDVDPlayerVideo::CalcDropRequirement - hurry: %d", iBufferLevel);
+      CLog::Log(LOGDEBUG,"CVideoPlayerVideo::CalcDropRequirement - hurry: %d", iBufferLevel);
   }
 
   bNewFrame = iDecoderPts != m_droppingStats.m_lastDecoderPts;
@@ -1270,7 +1270,7 @@ int CDVDPlayerVideo::CalcDropRequirement(double pts, bool updateOnly)
       result |= EOS_DROPPED;
       m_droppingStats.m_dropRequests = 0;
       if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-        CLog::Log(LOGDEBUG,"CDVDPlayerVideo::CalcDropRequirement - dropped pictures, Sleeptime: %f, Bufferlevel: %d, Gain: %f", iSleepTime, iBufferLevel, iGain);
+        CLog::Log(LOGDEBUG,"CVideoPlayerVideo::CalcDropRequirement - dropped pictures, Sleeptime: %f, Bufferlevel: %d, Gain: %f", iSleepTime, iBufferLevel, iGain);
     }
     else if (iDroppedPics < 0 && iGain > (1/m_fFrameRate + 0.001))
     {
@@ -1282,7 +1282,7 @@ int CDVDPlayerVideo::CalcDropRequirement(double pts, bool updateOnly)
       result |= EOS_DROPPED;
       m_droppingStats.m_dropRequests = 0;
       if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-        CLog::Log(LOGDEBUG,"CDVDPlayerVideo::CalcDropRequirement - dropped in decoder, Sleeptime: %f, Bufferlevel: %d, Gain: %f", iSleepTime, iBufferLevel, iGain);
+        CLog::Log(LOGDEBUG,"CVideoPlayerVideo::CalcDropRequirement - dropped in decoder, Sleeptime: %f, Bufferlevel: %d, Gain: %f", iSleepTime, iBufferLevel, iGain);
     }
   }
   m_droppingStats.m_lastDecoderPts = iDecoderPts;
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.h b/xbmc/cores/VideoPlayer/VideoPlayerVideo.h
index f329b42e95..cd3bc53c67 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.h
+++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.h
@@ -21,14 +21,14 @@
  */
 
 #include "threads/Thread.h"
-#include "IDVDPlayer.h"
+#include "IVideoPlayer.h"
 #include "DVDMessageQueue.h"
 #include "DVDCodecs/Video/DVDVideoCodec.h"
 #include "DVDClock.h"
 #include "DVDOverlayContainer.h"
 #include "DVDTSCorrection.h"
 #ifdef HAS_VIDEO_PLAYBACK
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #endif
 #include "utils/BitstreamStats.h"
 
@@ -54,14 +54,14 @@ public:
   unsigned int m_dropRequests;
 };
 
-class CDVDPlayerVideo : public CThread, public IDVDStreamPlayerVideo
+class CVideoPlayerVideo : public CThread, public IDVDStreamPlayerVideo
 {
 public:
-  CDVDPlayerVideo(CDVDClock* pClock
+  CVideoPlayerVideo(CDVDClock* pClock
                  ,CDVDOverlayContainer* pOverlayContainer
                  ,CDVDMessageQueue& parent
                  ,CRenderManager& renderManager);
-  virtual ~CDVDPlayerVideo();
+  virtual ~CVideoPlayerVideo();
 
   bool OpenStream(CDVDStreamInfo &hint);
   void CloseStream(bool bWaitForBuffers);
@@ -152,7 +152,7 @@ protected:
   bool   m_bAllowDrop;       //we can't drop frames until we've calculated the framerate
   int    m_iFrameRateErr;    //how many frames we couldn't calculate the framerate, we give up after a while
   int    m_iFrameRateLength; //how many seconds we should measure the framerate
-                             //this is increased exponentially from CDVDPlayerVideo::CalcFrameRate()
+                             //this is increased exponentially from CVideoPlayerVideo::CalcFrameRate()
 
   bool   m_bFpsInvalid;      // needed to ignore fps (e.g. dvd stills)
 
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
index 2815687049..b90f0558e1 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
@@ -33,7 +33,7 @@
 #include "utils/MathUtils.h"
 #include "utils/SystemInfo.h"
 #include "settings/AdvancedSettings.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFlags.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 
 
 CBaseRenderer::CBaseRenderer()
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.h
index cbec8792a1..cbec8792a1 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/BaseRenderer.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/DXVAHD.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp
index dc3d5c48b7..8bb3dbc457 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/DXVAHD.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp
@@ -28,7 +28,7 @@
 #include <dxva2api.h>
 #include <windows.h>
 #include "DXVAHD.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "RenderFlags.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/MediaSettings.h"
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/DXVAHD.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.h
index 154668f12b..154668f12b 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/DXVAHD.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
index 466f44cfc3..336ea1df2e 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
@@ -21,7 +21,7 @@
 #include "Util.h"
 #include "threads/Atomics.h"
 #include "MMALRenderer.h"
-#include "cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h"
+#include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h"
 #include "filesystem/File.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/DisplaySettings.h"
@@ -31,7 +31,7 @@
 #include "utils/log.h"
 #include "utils/MathUtils.h"
 #include "windowing/WindowingFactory.h"
-#include "cores/dvdplayer/DVDCodecs/Video/MMALCodec.h"
+#include "cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h"
 #include "xbmc/Application.h"
 
 #define CLASSNAME "CMMALRenderer"
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/MMALRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h
index b3649f5b89..4eff4a97bf 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/MMALRenderer.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h
@@ -26,7 +26,7 @@
 #include "BaseRenderer.h"
 #include "RenderCapture.h"
 #include "settings/VideoSettings.h"
-#include "cores/dvdplayer/DVDStreamInfo.h"
+#include "cores/VideoPlayer/DVDStreamInfo.h"
 #include "guilib/Geometry.h"
 #include "BaseRenderer.h"
 
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/Makefile.in b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/Makefile.in
index f173b456b9..f173b456b9 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/Makefile.in
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/Makefile.in
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVAAPI.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVAAPI.cpp
index d0b4250430..db212220e3 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVAAPI.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVAAPI.cpp
@@ -22,8 +22,8 @@
 
 #ifdef HAVE_LIBVA
 
-#include "cores/dvdplayer/DVDCodecs/Video/VAAPI.h"
-#include "cores/dvdplayer/DVDCodecs/DVDCodecUtils.h"
+#include "cores/VideoPlayer/DVDCodecs/Video/VAAPI.h"
+#include "cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h"
 #include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "utils/log.h"
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVAAPI.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVAAPI.h
index e0f429ca92..f5ca95058c 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVAAPI.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVAAPI.h
@@ -24,7 +24,7 @@
 
 #ifdef HAVE_LIBVA
 
-#include "cores/dvdplayer/VideoRenderers/LinuxRendererGL.h"
+#include "cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h"
 
 class CRendererVAAPI : public CLinuxRendererGL
 {
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVDA.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVDA.cpp
index 41c9add383..8cf4280855 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVDA.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVDA.cpp
@@ -24,7 +24,7 @@
 
 #include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
-#include "cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h"
+#include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h"
 #include "utils/log.h"
 #include "osx/CocoaInterface.h"
 #include <CoreVideo/CoreVideo.h>
@@ -47,7 +47,7 @@ void CRendererVDA::AddVideoPictureHW(DVDVideoPicture &picture, int index)
   if (buf.hwDec)
     CVBufferRelease((struct __CVBuffer *)buf.hwDec);
   buf.hwDec = picture.cvBufferRef;
-  // retain another reference, this way dvdplayer and renderer can issue releases.
+  // retain another reference, this way VideoPlayer and renderer can issue releases.
   CVBufferRetain(picture.cvBufferRef);
 }
 
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVDA.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVDA.h
index 94a5b576f4..b8254e5665 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVDA.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVDA.h
@@ -24,7 +24,7 @@
 
 #if defined(TARGET_DARWIN_OSX)
 
-#include "cores/dvdplayer/VideoRenderers/LinuxRendererGL.h"
+#include "cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h"
 
 class CRendererVDA : public CLinuxRendererGL
 {
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVDPAU.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVDPAU.cpp
index 02117849f0..e94d0aa614 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVDPAU.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVDPAU.cpp
@@ -22,7 +22,7 @@
 
 #ifdef HAVE_LIBVDPAU
 
-#include "cores/dvdplayer/DVDCodecs/Video/VDPAU.h"
+#include "cores/VideoPlayer/DVDCodecs/Video/VDPAU.h"
 #include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "utils/log.h"
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVDPAU.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVDPAU.h
index 295b42ff7b..116486ef15 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/HwDecRender/RendererVDPAU.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVDPAU.h
@@ -24,7 +24,7 @@
 
 #ifdef HAVE_LIBVDPAU
 
-#include "cores/dvdplayer/VideoRenderers/LinuxRendererGL.h"
+#include "cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h"
 
 class CRendererVDPAU : public CLinuxRendererGL
 {
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp
index 821b65961e..1df43eadae 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/LinuxRendererGL.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp
@@ -47,7 +47,7 @@
 #include "RenderCapture.h"
 #include "RenderFormats.h"
 #include "cores/IPlayer.h"
-#include "cores/dvdplayer/DVDCodecs/DVDCodecUtils.h"
+#include "cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h"
 #include "cores/FFmpeg.h"
 
 extern "C" {
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
index f7e3cc7fe0..f7e3cc7fe0 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/LinuxRendererGL.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp
index af063416a8..7596fbc08c 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/LinuxRendererGLES.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp
@@ -43,7 +43,7 @@
 #include "VideoShaders/VideoFilterShader.h"
 #include "windowing/WindowingFactory.h"
 #include "guilib/Texture.h"
-#include "../dvdplayer/DVDCodecs/Video/OpenMaxVideo.h"
+#include "../VideoPlayer/DVDCodecs/Video/OpenMaxVideo.h"
 #include "threads/SingleLock.h"
 #include "RenderCapture.h"
 #include "RenderFormats.h"
@@ -3104,7 +3104,7 @@ void CLinuxRendererGLES::AddProcessor(struct __CVBuffer *cvBufferRef, int index)
   if (buf.cvBufferRef)
     CVBufferRelease(buf.cvBufferRef);
   buf.cvBufferRef = cvBufferRef;
-  // retain another reference, this way dvdplayer and renderer can issue releases.
+  // retain another reference, this way VideoPlayer and renderer can issue releases.
   CVBufferRetain(buf.cvBufferRef);
 }
 #endif
@@ -3145,7 +3145,7 @@ void CLinuxRendererGLES::AddProcessor(CDVDMediaCodecInfo *mediacodec, int index)
     mindex = buf.mediacodec->GetIndex();
 #endif
     // releaseOutputBuffer must be in same thread as
-    // dequeueOutputBuffer. We are in DVDPlayerVideo
+    // dequeueOutputBuffer. We are in VideoPlayerVideo
     // thread here, so we are safe.
     buf.mediacodec->ReleaseOutputBuffer(true);
   }
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/LinuxRendererGLES.h b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h
index f083e7c095..d25bcfaa90 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/LinuxRendererGLES.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h
@@ -32,7 +32,7 @@
 #include "RenderFormats.h"
 #include "guilib/GraphicContext.h"
 #include "BaseRenderer.h"
-#include "xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h"
+#include "xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h"
 
 class CRenderCapture;
 
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/Makefile.in b/xbmc/cores/VideoPlayer/VideoRenderers/Makefile.in
index d964285020..d964285020 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/Makefile.in
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/Makefile.in
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRenderer.cpp
index 21ca277488..33c36c5544 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRenderer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRenderer.cpp
@@ -21,12 +21,12 @@
 
 #include "system.h"
 #include "OverlayRenderer.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlay.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlay.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayImage.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySpu.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySSA.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayText.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "guilib/GraphicContext.h"
 #include "Application.h"
 #include "settings/Settings.h"
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRenderer.h
index 1616c654b8..1616c654b8 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRenderer.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRenderer.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererDX.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.cpp
index 93e3aeea4c..1395c350b4 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererDX.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.cpp
@@ -19,9 +19,9 @@
  */
 
 #include "Application.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayImage.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySpu.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySSA.h"
 #include "guilib/D3DResource.h"
 #include "OverlayRenderer.h"
 #include "OverlayRendererUtil.h"
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererDX.h b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.h
index 47f413c71d..47f413c71d 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererDX.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.cpp
index 2767731c0a..1c3671aaf7 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererGL.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.cpp
@@ -30,9 +30,9 @@
 #endif
 #include "guilib/MatrixGLES.h"
 #include "RenderManager.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayImage.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySpu.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySSA.h"
 #include "windowing/WindowingFactory.h"
 #include "settings/Settings.h"
 #include "utils/MathUtils.h"
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.h
index 0950968bf3..0950968bf3 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererGL.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererGUI.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGUI.cpp
index 5c11cca40f..b4c65e9861 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererGUI.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGUI.cpp
@@ -29,7 +29,7 @@
 #include "guilib/GUITextLayout.h"
 #include "guilib/GUIFontManager.h"
 #include "guilib/GUIFont.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayText.h"
 
 using namespace OVERLAY;
 
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererGUI.h b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGUI.h
index abedcfba98..abedcfba98 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererGUI.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGUI.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererUtil.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererUtil.cpp
index 0dcfee5941..f19451ac4b 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererUtil.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererUtil.cpp
@@ -20,9 +20,9 @@
 
 #include "system.h"
 #include "OverlayRendererUtil.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h"
-#include "cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayImage.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySpu.h"
+#include "cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySSA.h"
 #include "windowing/WindowingFactory.h"
 #include "guilib/GraphicContext.h"
 #include "settings/Settings.h"
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererUtil.h b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererUtil.h
index a132149bee..a132149bee 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/OverlayRendererUtil.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererUtil.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/RenderCapture.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderCapture.cpp
index fcd742b8d4..fcd742b8d4 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/RenderCapture.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderCapture.cpp
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/RenderCapture.h b/xbmc/cores/VideoPlayer/VideoRenderers/RenderCapture.h
index 63df83a4ea..58c561244a 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/RenderCapture.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderCapture.h
@@ -174,7 +174,7 @@ class CRenderCaptureBase
 
 
 #if defined(HAS_IMXVPU)
-#include "../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h"
+#include "../VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h"
 
 class CRenderCaptureIMX : public CRenderCaptureBase
 {
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/RenderFlags.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp
index 809766a64b..809766a64b 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/RenderFlags.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/RenderFlags.h b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.h
index 84ee93735f..84ee93735f 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/RenderFlags.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/RenderFormats.h b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFormats.h
index c6329ff7f6..c6329ff7f6 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/RenderFormats.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFormats.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
index 44dd550ba4..ecf3625569 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
@@ -56,9 +56,9 @@
 #include "RenderCapture.h"
 
 /* to use the same as player */
-#include "../dvdplayer/DVDClock.h"
-#include "../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h"
-#include "../dvdplayer/DVDCodecs/DVDCodecUtils.h"
+#include "../VideoPlayer/DVDClock.h"
+#include "../VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h"
+#include "../VideoPlayer/DVDCodecs/DVDCodecUtils.h"
 
 using namespace KODI::MESSAGING;
 
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/RenderManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.h
index 6b7a664432..330b9fc861 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/RenderManager.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.h
@@ -22,8 +22,8 @@
 
 #include <list>
 
-#include "cores/dvdplayer/VideoRenderers/BaseRenderer.h"
-#include "cores/dvdplayer/VideoRenderers/OverlayRenderer.h"
+#include "cores/VideoPlayer/VideoRenderers/BaseRenderer.h"
+#include "cores/VideoPlayer/VideoRenderers/OverlayRenderer.h"
 #include "guilib/Geometry.h"
 #include "guilib/Resolution.h"
 #include "threads/SharedSection.h"
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/ConvolutionKernels.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConvolutionKernels.cpp
index 4563c3b85e..4563c3b85e 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/ConvolutionKernels.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConvolutionKernels.cpp
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/ConvolutionKernels.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConvolutionKernels.h
index 0f33b4a1f8..0f33b4a1f8 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/ConvolutionKernels.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConvolutionKernels.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/GLSLOutput.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/GLSLOutput.cpp
index 6ec66d3962..6ec66d3962 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/GLSLOutput.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/GLSLOutput.cpp
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/GLSLOutput.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/GLSLOutput.h
index 4119923d9c..4119923d9c 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/GLSLOutput.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/GLSLOutput.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/Makefile b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/Makefile
index 286f564172..286f564172 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/Makefile
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/Makefile
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/VideoFilterShader.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShader.cpp
index fcfb3a0a13..fcfb3a0a13 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/VideoFilterShader.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShader.cpp
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/VideoFilterShader.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShader.h
index 4d21c21d3e..4d21c21d3e 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/VideoFilterShader.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShader.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp
index 2aafd0ef4b..2aafd0ef4b 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/WinVideoFilter.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h
index e6bbd440a4..e6bbd440a4 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/WinVideoFilter.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/YUV2RGBShader.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShader.cpp
index 643f38cb31..495f5e8215 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/YUV2RGBShader.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShader.cpp
@@ -29,7 +29,7 @@
 #if defined(HAS_GL) || defined(HAS_GLES)
 #include "utils/GLUtils.h"
 #endif
-#include "cores/dvdplayer/VideoRenderers/RenderFormats.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFormats.h"
 
 #include <string>
 #include <sstream>
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/YUV2RGBShader.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShader.h
index a6b7c1d1cc..1cdcc9467b 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/YUV2RGBShader.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShader.h
@@ -22,7 +22,7 @@
  */
 
 #include "guilib/TransformMatrix.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFormats.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFormats.h"
 
 #include "GLSLOutput.h"
 
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/dither.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/dither.h
index d9a6bd736f..d9a6bd736f 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/VideoShaders/dither.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/dither.h
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/WinRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.cpp
index e7e82a2009..ad7cdfea77 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/WinRenderer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.cpp
@@ -21,7 +21,7 @@
 #ifdef HAS_DX
 
 #include "WinRenderer.h"
-#include "cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h"
+#include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h"
 #include "cores/FFmpeg.h"
 #include "dialogs/GUIDialogKaiToast.h"
 #include "guilib/LocalizeStrings.h"
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/WinRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h
index 83468cb88d..a134c643a7 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/WinRenderer.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h
@@ -87,8 +87,8 @@ struct SVideoBuffer
 {
   virtual ~SVideoBuffer() {}
   virtual void Release() {};            // Release any allocated resource
-  virtual void StartDecode() {};        // Prepare the buffer to receive data from dvdplayer
-  virtual void StartRender() {};        // dvdplayer finished filling the buffer with data
+  virtual void StartDecode() {};        // Prepare the buffer to receive data from VideoPlayer
+  virtual void StartRender() {};        // VideoPlayer finished filling the buffer with data
   virtual void Clear() {};              // clear the buffer with solid black
   virtual bool IsReadyToRender() { return true; };
 };
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/yuv2rgb.neon.S b/xbmc/cores/VideoPlayer/VideoRenderers/yuv2rgb.neon.S
index 5bc5b1b598..5bc5b1b598 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/yuv2rgb.neon.S
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/yuv2rgb.neon.S
diff --git a/xbmc/cores/dvdplayer/VideoRenderers/yuv2rgb.neon.h b/xbmc/cores/VideoPlayer/VideoRenderers/yuv2rgb.neon.h
index a536fe3505..a536fe3505 100644
--- a/xbmc/cores/dvdplayer/VideoRenderers/yuv2rgb.neon.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/yuv2rgb.neon.h
diff --git a/xbmc/cores/omxplayer/OMXHelper.cpp b/xbmc/cores/omxplayer/OMXHelper.cpp
index de493a2a6c..d09116f9ee 100644
--- a/xbmc/cores/omxplayer/OMXHelper.cpp
+++ b/xbmc/cores/omxplayer/OMXHelper.cpp
@@ -22,7 +22,7 @@
 
 #ifdef HAS_OMXPLAYER
 
-#include "DVDPlayer.h"
+#include "VideoPlayer.h"
 #include "settings/Settings.h"
 #include "settings/MediaSettings.h"
 #include "DVDInputStreams/DVDInputStream.h"
@@ -108,7 +108,7 @@ bool OMXPlayerUnsuitable(bool m_HasVideo, bool m_HasAudio, CDVDDemux* m_pDemuxer
   return false;
 }
 
-bool OMXDoProcessing(struct SOmxPlayerState &m_OmxPlayerState, int m_playSpeed, IDVDStreamPlayerVideo *m_dvdPlayerVideo, IDVDStreamPlayerAudio *m_dvdPlayerAudio,
+bool OMXDoProcessing(struct SOmxPlayerState &m_OmxPlayerState, int m_playSpeed, IDVDStreamPlayerVideo *m_VideoPlayerVideo, IDVDStreamPlayerAudio *m_VideoPlayerAudio,
                      CCurrentStream m_CurrentAudio, CCurrentStream m_CurrentVideo, bool m_HasVideo, bool m_HasAudio)
 {
   bool reopen_stream = false;
@@ -118,11 +118,11 @@ bool OMXDoProcessing(struct SOmxPlayerState &m_OmxPlayerState, int m_playSpeed,
     m_OmxPlayerState.last_check_time = now;
     m_OmxPlayerState.stamp = m_OmxPlayerState.av_clock.OMXMediaTime();
     const bool m_Pause = m_playSpeed == DVD_PLAYSPEED_PAUSE;
-    const bool not_accepts_data = (!m_dvdPlayerAudio->AcceptsData() && m_HasAudio) ||
-        (!m_dvdPlayerVideo->AcceptsData() && m_HasVideo >= 0);
+    const bool not_accepts_data = (!m_VideoPlayerAudio->AcceptsData() && m_HasAudio) ||
+        (!m_VideoPlayerVideo->AcceptsData() && m_HasVideo >= 0);
     /* when the video/audio fifos are low, we pause clock, when high we resume */
-    double audio_pts = floor(m_dvdPlayerAudio->GetCurrentPts());
-    double video_pts = floor(m_dvdPlayerVideo->GetCurrentPts());
+    double audio_pts = floor(m_VideoPlayerAudio->GetCurrentPts());
+    double video_pts = floor(m_VideoPlayerVideo->GetCurrentPts());
 
     float audio_fifo = audio_pts / DVD_TIME_BASE - m_OmxPlayerState.stamp * 1e-6;
     float video_fifo = video_pts / DVD_TIME_BASE - m_OmxPlayerState.stamp * 1e-6;
@@ -146,28 +146,28 @@ bool OMXDoProcessing(struct SOmxPlayerState &m_OmxPlayerState, int m_playSpeed,
       reopen_stream = true;
     }
 
-    m_OmxPlayerState.video_fifo = (int)(100.0*(m_dvdPlayerVideo->GetDecoderBufferSize()-m_dvdPlayerVideo->GetDecoderFreeSpace())/m_dvdPlayerVideo->GetDecoderBufferSize());
-    m_OmxPlayerState.audio_fifo = (int)(100.0*audio_fifo/m_dvdPlayerAudio->GetCacheTotal());
+    m_OmxPlayerState.video_fifo = (int)(100.0*(m_VideoPlayerVideo->GetDecoderBufferSize()-m_VideoPlayerVideo->GetDecoderFreeSpace())/m_VideoPlayerVideo->GetDecoderBufferSize());
+    m_OmxPlayerState.audio_fifo = (int)(100.0*audio_fifo/m_VideoPlayerAudio->GetCacheTotal());
 
     #ifdef _DEBUG
     static unsigned count;
     if ((count++ & 7) == 0)
     {
       char response[80];
-      if (m_dvdPlayerVideo->GetDecoderBufferSize() && m_dvdPlayerAudio->GetCacheTotal())
+      if (m_VideoPlayerVideo->GetDecoderBufferSize() && m_VideoPlayerAudio->GetCacheTotal())
         vc_gencmd(response, sizeof response, "render_bar 4 video_fifo %d %d %d %d",
             m_OmxPlayerState.video_fifo,
-            (int)(100.0*video_fifo/m_dvdPlayerAudio->GetCacheTotal()),
+            (int)(100.0*video_fifo/m_VideoPlayerAudio->GetCacheTotal()),
             0, 100);
-      if (m_dvdPlayerAudio->GetCacheTotal())
+      if (m_VideoPlayerAudio->GetCacheTotal())
         vc_gencmd(response, sizeof response, "render_bar 5 audio_fifo %d %d %d %d",
             m_OmxPlayerState.audio_fifo,
-            (int)(100.0*m_dvdPlayerAudio->GetDelay()/m_dvdPlayerAudio->GetCacheTotal()),
+            (int)(100.0*m_VideoPlayerAudio->GetDelay()/m_VideoPlayerAudio->GetCacheTotal()),
             0, 100);
       vc_gencmd(response, sizeof response, "render_bar 6 video_queue %d %d %d %d",
-            m_dvdPlayerVideo->GetLevel(), 0, 0, 100);
+            m_VideoPlayerVideo->GetLevel(), 0, 0, 100);
       vc_gencmd(response, sizeof response, "render_bar 7 audio_queue %d %d %d %d",
-            m_dvdPlayerAudio->GetLevel(), 0, 0, 100);
+            m_VideoPlayerAudio->GetLevel(), 0, 0, 100);
     }
     #endif
     if (audio_pts != DVD_NOPTS_VALUE)
@@ -186,19 +186,19 @@ bool OMXDoProcessing(struct SOmxPlayerState &m_OmxPlayerState, int m_playSpeed,
       video_fifo_high = true;
 
     #ifdef _DEBUG
-    CLog::Log(LOGDEBUG, "%s::%s M:%.6f-%.6f (A:%.6f V:%.6f) PEF:%d%d%d S:%.2f A:%.2f V:%.2f/T:%.2f (A:%d%d V:%d%d) A:%d%% V:%d%% (%.2f,%.2f)", "CDVDPlayer", __FUNCTION__,
+    CLog::Log(LOGDEBUG, "%s::%s M:%.6f-%.6f (A:%.6f V:%.6f) PEF:%d%d%d S:%.2f A:%.2f V:%.2f/T:%.2f (A:%d%d V:%d%d) A:%d%% V:%d%% (%.2f,%.2f)", "CVideoPlayer", __FUNCTION__,
       m_OmxPlayerState.stamp*1e-6, m_OmxPlayerState.av_clock.OMXClockAdjustment()*1e-6, audio_pts*1e-6, video_pts*1e-6,
       m_OmxPlayerState.av_clock.OMXIsPaused(), m_OmxPlayerState.bOmxSentEOFs, not_accepts_data, m_playSpeed * (1.0f/DVD_PLAYSPEED_NORMAL),
       audio_pts == DVD_NOPTS_VALUE ? 0.0:audio_fifo, video_pts == DVD_NOPTS_VALUE ? 0.0:video_fifo, m_OmxPlayerState.threshold,
       audio_fifo_low, audio_fifo_high, video_fifo_low, video_fifo_high,
-      m_dvdPlayerAudio->GetLevel(), m_dvdPlayerVideo->GetLevel(), m_dvdPlayerAudio->GetDelay(), (float)m_dvdPlayerAudio->GetCacheTotal());
+      m_VideoPlayerAudio->GetLevel(), m_VideoPlayerVideo->GetLevel(), m_VideoPlayerAudio->GetDelay(), (float)m_VideoPlayerAudio->GetCacheTotal());
     #endif
 
     if(!m_Pause && (m_OmxPlayerState.bOmxSentEOFs || not_accepts_data || (audio_fifo_high && video_fifo_high) || m_playSpeed != DVD_PLAYSPEED_NORMAL))
     {
       if (m_OmxPlayerState.av_clock.OMXIsPaused())
       {
-        CLog::Log(LOGDEBUG, "%s::%s Resume %.2f,%.2f (A:%d%d V:%d%d) EOF:%d FULL:%d T:%.2f", "CDVDPlayer", __FUNCTION__, audio_fifo, video_fifo,
+        CLog::Log(LOGDEBUG, "%s::%s Resume %.2f,%.2f (A:%d%d V:%d%d) EOF:%d FULL:%d T:%.2f", "CVideoPlayer", __FUNCTION__, audio_fifo, video_fifo,
           audio_fifo_low, audio_fifo_high, video_fifo_low, video_fifo_high, m_OmxPlayerState.bOmxSentEOFs, not_accepts_data, m_OmxPlayerState.threshold);
         m_OmxPlayerState.av_clock.OMXResume();
       }
@@ -209,7 +209,7 @@ bool OMXDoProcessing(struct SOmxPlayerState &m_OmxPlayerState, int m_playSpeed,
       {
         if (!m_Pause)
           m_OmxPlayerState.threshold = std::min(2.0f*m_OmxPlayerState.threshold, 16.0f);
-        CLog::Log(LOGDEBUG, "%s::%s Pause %.2f,%.2f (A:%d%d V:%d%d) EOF:%d FULL:%d T:%.2f", "CDVDPlayer", __FUNCTION__, audio_fifo, video_fifo,
+        CLog::Log(LOGDEBUG, "%s::%s Pause %.2f,%.2f (A:%d%d V:%d%d) EOF:%d FULL:%d T:%.2f", "CVideoPlayer", __FUNCTION__, audio_fifo, video_fifo,
           audio_fifo_low, audio_fifo_high, video_fifo_low, video_fifo_high, m_OmxPlayerState.bOmxSentEOFs, not_accepts_data, m_OmxPlayerState.threshold);
         m_OmxPlayerState.av_clock.OMXPause();
       }
diff --git a/xbmc/cores/omxplayer/OMXHelper.h b/xbmc/cores/omxplayer/OMXHelper.h
index ef12051a5b..a372c204c3 100644
--- a/xbmc/cores/omxplayer/OMXHelper.h
+++ b/xbmc/cores/omxplayer/OMXHelper.h
@@ -23,6 +23,6 @@
 #include "system.h"
 
 bool OMXPlayerUnsuitable(bool m_HasVideo, bool m_HasAudio, CDVDDemux* m_pDemuxer, CDVDInputStream* m_pInputStream, CSelectionStreams &m_SelectionStreams);
-bool OMXDoProcessing(struct SOmxPlayerState &m_OmxPlayerState, int m_playSpeed, IDVDStreamPlayerVideo *m_dvdPlayerVideo, IDVDStreamPlayerAudio *m_dvdPlayerAudio,
+bool OMXDoProcessing(struct SOmxPlayerState &m_OmxPlayerState, int m_playSpeed, IDVDStreamPlayerVideo *m_VideoPlayerVideo, IDVDStreamPlayerAudio *m_VideoPlayerAudio,
                      CCurrentStream m_CurrentAudio, CCurrentStream m_CurrentVideo, bool m_HasVideo, bool m_HasAudio);
 bool OMXStillPlaying(bool waitVideo, bool waitAudio, bool eosVideo, bool eosAudio);
diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
index 1c3b904dc9..e626b2789f 100644
--- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
@@ -40,7 +40,7 @@
 #include "settings/Settings.h"
 #include "utils/TimeUtils.h"
 
-#include "DVDPlayer.h"
+#include "VideoPlayer.h"
 #include "linux/RBP.h"
 #include "cores/AudioEngine/AEFactory.h"
 #include "cores/DataCacheCore.h"
@@ -331,7 +331,7 @@ bool OMXPlayerAudio::Decode(DemuxPacket *pkt, bool bDropPacket)
   if(m_started == false)
   {
     m_started = true;
-    m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, DVDPLAYER_AUDIO));
+    m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, VideoPlayer_AUDIO));
   }
 
   return true;
@@ -393,11 +393,11 @@ void OMXPlayerAudio::Process()
 
       if (pMsgGeneralResync->m_clock && pMsgGeneralResync->m_timestamp != DVD_NOPTS_VALUE)
       {
-        CLog::Log(LOGDEBUG, "CDVDPlayerAudio - CDVDMsg::GENERAL_RESYNC(%f, %f, 1)", m_audioClock, pMsgGeneralResync->m_timestamp);
+        CLog::Log(LOGDEBUG, "CVideoPlayerAudio - CDVDMsg::GENERAL_RESYNC(%f, %f, 1)", m_audioClock, pMsgGeneralResync->m_timestamp);
         m_av_clock->Discontinuity(pMsgGeneralResync->m_timestamp);
       }
       else
-        CLog::Log(LOGDEBUG, "CDVDPlayerAudio - CDVDMsg::GENERAL_RESYNC(%f, 0)", m_audioClock);
+        CLog::Log(LOGDEBUG, "CVideoPlayerAudio - CDVDMsg::GENERAL_RESYNC(%f, 0)", m_audioClock);
 
       m_flush = false;
       m_audioClock = DVD_NOPTS_VALUE;
@@ -425,15 +425,15 @@ void OMXPlayerAudio::Process()
     {
       CLog::Log(LOGDEBUG, "COMXPlayerAudio - CDVDMsg::PLAYER_STARTED %d", m_started);
       if(m_started)
-        m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, DVDPLAYER_AUDIO));
+        m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, VideoPlayer_AUDIO));
     }
     else if (pMsg->IsType(CDVDMsg::PLAYER_DISPLAYTIME))
     {
-      CDVDPlayer::SPlayerState& state = ((CDVDMsgType<CDVDPlayer::SPlayerState>*)pMsg)->m_value;
+      CVideoPlayer::SPlayerState& state = ((CDVDMsgType<CVideoPlayer::SPlayerState>*)pMsg)->m_value;
 
       if (m_speed != DVD_PLAYSPEED_NORMAL && m_speed != DVD_PLAYSPEED_PAUSE)
       {
-        if(state.time_src == CDVDPlayer::ETIMESOURCE_CLOCK)
+        if(state.time_src == CVideoPlayer::ETIMESOURCE_CLOCK)
           state.time      = DVD_TIME_TO_MSEC(m_av_clock->GetClock(state.timestamp) + state.time_offset);
         else
           state.timestamp = CDVDClock::GetAbsoluteClock();
@@ -442,7 +442,7 @@ void OMXPlayerAudio::Process()
       {
         double pts = m_audioClock;
         double stamp = m_av_clock->OMXMediaTime();
-        if(state.time_src == CDVDPlayer::ETIMESOURCE_CLOCK)
+        if(state.time_src == CVideoPlayer::ETIMESOURCE_CLOCK)
           state.time      = stamp == 0.0 ? state.time : DVD_TIME_TO_MSEC(stamp + state.time_offset);
         else
           state.time      = stamp == 0.0 || pts == DVD_NOPTS_VALUE ? state.time : state.time + DVD_TIME_TO_MSEC(stamp - pts);
@@ -450,7 +450,7 @@ void OMXPlayerAudio::Process()
         if (stamp == 0.0) // cause message to be ignored
           state.player = 0;
       }
-      state.player    = DVDPLAYER_AUDIO;
+      state.player    = VideoPlayer_AUDIO;
       m_messageParent.Put(pMsg->Acquire());
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_EOF))
diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.h b/xbmc/cores/omxplayer/OMXPlayerAudio.h
index 7be174f587..26c4b24221 100644
--- a/xbmc/cores/omxplayer/OMXPlayerAudio.h
+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.h
@@ -29,7 +29,7 @@
 #include "OMXAudio.h"
 #include "OMXAudioCodecOMX.h"
 #include "threads/Thread.h"
-#include "IDVDPlayer.h"
+#include "IVideoPlayer.h"
 
 #include "DVDDemuxers/DVDDemux.h"
 #include "DVDMessageQueue.h"
diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
index 31ec03801c..1d1620bdc4 100644
--- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
@@ -43,11 +43,11 @@
 #include "settings/DisplaySettings.h"
 #include "settings/Settings.h"
 #include "settings/MediaSettings.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFormats.h"
-#include "cores/dvdplayer/VideoRenderers/RenderFlags.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFormats.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "guilib/GraphicContext.h"
 
-#include "DVDPlayer.h"
+#include "VideoPlayer.h"
 #include "linux/RBP.h"
 
 using namespace RenderManager;
@@ -358,11 +358,11 @@ void OMXPlayerVideo::Process()
 
       if(pMsgGeneralResync->m_clock && pMsgGeneralResync->m_timestamp != DVD_NOPTS_VALUE)
       {
-        CLog::Log(LOGDEBUG, "CDVDPlayerVideo - CDVDMsg::GENERAL_RESYNC(%f, %f, 1)", m_iCurrentPts, pMsgGeneralResync->m_timestamp);
+        CLog::Log(LOGDEBUG, "CVideoPlayerVideo - CDVDMsg::GENERAL_RESYNC(%f, %f, 1)", m_iCurrentPts, pMsgGeneralResync->m_timestamp);
         m_av_clock->Discontinuity(pMsgGeneralResync->m_timestamp - delay);
       }
       else
-        CLog::Log(LOGDEBUG, "CDVDPlayerVideo - CDVDMsg::GENERAL_RESYNC(%f, 0)", m_iCurrentPts);
+        CLog::Log(LOGDEBUG, "CVideoPlayerVideo - CDVDMsg::GENERAL_RESYNC(%f, 0)", m_iCurrentPts);
 
       m_nextOverlay = DVD_NOPTS_VALUE;
       m_iCurrentPts = DVD_NOPTS_VALUE;
@@ -408,15 +408,15 @@ void OMXPlayerVideo::Process()
     {
       CLog::Log(LOGDEBUG, "COMXPlayerVideo - CDVDMsg::PLAYER_STARTED %d", m_started);
       if(m_started)
-        m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, DVDPLAYER_VIDEO));
+        m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, VideoPlayer_VIDEO));
     }
     else if (pMsg->IsType(CDVDMsg::PLAYER_DISPLAYTIME))
     {
-      CDVDPlayer::SPlayerState& state = ((CDVDMsgType<CDVDPlayer::SPlayerState>*)pMsg)->m_value;
+      CVideoPlayer::SPlayerState& state = ((CDVDMsgType<CVideoPlayer::SPlayerState>*)pMsg)->m_value;
 
       if (m_speed != DVD_PLAYSPEED_NORMAL && m_speed != DVD_PLAYSPEED_PAUSE)
       {
-        if(state.time_src == CDVDPlayer::ETIMESOURCE_CLOCK)
+        if(state.time_src == CVideoPlayer::ETIMESOURCE_CLOCK)
           state.time      = DVD_TIME_TO_MSEC(m_av_clock->GetClock(state.timestamp) + state.time_offset);
         else
           state.timestamp = CDVDClock::GetAbsoluteClock();
@@ -425,7 +425,7 @@ void OMXPlayerVideo::Process()
       {
         double pts = m_iCurrentPts;
         double stamp = m_av_clock->OMXMediaTime();
-        if(state.time_src == CDVDPlayer::ETIMESOURCE_CLOCK)
+        if(state.time_src == CVideoPlayer::ETIMESOURCE_CLOCK)
           state.time      = stamp == 0.0 ? state.time : DVD_TIME_TO_MSEC(stamp + state.time_offset);
         else
           state.time      = stamp == 0.0 || pts == DVD_NOPTS_VALUE ? state.time : state.time + DVD_TIME_TO_MSEC(stamp - pts);
@@ -433,7 +433,7 @@ void OMXPlayerVideo::Process()
         if (stamp == 0.0) // cause message to be ignored
           state.player = 0;
       }
-      state.player    = DVDPLAYER_VIDEO;
+      state.player    = VideoPlayer_VIDEO;
       m_messageParent.Put(pMsg->Acquire());
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_STREAMCHANGE))
@@ -508,7 +508,7 @@ void OMXPlayerVideo::Process()
         {
           m_codecname = m_omxVideo.GetDecoderName();
           m_started = true;
-          m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, DVDPLAYER_VIDEO));
+          m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, VideoPlayer_VIDEO));
         }
 
         break;
diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.h b/xbmc/cores/omxplayer/OMXPlayerVideo.h
index 7cca514196..d2e70546bc 100644
--- a/xbmc/cores/omxplayer/OMXPlayerVideo.h
+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.h
@@ -28,7 +28,7 @@
 #include "DVDStreamInfo.h"
 #include "OMXVideo.h"
 #include "threads/Thread.h"
-#include "IDVDPlayer.h"
+#include "IVideoPlayer.h"
 
 #include "DVDDemuxers/DVDDemux.h"
 #include "DVDCodecs/Video/DVDVideoCodec.h"
@@ -36,7 +36,7 @@
 #include "DVDMessageQueue.h"
 #include "utils/BitstreamStats.h"
 #include "linux/DllBCM.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 
 class OMXPlayerVideo : public CThread, public IDVDStreamPlayerVideo
 {
diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp
index 0a56632846..cc6a6c3d7d 100644
--- a/xbmc/cores/omxplayer/OMXVideo.cpp
+++ b/xbmc/cores/omxplayer/OMXVideo.cpp
@@ -31,7 +31,7 @@
 #include "DVDDemuxers/DVDDemuxUtils.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/MediaSettings.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "xbmc/guilib/GraphicContext.h"
 #include "settings/Settings.h"
 #include "utils/BitstreamConverter.h"
diff --git a/xbmc/cores/omxplayer/OMXVideoCodec.h b/xbmc/cores/omxplayer/OMXVideoCodec.h
index c2ff27dec5..d8063d05a2 100644
--- a/xbmc/cores/omxplayer/OMXVideoCodec.h
+++ b/xbmc/cores/omxplayer/OMXVideoCodec.h
@@ -45,7 +45,7 @@ struct OMXCoreVideoBuffer;
 // should be entirely filled by all codecs
 struct DVDVideoPicture
 {
-  double pts; // timestamp in seconds, used in the CDVDPlayer class to keep track of pts
+  double pts; // timestamp in seconds, used in the CVideoPlayer class to keep track of pts
   double dts;
 
   union
diff --git a/xbmc/cores/omxplayer/omxplayer_advancedsettings.xml b/xbmc/cores/omxplayer/omxplayer_advancedsettings.xml
index 1d4b72eb1a..fc4c24bdee 100644
--- a/xbmc/cores/omxplayer/omxplayer_advancedsettings.xml
+++ b/xbmc/cores/omxplayer/omxplayer_advancedsettings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
   <video>
-    <defaultplayer>dvdplayer</defaultplayer>
-    <defaultdvdplayer>dvdplayer</defaultdvdplayer>
+    <defaultplayer>VideoPlayer</defaultplayer>
+    <defaultVideoPlayer>VideoPlayer</defaultVideoPlayer>
   </video>
 </advancedsettings>
diff --git a/xbmc/cores/paplayer/CodecFactory.cpp b/xbmc/cores/paplayer/CodecFactory.cpp
index 0bf36954bc..c461e4f7bb 100644
--- a/xbmc/cores/paplayer/CodecFactory.cpp
+++ b/xbmc/cores/paplayer/CodecFactory.cpp
@@ -21,7 +21,7 @@
 #include "system.h"
 #include "CodecFactory.h"
 #include "URL.h"
-#include "DVDPlayerCodec.h"
+#include "VideoPlayerCodec.h"
 #include "utils/StringUtils.h"
 #include "addons/AddonManager.h"
 #include "addons/AudioDecoder.h"
@@ -46,7 +46,7 @@ ICodec* CodecFactory::CreateCodec(const std::string &strFileType)
     }
   }
 
-  DVDPlayerCodec *dvdcodec = new DVDPlayerCodec();
+  VideoPlayerCodec *dvdcodec = new VideoPlayerCodec();
   return dvdcodec;
 }
 
@@ -88,13 +88,13 @@ ICodec* CodecFactory::CreateCodecDemux(const std::string& strFile, const std::st
       content == "application/x-flac"
       )
   {
-    DVDPlayerCodec *dvdcodec = new DVDPlayerCodec();
+    VideoPlayerCodec *dvdcodec = new VideoPlayerCodec();
     dvdcodec->SetContentType(content);
     return dvdcodec;
   }
   else if (urlFile.IsProtocol("shout"))
   {
-    DVDPlayerCodec *dvdcodec = new DVDPlayerCodec();
+    VideoPlayerCodec *dvdcodec = new VideoPlayerCodec();
     dvdcodec->SetContentType("audio/mp3");
     return dvdcodec; // if we got this far with internet radio - content-type was wrong. gamble on mp3.
   }
@@ -102,14 +102,14 @@ ICodec* CodecFactory::CreateCodecDemux(const std::string& strFile, const std::st
       content == "audio/wav" ||
       content == "audio/x-wav")
   {
-    DVDPlayerCodec *dvdcodec = new DVDPlayerCodec();
+    VideoPlayerCodec *dvdcodec = new VideoPlayerCodec();
     dvdcodec->SetContentType("audio/x-spdif-compressed");
     if (dvdcodec->Init(strFile, filecache))
     {
       return dvdcodec;
     }
 
-    dvdcodec = new DVDPlayerCodec();
+    dvdcodec = new VideoPlayerCodec();
     dvdcodec->SetContentType(content);
     return dvdcodec;
   }
diff --git a/xbmc/cores/paplayer/Makefile.in b/xbmc/cores/paplayer/Makefile.in
index 3986277fe9..dc9277a6a6 100644
--- a/xbmc/cores/paplayer/Makefile.in
+++ b/xbmc/cores/paplayer/Makefile.in
@@ -9,7 +9,7 @@ endif
 
 SRCS  = AudioDecoder.cpp
 SRCS += CodecFactory.cpp
-SRCS += DVDPlayerCodec.cpp
+SRCS += VideoPlayerCodec.cpp
 SRCS += PAPlayer.cpp
 
 LIB = paplayer.a
diff --git a/xbmc/cores/paplayer/DVDPlayerCodec.cpp b/xbmc/cores/paplayer/VideoPlayerCodec.cpp
index 46825a302f..3a4a88457a 100644
--- a/xbmc/cores/paplayer/DVDPlayerCodec.cpp
+++ b/xbmc/cores/paplayer/VideoPlayerCodec.cpp
@@ -18,23 +18,23 @@
  *
  */
 
-#include "DVDPlayerCodec.h"
+#include "VideoPlayerCodec.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
 #include "cores/AudioEngine/AEResampleFactory.h"
 
-#include "cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.h"
-#include "cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.h"
-#include "cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h"
-#include "cores/dvdplayer/DVDStreamInfo.h"
-#include "cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h"
+#include "cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.h"
+#include "cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.h"
+#include "cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.h"
+#include "cores/VideoPlayer/DVDStreamInfo.h"
+#include "cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h"
 #include "music/tags/TagLoaderTagLib.h"
 #include "utils/log.h"
 #include "URL.h"
 #include "utils/StringUtils.h"
 
-DVDPlayerCodec::DVDPlayerCodec()
+VideoPlayerCodec::VideoPlayerCodec()
 {
-  m_CodecName = "DVDPlayer";
+  m_CodecName = "VideoPlayer";
   m_pDemuxer = NULL;
   m_pInputStream = NULL;
   m_pAudioCodec = NULL;
@@ -48,18 +48,18 @@ DVDPlayerCodec::DVDPlayerCodec()
   m_srcFrameSize = 0;
 }
 
-DVDPlayerCodec::~DVDPlayerCodec()
+VideoPlayerCodec::~VideoPlayerCodec()
 {
   DeInit();
 }
 
-void DVDPlayerCodec::SetContentType(const std::string &strContent)
+void VideoPlayerCodec::SetContentType(const std::string &strContent)
 {
   m_strContentType = strContent;
   StringUtils::ToLower(m_strContentType);
 }
 
-bool DVDPlayerCodec::Init(const std::string &strFile, unsigned int filecache)
+bool VideoPlayerCodec::Init(const std::string &strFile, unsigned int filecache)
 {
   // take precaution if Init()ialized earlier
   if (m_bInited)
@@ -263,7 +263,7 @@ bool DVDPlayerCodec::Init(const std::string &strFile, unsigned int filecache)
   return true;
 }
 
-void DVDPlayerCodec::DeInit()
+void VideoPlayerCodec::DeInit()
 {
   if (m_pPacket)
     CDVDDemuxUtils::FreeDemuxPacket(m_pPacket);
@@ -306,7 +306,7 @@ void DVDPlayerCodec::DeInit()
   m_bInited = false;
 }
 
-int64_t DVDPlayerCodec::Seek(int64_t iSeekTime)
+int64_t VideoPlayerCodec::Seek(int64_t iSeekTime)
 {
   // default to announce backwards seek if !m_pPacket to not make FFmpeg
   // skip mpeg audio frames at playback start
@@ -330,7 +330,7 @@ int64_t DVDPlayerCodec::Seek(int64_t iSeekTime)
   return iSeekTime;
 }
 
-int DVDPlayerCodec::ReadPCM(BYTE *pBuffer, int size, int *actualsize)
+int VideoPlayerCodec::ReadPCM(BYTE *pBuffer, int size, int *actualsize)
 {
   if (m_nDecodedLen > 0)
   {
@@ -357,7 +357,7 @@ int DVDPlayerCodec::ReadPCM(BYTE *pBuffer, int size, int *actualsize)
 
   m_nDecodedLen = 0;
 
-  // dvdplayer returns a read error on a single invalid packet, while
+  // VideoPlayer returns a read error on a single invalid packet, while
   // in paplayer READ_ERROR is a fatal error.
   // Therefore skip over invalid packets here.
   int decodeLen = -1;
@@ -429,17 +429,17 @@ int DVDPlayerCodec::ReadPCM(BYTE *pBuffer, int size, int *actualsize)
   return READ_SUCCESS;
 }
 
-bool DVDPlayerCodec::CanInit()
+bool VideoPlayerCodec::CanInit()
 {
   return true;
 }
 
-bool DVDPlayerCodec::CanSeek()
+bool VideoPlayerCodec::CanSeek()
 {
   return m_bCanSeek;
 }
 
-bool DVDPlayerCodec::NeedConvert(AEDataFormat fmt)
+bool VideoPlayerCodec::NeedConvert(AEDataFormat fmt)
 {
   if (AE_IS_RAW(fmt))
     return false;
diff --git a/xbmc/cores/paplayer/DVDPlayerCodec.h b/xbmc/cores/paplayer/VideoPlayerCodec.h
index 576fb97cb2..388056c9a5 100644
--- a/xbmc/cores/paplayer/DVDPlayerCodec.h
+++ b/xbmc/cores/paplayer/VideoPlayerCodec.h
@@ -1,5 +1,5 @@
-#ifndef DVDPLAYER_CODEC_H_
-#define DVDPLAYER_CODEC_H_
+#ifndef VideoPlayer_CODEC_H_
+#define VideoPlayer_CODEC_H_
 
 /*
  *      Copyright (C) 2005-2013 Team XBMC
@@ -23,20 +23,20 @@
 
 #include "ICodec.h"
 
-#include "cores/dvdplayer/DVDDemuxers/DVDDemux.h"
-#include "cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h"
-#include "cores/dvdplayer/DVDInputStreams/DVDInputStream.h"
+#include "cores/VideoPlayer/DVDDemuxers/DVDDemux.h"
+#include "cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodec.h"
+#include "cores/VideoPlayer/DVDInputStreams/DVDInputStream.h"
 
 namespace ActiveAE
 {
   class IAEResample;
 };
 
-class DVDPlayerCodec : public ICodec
+class VideoPlayerCodec : public ICodec
 {
 public:
-  DVDPlayerCodec();
-  virtual ~DVDPlayerCodec();
+  VideoPlayerCodec();
+  virtual ~VideoPlayerCodec();
 
   virtual bool Init(const std::string &strFile, unsigned int filecache);
   virtual void DeInit();
diff --git a/xbmc/cores/playercorefactory/PlayerCoreConfig.h b/xbmc/cores/playercorefactory/PlayerCoreConfig.h
index a13fe3a289..9f383b43a5 100644
--- a/xbmc/cores/playercorefactory/PlayerCoreConfig.h
+++ b/xbmc/cores/playercorefactory/PlayerCoreConfig.h
@@ -22,7 +22,7 @@
 #include "utils/XBMCTinyXML.h"
 #include "cores/IPlayer.h"
 #include "PlayerCoreFactory.h"
-#include "cores/dvdplayer/DVDPlayer.h"
+#include "cores/VideoPlayer/VideoPlayer.h"
 #include "cores/paplayer/PAPlayer.h"
 #include "cores/ExternalPlayer/ExternalPlayer.h"
 #ifdef HAS_UPNP
@@ -94,7 +94,7 @@ public:
     switch(m_eCore)
     {
       case EPC_MPLAYER:
-      case EPC_DVDPLAYER: pPlayer = new CDVDPlayer(callback); break;
+      case EPC_VideoPlayer: pPlayer = new CVideoPlayer(callback); break;
       case EPC_PAPLAYER: pPlayer = new PAPlayer(callback); break;
       case EPC_EXTPLAYER: pPlayer = new CExternalPlayer(callback); break;
 #if defined(HAS_UPNP)
diff --git a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
index 4a6c8a8d8e..0ef8d8e679 100644
--- a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
+++ b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
@@ -20,7 +20,7 @@
 
 #include "PlayerCoreFactory.h"
 #include "threads/SingleLock.h"
-#include "cores/dvdplayer/DVDPlayer.h"
+#include "cores/VideoPlayer/VideoPlayer.h"
 #include "cores/paplayer/PAPlayer.h"
 #include "dialogs/GUIDialogContextMenu.h"
 #include "URL.h"
@@ -95,7 +95,7 @@ PLAYERCOREID CPlayerCoreFactory::GetPlayerCore(const std::string& strCoreName) c
     std::string strRealCoreName;
     if (StringUtils::EqualsNoCase(strCoreName, "audiodefaultplayer")) strRealCoreName = g_advancedSettings.m_audioDefaultPlayer;
     else if (StringUtils::EqualsNoCase(strCoreName, "videodefaultplayer")) strRealCoreName = g_advancedSettings.m_videoDefaultPlayer;
-    else if (StringUtils::EqualsNoCase(strCoreName, "videodefaultdvdplayer")) strRealCoreName = g_advancedSettings.m_videoDefaultDVDPlayer;
+    else if (StringUtils::EqualsNoCase(strCoreName, "videodefaultVideoPlayer")) strRealCoreName = g_advancedSettings.m_videoDefaultVideoPlayer;
     else strRealCoreName = strCoreName;
 
     for(PLAYERCOREID i = 0; i < m_vecCoreConfigs.size(); i++)
@@ -180,7 +180,7 @@ void CPlayerCoreFactory::GetPlayers( const CFileItem& item, VECPLAYERCORES &vecC
     else if (item.IsType(".wma"))
     {
 //      bAdd = true;
-//      DVDPlayerCodec codec;
+//      VideoPlayerCodec codec;
 //      if (!codec.Init(item.GetPath(),2048))
 //        bAdd = false;
 //      codec.DeInit();
@@ -190,8 +190,8 @@ void CPlayerCoreFactory::GetPlayers( const CFileItem& item, VECPLAYERCORES &vecC
     {
       if (url.IsFileType("ac3") || url.IsFileType("dts"))
       {
-        CLog::Log(LOGDEBUG, "CPlayerCoreFactory::GetPlayers: adding DVDPlayer (%d)", EPC_DVDPLAYER);
-        vecCores.push_back(EPC_DVDPLAYER);
+        CLog::Log(LOGDEBUG, "CPlayerCoreFactory::GetPlayers: adding VideoPlayer (%d)", EPC_VideoPlayer);
+        vecCores.push_back(EPC_VideoPlayer);
       }
       else
       {
@@ -320,12 +320,12 @@ bool CPlayerCoreFactory::LoadConfiguration(const std::string &file, bool clear)
       delete *it;
     m_vecCoreConfigs.clear();
     // Builtin players; hard-coded because re-ordering them would break scripts
-    CPlayerCoreConfig* dvdplayer = new CPlayerCoreConfig("DVDPlayer", EPC_DVDPLAYER, NULL);
-    dvdplayer->m_bPlaysAudio = dvdplayer->m_bPlaysVideo = true;
-    m_vecCoreConfigs.push_back(dvdplayer);
+    CPlayerCoreConfig* VideoPlayer = new CPlayerCoreConfig("VideoPlayer", EPC_VideoPlayer, NULL);
+    VideoPlayer->m_bPlaysAudio = VideoPlayer->m_bPlaysVideo = true;
+    m_vecCoreConfigs.push_back(VideoPlayer);
 
      // Don't remove this, its a placeholder for the old MPlayer core, it would break scripts
-    CPlayerCoreConfig* mplayer = new CPlayerCoreConfig("oldmplayercore", EPC_DVDPLAYER, NULL);
+    CPlayerCoreConfig* mplayer = new CPlayerCoreConfig("oldmplayercore", EPC_VideoPlayer, NULL);
     m_vecCoreConfigs.push_back(mplayer);
 
     CPlayerCoreConfig* paplayer = new CPlayerCoreConfig("PAPlayer", EPC_PAPLAYER, NULL);
@@ -355,7 +355,7 @@ bool CPlayerCoreFactory::LoadConfiguration(const std::string &file, bool clear)
       StringUtils::ToLower(type);
 
       EPLAYERCORES eCore = EPC_NONE;
-      if (type == "dvdplayer" || type == "mplayer") eCore = EPC_DVDPLAYER;
+      if (type == "VideoPlayer" || type == "mplayer") eCore = EPC_VideoPlayer;
       if (type == "paplayer" ) eCore = EPC_PAPLAYER;
       if (type == "externalplayer" ) eCore = EPC_EXTPLAYER;
 
diff --git a/xbmc/cores/playercorefactory/PlayerCoreFactory.h b/xbmc/cores/playercorefactory/PlayerCoreFactory.h
index 0e79f5c811..194ee8e8e8 100644
--- a/xbmc/cores/playercorefactory/PlayerCoreFactory.h
+++ b/xbmc/cores/playercorefactory/PlayerCoreFactory.h
@@ -41,7 +41,7 @@ class IPlayer;
 enum EPLAYERCORES
 {
   EPC_NONE,
-  EPC_DVDPLAYER,
+  EPC_VideoPlayer,
   EPC_MPLAYER,
   EPC_PAPLAYER,
   EPC_EXTPLAYER,
@@ -51,7 +51,7 @@ enum EPLAYERCORES
 typedef unsigned int PLAYERCOREID;
 typedef std::vector<PLAYERCOREID> VECPLAYERCORES;
 const PLAYERCOREID PCID_NONE = EPC_NONE;
-const PLAYERCOREID PCID_DVDPLAYER = EPC_DVDPLAYER;
+const PLAYERCOREID PCID_VideoPlayer = EPC_VideoPlayer;
 const PLAYERCOREID PCID_MPLAYER = EPC_MPLAYER;
 const PLAYERCOREID PCID_PAPLAYER = EPC_PAPLAYER;
 
diff --git a/xbmc/filesystem/PVRFile.cpp b/xbmc/filesystem/PVRFile.cpp
index 1ea659c45e..873e779775 100644
--- a/xbmc/filesystem/PVRFile.cpp
+++ b/xbmc/filesystem/PVRFile.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "PVRFile.h"
-#include "cores/dvdplayer/DVDInputStreams/DVDInputStream.h"
+#include "cores/VideoPlayer/DVDInputStreams/DVDInputStream.h"
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/recordings/PVRRecordings.h"
diff --git a/xbmc/input/Key.h b/xbmc/input/Key.h
index ed6384b99f..26895c1eb0 100644
--- a/xbmc/input/Key.h
+++ b/xbmc/input/Key.h
@@ -318,13 +318,13 @@
 #define ACTION_INCREASE_PAR           219
 #define ACTION_DECREASE_PAR           220
 
-#define ACTION_VSHIFT_UP              227 // shift up video image in DVDPlayer
-#define ACTION_VSHIFT_DOWN            228 // shift down video image in DVDPlayer
+#define ACTION_VSHIFT_UP              227 // shift up video image in VideoPlayer
+#define ACTION_VSHIFT_DOWN            228 // shift down video image in VideoPlayer
 
 #define ACTION_PLAYER_PLAYPAUSE       229 // Play/pause. If playing it pauses, if paused it plays.
 
-#define ACTION_SUBTITLE_VSHIFT_UP     230 // shift up subtitles in DVDPlayer
-#define ACTION_SUBTITLE_VSHIFT_DOWN   231 // shift down subtitles in DVDPlayer
+#define ACTION_SUBTITLE_VSHIFT_UP     230 // shift up subtitles in VideoPlayer
+#define ACTION_SUBTITLE_VSHIFT_DOWN   231 // shift down subtitles in VideoPlayer
 #define ACTION_SUBTITLE_ALIGN         232 // toggle vertical alignment of subtitles
 
 #define ACTION_FILTER                 233
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
index 684a527e43..d32419085d 100644
--- a/xbmc/interfaces/legacy/ModuleXbmc.cpp
+++ b/xbmc/interfaces/legacy/ModuleXbmc.cpp
@@ -55,7 +55,7 @@
 
 #include "LanguageHook.h"
 
-#include "cores/dvdplayer/VideoRenderers/RenderCapture.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderCapture.h"
 
 #include "threads/SystemClock.h"
 #include <vector>
@@ -532,7 +532,7 @@ namespace XBMCAddon
     int getPLAYLIST_MUSIC() { return PLAYLIST_MUSIC; }
     int getPLAYLIST_VIDEO() { return PLAYLIST_VIDEO; }
     int getPLAYER_CORE_AUTO() { return EPC_NONE; }
-    int getPLAYER_CORE_DVDPLAYER() { return EPC_DVDPLAYER; }
+    int getPLAYER_CORE_VideoPlayer() { return EPC_VideoPlayer; }
     int getPLAYER_CORE_MPLAYER() { return EPC_MPLAYER; }
     int getPLAYER_CORE_PAPLAYER() { return EPC_PAPLAYER; }
     int getTRAY_OPEN() { return TRAY_OPEN; }
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.h b/xbmc/interfaces/legacy/ModuleXbmc.h
index 3f05084ddf..22e15a9f40 100644
--- a/xbmc/interfaces/legacy/ModuleXbmc.h
+++ b/xbmc/interfaces/legacy/ModuleXbmc.h
@@ -429,7 +429,7 @@ namespace XBMCAddon
     SWIG_CONSTANT_FROM_GETTER(int,PLAYLIST_MUSIC);
     SWIG_CONSTANT_FROM_GETTER(int,PLAYLIST_VIDEO);
     SWIG_CONSTANT_FROM_GETTER(int,PLAYER_CORE_AUTO);
-    SWIG_CONSTANT_FROM_GETTER(int,PLAYER_CORE_DVDPLAYER);
+    SWIG_CONSTANT_FROM_GETTER(int,PLAYER_CORE_VideoPlayer);
     SWIG_CONSTANT_FROM_GETTER(int,PLAYER_CORE_MPLAYER);
     SWIG_CONSTANT_FROM_GETTER(int,PLAYER_CORE_PAPLAYER);
     SWIG_CONSTANT_FROM_GETTER(int,TRAY_OPEN);
diff --git a/xbmc/interfaces/legacy/Player.cpp b/xbmc/interfaces/legacy/Player.cpp
index 67938158fe..19c515bbd7 100644
--- a/xbmc/interfaces/legacy/Player.cpp
+++ b/xbmc/interfaces/legacy/Player.cpp
@@ -42,7 +42,7 @@ namespace XBMCAddon
     {
       iPlayList = PLAYLIST_MUSIC;
 
-      if (_playerCore == EPC_DVDPLAYER ||
+      if (_playerCore == EPC_VideoPlayer ||
           _playerCore == EPC_MPLAYER ||
           _playerCore == EPC_PAPLAYER)
         playerCore = (EPLAYERCORES)_playerCore;
diff --git a/xbmc/interfaces/legacy/RenderCapture.h b/xbmc/interfaces/legacy/RenderCapture.h
index 0f670f0ff9..3e1bb1f4f3 100644
--- a/xbmc/interfaces/legacy/RenderCapture.h
+++ b/xbmc/interfaces/legacy/RenderCapture.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "cores/dvdplayer/VideoRenderers/RenderCapture.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderCapture.h"
 #include "AddonClass.h"
 #include "LanguageHook.h"
 #include "Exception.h"
diff --git a/xbmc/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp
index 49705155f1..7d1f37be86 100644
--- a/xbmc/network/AirPlayServer.cpp
+++ b/xbmc/network/AirPlayServer.cpp
@@ -978,9 +978,9 @@ int CAirPlayServer::CTCPClient::ProcessRequest( std::string& responseHeader,
       CFileItem fileToPlay(location, false);
       fileToPlay.SetProperty("StartPercent", position*100.0f);
       ServerInstance->AnnounceToClients(EVENT_LOADING);
-      // froce to internal dvdplayer cause it is the only
+      // froce to internal VideoPlayer cause it is the only
       // one who will work well with airplay
-      g_application.m_eForcedNextPlayer = EPC_DVDPLAYER;
+      g_application.m_eForcedNextPlayer = EPC_VideoPlayer;
 
       CFileItemList *l = new CFileItemList; //don't delete,
       l->Add(std::make_shared<CFileItem>(fileToPlay));
diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp
index c27bf07a36..205b553148 100644
--- a/xbmc/network/AirTunesServer.cpp
+++ b/xbmc/network/AirTunesServer.cpp
@@ -31,7 +31,7 @@
 #include <utility>
 
 #include "Application.h"
-#include "cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.h"
+#include "cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.h"
 #include "FileItem.h"
 #include "filesystem/File.h"
 #include "filesystem/PipeFile.h"
diff --git a/xbmc/pvr/channels/PVRChannel.h b/xbmc/pvr/channels/PVRChannel.h
index 6f591e16da..5db1631d45 100644
--- a/xbmc/pvr/channels/PVRChannel.h
+++ b/xbmc/pvr/channels/PVRChannel.h
@@ -304,7 +304,7 @@ namespace PVR
      *
      * The stream input type
      * If it is empty, ffmpeg will try to scan the stream to find the right input format.
-     * See "xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/allformats.c" for a
+     * See "xbmc/cores/VideoPlayer/Codecs/ffmpeg/libavformat/allformats.c" for a
      * list of the input formats.
      *
      * @return The stream input type
diff --git a/xbmc/pvr/recordings/PVRRecording.h b/xbmc/pvr/recordings/PVRRecording.h
index 6045d66a07..14e88ecab3 100644
--- a/xbmc/pvr/recordings/PVRRecording.h
+++ b/xbmc/pvr/recordings/PVRRecording.h
@@ -28,7 +28,7 @@
  * The recording information tag holds data about name, length, recording time
  * and so on of recorded stream stored on the backend.
  *
- * The filename string is used to by the PVRManager and passed to DVDPlayer
+ * The filename string is used to by the PVRManager and passed to VideoPlayer
  * to stream data from the backend to Kodi.
  *
  * It is a also CVideoInfoTag and some of his variables must be set!
diff --git a/xbmc/rendering/dx/RenderSystemDX.cpp b/xbmc/rendering/dx/RenderSystemDX.cpp
index 81a274219d..c8504074d0 100644
--- a/xbmc/rendering/dx/RenderSystemDX.cpp
+++ b/xbmc/rendering/dx/RenderSystemDX.cpp
@@ -24,7 +24,7 @@
 #include <DirectXPackedVector.h>
 #include "Application.h"
 #include "RenderSystemDX.h"
-#include "cores/dvdplayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "guilib/D3DResource.h"
 #include "guilib/GUIShaderDX.h"
 #include "guilib/GUITextureD3D.h"
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index bc3aa8cec8..f48354e6ee 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -65,7 +65,7 @@ void CAdvancedSettings::OnSettingsLoaded()
   Load();
 
   // default players?
-  CLog::Log(LOGNOTICE, "Default DVD Player: %s", m_videoDefaultDVDPlayer.c_str());
+  CLog::Log(LOGNOTICE, "Default DVD Player: %s", m_videoDefaultVideoPlayer.c_str());
   CLog::Log(LOGNOTICE, "Default Video Player: %s", m_videoDefaultPlayer.c_str());
   CLog::Log(LOGNOTICE, "Default Audio Player: %s", m_audioDefaultPlayer.c_str());
 
@@ -113,7 +113,7 @@ void CAdvancedSettings::Initialize()
   m_audioHeadRoom = 0;
   m_ac3Gain = 12.0f;
   m_audioApplyDrc = -1.0f;
-  m_dvdplayerIgnoreDTSinWAV = false;
+  m_VideoPlayerIgnoreDTSinWAV = false;
 
   //default hold time of 25 ms, this allows a 20 hertz sine to pass undistorted
   m_limiterHold = 0.025f;
@@ -142,8 +142,8 @@ void CAdvancedSettings::Initialize()
   m_videoBlackBarColour = 0;
   m_videoPPFFmpegDeint = "linblenddeint";
   m_videoPPFFmpegPostProc = "ha:128:7,va,dr";
-  m_videoDefaultPlayer = "dvdplayer";
-  m_videoDefaultDVDPlayer = "dvdplayer";
+  m_videoDefaultPlayer = "VideoPlayer";
+  m_videoDefaultVideoPlayer = "VideoPlayer";
   m_videoIgnoreSecondsAtStart = 3*60;
   m_videoIgnorePercentAtEnd   = 8.0f;
   m_videoPlayCountMinimumPercent = 90.0f;
@@ -339,7 +339,7 @@ void CAdvancedSettings::Initialize()
   m_iPVRInfoToggleInterval         = 3000;
   m_iPVRMinVideoCacheLevel         = 5;
   m_iPVRMinAudioCacheLevel         = 10;
-  m_bPVRCacheInDvdPlayer           = true;
+  m_bPVRCacheInVideoPlayer           = true;
   m_bPVRChannelIconsAutoScan       = true;
   m_bPVRAutoScanIconsUserSet       = false;
   m_iPVRNumericChannelSwitchTimeout = 1000;
@@ -482,7 +482,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file)
       GetCustomRegexps(pAudioExcludes, m_audioExcludeFromScanRegExps);
 
     XMLUtils::GetFloat(pElement, "applydrc", m_audioApplyDrc);
-    XMLUtils::GetBoolean(pElement, "dvdplayerignoredtsinwav", m_dvdplayerIgnoreDTSinWAV);
+    XMLUtils::GetBoolean(pElement, "VideoPlayerignoredtsinwav", m_VideoPlayerIgnoreDTSinWAV);
 
     XMLUtils::GetFloat(pElement, "limiterhold", m_limiterHold, 0.0f, 100.0f);
     XMLUtils::GetFloat(pElement, "limiterrelease", m_limiterRelease, 0.001f, 100.0f);
@@ -506,7 +506,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file)
     XMLUtils::GetFloat(pElement, "audiodelayrange", m_videoAudioDelayRange, 10, 600);
     XMLUtils::GetInt(pElement, "blackbarcolour", m_videoBlackBarColour, 0, 255);
     XMLUtils::GetString(pElement, "defaultplayer", m_videoDefaultPlayer);
-    XMLUtils::GetString(pElement, "defaultdvdplayer", m_videoDefaultDVDPlayer);
+    XMLUtils::GetString(pElement, "defaultVideoPlayer", m_videoDefaultVideoPlayer);
     XMLUtils::GetBoolean(pElement, "fullscreenonmoviestart", m_fullScreenOnMovieStart);
     // 101 on purpose - can be used to never automark as watched
     XMLUtils::GetFloat(pElement, "playcountminimumpercent", m_videoPlayCountMinimumPercent, 0.0f, 101.0f);
@@ -1024,7 +1024,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file)
     XMLUtils::GetInt(pPVR, "infotoggleinterval", m_iPVRInfoToggleInterval, 0, 30000);
     XMLUtils::GetInt(pPVR, "minvideocachelevel", m_iPVRMinVideoCacheLevel, 0, 100);
     XMLUtils::GetInt(pPVR, "minaudiocachelevel", m_iPVRMinAudioCacheLevel, 0, 100);
-    XMLUtils::GetBoolean(pPVR, "cacheindvdplayer", m_bPVRCacheInDvdPlayer);
+    XMLUtils::GetBoolean(pPVR, "cacheinVideoPlayer", m_bPVRCacheInVideoPlayer);
     XMLUtils::GetBoolean(pPVR, "channeliconsautoscan", m_bPVRChannelIconsAutoScan);
     XMLUtils::GetBoolean(pPVR, "autoscaniconsuserset", m_bPVRAutoScanIconsUserSet);
     XMLUtils::GetInt(pPVR, "numericchannelswitchtimeout", m_iPVRNumericChannelSwitchTimeout, 50, 60000);
diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
index 6475350c42..a55de67737 100644
--- a/xbmc/settings/AdvancedSettings.h
+++ b/xbmc/settings/AdvancedSettings.h
@@ -145,7 +145,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler
     float m_ac3Gain;
     std::string m_audioDefaultPlayer;
     float m_audioPlayCountMinimumPercent;
-    bool m_dvdplayerIgnoreDTSinWAV;
+    bool m_VideoPlayerIgnoreDTSinWAV;
     float m_limiterHold;
     float m_limiterRelease;
 
@@ -204,7 +204,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler
     bool m_mediacodecForceSoftwareRendring;
 
     std::string m_videoDefaultPlayer;
-    std::string m_videoDefaultDVDPlayer;
+    std::string m_videoDefaultVideoPlayer;
     float m_videoPlayCountMinimumPercent;
 
     float m_slideshowBlackBarCompensation;
@@ -338,7 +338,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler
     int m_iPVRInfoToggleInterval; /*!< @brief if there are more than 1 pvr gui info item available (e.g. multiple recordings active at the same time), use this toggle delay in milliseconds. defaults to 3000. */
     int m_iPVRMinVideoCacheLevel;      /*!< @brief cache up to this level in the video buffer buffer before resuming playback if the buffers run dry */
     int m_iPVRMinAudioCacheLevel;      /*!< @brief cache up to this level in the audio buffer before resuming playback if the buffers run dry */
-    bool m_bPVRCacheInDvdPlayer; /*!< @brief true to use "CACHESTATE_PVR" in CDVDPlayer (default) */
+    bool m_bPVRCacheInVideoPlayer; /*!< @brief true to use "CACHESTATE_PVR" in CVideoPlayer (default) */
     bool m_bPVRChannelIconsAutoScan; /*!< @brief automatically scan user defined folder for channel icons when loading internal channel groups */
     bool m_bPVRAutoScanIconsUserSet; /*!< @brief mark channel icons populated by auto scan as "user set" */
     int m_iPVRNumericChannelSwitchTimeout; /*!< @brief time in ms before the numeric dialog auto closes when confirmchannelswitch is disabled */
diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp
index ed62e4287c..5e97b87b46 100644
--- a/xbmc/settings/SettingConditions.cpp
+++ b/xbmc/settings/SettingConditions.cpp
@@ -29,7 +29,7 @@
 #include "android/activity/AndroidFeatures.h"
 #endif // defined(TARGET_ANDROID)
 #include "cores/AudioEngine/AEFactory.h"
-#include "cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h"
+#include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h"
 #include "guilib/LocalizeStrings.h"
 #include "peripherals/Peripherals.h"
 #include "profiles/ProfilesManager.h"
diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 18af6ae063..11e4d54a15 100644
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -31,7 +31,7 @@
 #include "cores/AudioEngine/AEFactory.h"
 #include "cores/AudioEngine/DSPAddons/ActiveAEDSP.h"
 #include "cores/playercorefactory/PlayerCoreFactory.h"
-#include "cores/dvdplayer/VideoRenderers/BaseRenderer.h"
+#include "cores/VideoPlayer/VideoRenderers/BaseRenderer.h"
 #include "filesystem/File.h"
 #include "guilib/GraphicContext.h"
 #include "guilib/GUIAudioManager.h"
diff --git a/xbmc/storage/MediaManager.cpp b/xbmc/storage/MediaManager.cpp
index fe24924a4e..79e69ae0e0 100644
--- a/xbmc/storage/MediaManager.cpp
+++ b/xbmc/storage/MediaManager.cpp
@@ -51,7 +51,7 @@
 
 #include "filesystem/File.h"
 
-#include "cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.h"
+#include "cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.h"
 
 #if defined(TARGET_DARWIN)
 #include "osx/DarwinStorageProvider.h"
diff --git a/xbmc/system.h b/xbmc/system.h
index 3e9b6a9050..185046b3ff 100644
--- a/xbmc/system.h
+++ b/xbmc/system.h
@@ -29,7 +29,7 @@
  * All platforms
  *****************/
 #define HAS_DVD_SWSCALE
-#define HAS_DVDPLAYER
+#define HAS_VideoPlayer
 #define HAS_EVENT_SERVER
 #define HAS_SCREENSAVER
 #define HAS_PYTHON
diff --git a/xbmc/utils/Screenshot.cpp b/xbmc/utils/Screenshot.cpp
index 032a3d08dc..02ef783b03 100644
--- a/xbmc/utils/Screenshot.cpp
+++ b/xbmc/utils/Screenshot.cpp
@@ -35,7 +35,7 @@
 
 #ifdef HAS_IMXVPU
 // This has to go into another header file
-#include "cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h"
+#include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h"
 #endif
 
 #include "filesystem/File.h"
diff --git a/xbmc/video/PlayerController.cpp b/xbmc/video/PlayerController.cpp
index 7ec491c23b..e04290d6e5 100644
--- a/xbmc/video/PlayerController.cpp
+++ b/xbmc/video/PlayerController.cpp
@@ -30,7 +30,7 @@
 #include "dialogs/GUIDialogKaiToast.h"
 #include "video/dialogs/GUIDialogAudioSubtitleSettings.h"
 #ifdef HAS_VIDEO_PLAYBACK
-#include "cores/dvdplayer/VideoRenderers/OverlayRendererGUI.h"
+#include "cores/VideoPlayer/VideoRenderers/OverlayRendererGUI.h"
 #endif
 #include "Application.h"
 #include "utils/LangCodeExpander.h"
diff --git a/xbmc/video/Teletext.h b/xbmc/video/Teletext.h
index b7d437aa22..40cb72a0d3 100644
--- a/xbmc/video/Teletext.h
+++ b/xbmc/video/Teletext.h
@@ -158,6 +158,6 @@ private:
 
   int                 m_TempPage;         /* Temporary page number for number input */
   int                 m_LastPage;         /* Last selected Page */
-  TextCacheStruct_t*  m_txtCache;         /* Text cache generated by the DVDPLayer if Teletext present */
+  TextCacheStruct_t*  m_txtCache;         /* Text cache generated by the VideoPlayer if Teletext present */
   TextRenderInfo_t    m_RenderInfo;       /* Rendering information of displayed Teletext page */
 };
diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp
index 7d2379c41e..bb195db0c1 100644
--- a/xbmc/video/VideoReferenceClock.cpp
+++ b/xbmc/video/VideoReferenceClock.cpp
@@ -264,7 +264,7 @@ int64_t CVideoReferenceClock::GetFrequency()
 void CVideoReferenceClock::SetSpeed(double Speed)
 {
   CSingleLock SingleLock(m_CritSection);
-  //dvdplayer can change the speed to fit the rereshrate
+  //VideoPlayer can change the speed to fit the rereshrate
   if (m_UseVblank)
   {
     if (Speed != m_ClockSpeed)
@@ -279,7 +279,7 @@ double CVideoReferenceClock::GetSpeed()
 {
   CSingleLock SingleLock(m_CritSection);
 
-  //dvdplayer needs to know the speed for the resampler
+  //VideoPlayer needs to know the speed for the resampler
   if (m_UseVblank)
     return m_ClockSpeed;
   else
@@ -295,7 +295,7 @@ void CVideoReferenceClock::UpdateRefreshrate()
   CLog::Log(LOGDEBUG, "CVideoReferenceClock: Detected refreshrate: %.3f hertz", m_RefreshRate);
 }
 
-//dvdplayer needs to know the refreshrate for matching the fps of the video playing to it
+//VideoPlayer needs to know the refreshrate for matching the fps of the video playing to it
 double CVideoReferenceClock::GetRefreshRate(double* interval /*= NULL*/)
 {
   CSingleLock SingleLock(m_CritSection);
diff --git a/xbmc/video/VideoReferenceClock.h b/xbmc/video/VideoReferenceClock.h
index d0a9c3f9f1..4681373a3d 100644
--- a/xbmc/video/VideoReferenceClock.h
+++ b/xbmc/video/VideoReferenceClock.h
@@ -54,7 +54,7 @@ class CVideoReferenceClock : public CThread
     int64_t m_CurrTime;          //the current time of the clock when using vblank as clock source
     int64_t m_LastIntTime;       //last interpolated clock value, to make sure the clock doesn't go backwards
     double  m_CurrTimeFract;     //fractional part that is lost due to rounding when updating the clock
-    double  m_ClockSpeed;        //the frequency of the clock set by dvdplayer
+    double  m_ClockSpeed;        //the frequency of the clock set by VideoPlayer
     int64_t m_ClockOffset;       //the difference between the vblank clock and systemclock, set when vblank clock is stopped
     int64_t m_SystemFrequency;   //frequency of the systemclock
     double  m_fineadjust;
diff --git a/xbmc/video/VideoThumbLoader.cpp b/xbmc/video/VideoThumbLoader.cpp
index daa8f5e6fc..ef50de8452 100644
--- a/xbmc/video/VideoThumbLoader.cpp
+++ b/xbmc/video/VideoThumbLoader.cpp
@@ -23,7 +23,7 @@
 #include <cstdlib>
 #include <utility>
 
-#include "cores/dvdplayer/DVDFileInfo.h"
+#include "cores/VideoPlayer/DVDFileInfo.h"
 #include "FileItem.h"
 #include "filesystem/DirectoryCache.h"
 #include "filesystem/StackDirectory.h"
diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
index 8d57767555..e457db979c 100644
--- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
+++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
@@ -204,7 +204,7 @@ void CGUIDialogAudioSubtitleSettings::OnSettingAction(const CSetting *setting)
       strPath = g_application.CurrentFileItem().GetPath();
 
     std::string strMask = ".utf|.utf8|.utf-8|.sub|.srt|.smi|.rt|.txt|.ssa|.aqt|.jss|.ass|.idx|.rar|.zip";
-    if (g_application.GetCurrentPlayer() == EPC_DVDPLAYER)
+    if (g_application.GetCurrentPlayer() == EPC_VideoPlayer)
       strMask = ".srt|.rar|.zip|.ifo|.smi|.sub|.idx|.ass|.ssa|.txt";
     VECSOURCES shares(*CMediaSourceSettings::GetInstance().GetSources("video"));
     if (CMediaSettings::GetInstance().GetAdditionalSubtitleDirectoryChecked() != -1 && !CSettings::GetInstance().GetString(CSettings::SETTING_SUBTITLES_CUSTOMPATH).empty())
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
index 0f0c29de0a..bd281d1b7a 100644
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
@@ -23,7 +23,7 @@
 #include "video/VideoDatabase.h"
 #include "Application.h"
 #ifdef HAS_VIDEO_PLAYBACK
-#include "cores/dvdplayer/VideoRenderers/RenderCapture.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderCapture.h"
 #if defined(HAS_LIBAMCODEC)
 #include "utils/ScreenshotAML.h"
 #endif//HAS_LIBAMCODEC
diff --git a/xbmc/win32/WIN32Util.cpp b/xbmc/win32/WIN32Util.cpp
index d166bc2e9a..d9e2cd2791 100644
--- a/xbmc/win32/WIN32Util.cpp
+++ b/xbmc/win32/WIN32Util.cpp
@@ -43,7 +43,7 @@
 #include <cassert>
 
 #define DLL_ENV_PATH "special://xbmc/system/;" \
-                     "special://xbmc/system/players/dvdplayer/;" \
+                     "special://xbmc/system/players/VideoPlayer/;" \
                      "special://xbmc/system/players/paplayer/;" \
                      "special://xbmc/system/cdrip/;" \
                      "special://xbmc/system/python/;" \
diff --git a/xbmc/win32/Win32DelayedDllLoad.cpp b/xbmc/win32/Win32DelayedDllLoad.cpp
index e6005def93..5e0e3e3a6f 100644
--- a/xbmc/win32/Win32DelayedDllLoad.cpp
+++ b/xbmc/win32/Win32DelayedDllLoad.cpp
@@ -54,43 +54,43 @@ FARPROC WINAPI delayHookNotifyFunc (unsigned dliNotify, PDelayLoadInfo pdli)
       }
       if (stricmp(pdli->szDll, "avcodec-56.dll") == 0)
       {
-        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/dvdplayer/avcodec-56.dll");
+        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/VideoPlayer/avcodec-56.dll");
         HMODULE hMod = LoadLibraryEx(strDll.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
         return (FARPROC)hMod;
       }
       if (stricmp(pdli->szDll, "avfilter-5.dll") == 0)
       {
-        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/dvdplayer/avfilter-5.dll");
+        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/VideoPlayer/avfilter-5.dll");
         HMODULE hMod = LoadLibraryEx(strDll.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
         return (FARPROC)hMod;
       }
       if (stricmp(pdli->szDll, "avformat-56.dll") == 0)
       {
-        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/dvdplayer/avformat-56.dll");
+        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/VideoPlayer/avformat-56.dll");
         HMODULE hMod = LoadLibraryEx(strDll.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
         return (FARPROC)hMod;
       }
       if (stricmp(pdli->szDll, "avutil-54.dll") == 0)
       {
-        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/dvdplayer/avutil-54.dll");
+        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/VideoPlayer/avutil-54.dll");
         HMODULE hMod = LoadLibraryEx(strDll.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
         return (FARPROC)hMod;
       }
       if (stricmp(pdli->szDll, "postproc-53.dll") == 0)
       {
-        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/dvdplayer/postproc-53.dll");
+        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/VideoPlayer/postproc-53.dll");
         HMODULE hMod = LoadLibraryEx(strDll.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
         return (FARPROC)hMod;
       }
       if (stricmp(pdli->szDll, "swresample-1.dll") == 0)
       {
-        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/dvdplayer/swresample-1.dll");
+        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/VideoPlayer/swresample-1.dll");
         HMODULE hMod = LoadLibraryEx(strDll.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
         return (FARPROC)hMod;
       }
       if (stricmp(pdli->szDll, "swscale-3.dll") == 0)
       {
-        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/dvdplayer/swscale-3.dll");
+        std::string strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/players/VideoPlayer/swscale-3.dll");
         HMODULE hMod = LoadLibraryEx(strDll.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
         return (FARPROC)hMod;
       }
diff --git a/xbmc/windowing/egl/WinSystemEGL.cpp b/xbmc/windowing/egl/WinSystemEGL.cpp
index 696ded1710..620a0419c0 100644
--- a/xbmc/windowing/egl/WinSystemEGL.cpp
+++ b/xbmc/windowing/egl/WinSystemEGL.cpp
@@ -33,7 +33,7 @@
 #include "threads/SingleLock.h"
 #ifdef HAS_IMXVPU
 // This has to go into another header file
-#include "cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h"
+#include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h"
 #endif
 #include "utils/log.h"
 #include "EGLWrapper.h"