diff --git a/ASCMediaCore3/ASCAudioBuffer.cpp b/ASCMediaCore3/ASCAudioBuffer.cpp
index 21f9a34dee..3fa5245eec 100644
--- a/ASCMediaCore3/ASCAudioBuffer.cpp
+++ b/ASCMediaCore3/ASCAudioBuffer.cpp
@@ -1,7 +1,7 @@
-// AVSAudioBuffer.cpp : Implementation of CAVSAudioBuffer
+// ASCAudioBuffer.cpp : Implementation of CASCAudioBuffer
 
 #include "stdafx.h"
-#include "AVSAudioBuffer.h"
+#include "ASCAudioBuffer.h"
 
 
 // CAVSAudioBuffer
diff --git a/ASCMediaCore3/ASCAudioBuffer.h b/ASCMediaCore3/ASCAudioBuffer.h
index b63469eb90..cfad4f7cbb 100644
--- a/ASCMediaCore3/ASCAudioBuffer.h
+++ b/ASCMediaCore3/ASCAudioBuffer.h
@@ -1,12 +1,12 @@
-// AVSAudioBuffer.h : Declaration of the CAVSAudioBuffer
+// ASCAudioBuffer.h : Declaration of the CASCAudioBuffer
 
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSMediaData.h"
-#include "AVSAudioData.h"
+#include "ASCMediaData.h"
+#include "ASCAudioData.h"
 
 #include "MediaDataDefine.h"
-#include "AVSUtils.h"
+#include "ASCUtils.h"
 
 // IAVSAudioBuffer
 [object, uuid("1CB6CE9F-0E75-4B17-8512-668FF3B10745"), dual, pointer_default(unique)]
diff --git a/ASCMediaCore3/ASCAudioData.h b/ASCMediaCore3/ASCAudioData.h
index acf27f481e..5c7aeb5534 100644
--- a/ASCMediaCore3/ASCAudioData.h
+++ b/ASCMediaCore3/ASCAudioData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "AVSMediaData.h"
+#include "ASCMediaData.h"
 	
 [object, uuid("31858644-1101-4825-A7FE-3AA261BA74AC"), dual, pointer_default(unique)]
 __interface IAVSAudioData : IAVSMediaData
diff --git a/ASCMediaCore3/ASCAudioDataEx.h b/ASCMediaCore3/ASCAudioDataEx.h
index facecd973d..52f227d575 100644
--- a/ASCMediaCore3/ASCAudioDataEx.h
+++ b/ASCMediaCore3/ASCAudioDataEx.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "AVSMediaData.h"
+#include "ASCMediaData.h"
 	
 [object, uuid("35B7E717-3EF0-4473-884D-A42C41E80AE1"), dual, pointer_default(unique)]
 __interface IAVSAudioDataEx : IAVSMediaData
diff --git a/ASCMediaCore3/ASCCompressedVideoFrame.h b/ASCMediaCore3/ASCCompressedVideoFrame.h
index 287bd3e786..de50c0e060 100644
--- a/ASCMediaCore3/ASCCompressedVideoFrame.h
+++ b/ASCMediaCore3/ASCCompressedVideoFrame.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "AVSMediaData.h"
+#include "ASCMediaData.h"
 
 [object, uuid("D1AB8643-9E1E-4037-A4C1-D166CCF47467"), dual, pointer_default(unique)]
 __interface IAVSCompressedVideoFrame : IAVSMediaData
diff --git a/ASCMediaCore3/ASCDVDSubpictureFrame.h b/ASCMediaCore3/ASCDVDSubpictureFrame.h
index f3b50e06b2..70d744f55b 100644
--- a/ASCMediaCore3/ASCDVDSubpictureFrame.h
+++ b/ASCMediaCore3/ASCDVDSubpictureFrame.h
@@ -1,8 +1,8 @@
-// AVSDVDSubpictureFrame.h : Declaration of the CAVSDVDSubpictureFrame
+// ASCDVDSubpictureFrame.h : Declaration of the CASCDVDSubpictureFrame
 
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSMediaData.h"
+#include "ASCMediaData.h"
 #include "MemoryUtils.h"
 #include <atlcoll.h>
 
diff --git a/ASCMediaCore3/ASCExtraData.cpp b/ASCMediaCore3/ASCExtraData.cpp
index 4dae37a2c3..25e104575c 100644
--- a/ASCMediaCore3/ASCExtraData.cpp
+++ b/ASCMediaCore3/ASCExtraData.cpp
@@ -1,11 +1,11 @@
-// AVSExtraData.cpp : Implementation of CAVSExtraData
+// ASCExtraData.cpp : Implementation of CASCExtraData
 
 #include "stdafx.h"
 #include "ATLDefine.h"
-#include "AVSExtraData.h"
+#include "ASCExtraData.h"
 
 
-// CAVSExtraData
+// CASCExtraData
 
 STDMETHODIMP CAVSExtraData::get_Year(long *pVal)
 {
diff --git a/ASCMediaCore3/ASCExtraData.h b/ASCMediaCore3/ASCExtraData.h
index 25aee2675c..ab3bfeb851 100644
--- a/ASCMediaCore3/ASCExtraData.h
+++ b/ASCMediaCore3/ASCExtraData.h
@@ -1,14 +1,14 @@
-// AVSExtraData.h : Declaration of the CAVSExtraData
+// ASCExtraData.h : Declaration of the CASCExtraData
 
 #pragma once
 #include "resource.h"       // main symbols
 #include "../Common/AudioDefines.h"       // main symbols
 
-// IAVSExtraData
+// IASCExtraData
 [
 	object,
 	uuid("F04698FD-7956-4BCF-B579-512CBC1ECB0F"),
-	dual,	helpstring("IAVSExtraData Interface"),
+	dual,	helpstring("IASCExtraData Interface"),
 	pointer_default(unique)
 ]
 __interface IAVSExtraData : IDispatch
diff --git a/ASCMediaCore3/ASCMediaCore3.cpp b/ASCMediaCore3/ASCMediaCore3.cpp
index 517e1709fb..34776f8093 100644
--- a/ASCMediaCore3/ASCMediaCore3.cpp
+++ b/ASCMediaCore3/ASCMediaCore3.cpp
@@ -1,22 +1,22 @@
-// AVSMediaCore3.cpp : Implementation of DLL Exports.
+// ASCMediaCore3.cpp : Implementation of DLL Exports.
 
 #include "stdafx.h"
 #include "resource.h"
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{F0A0AAE5-06FE-4ABC-A9F1-26BFFEE2A11F}", 
-		 name = "AVSMediaCore3", 
-		 helpstring = "AVSMediaCore3 1.0 Type Library",
-		 resource_name = "IDR_AVSMEDIACORE3") ];
+		 name = "ASCMediaCore3", 
+		 helpstring = "ASCMediaCore3 1.0 Type Library",
+		 resource_name = "IDR_ASCMEDIACORE3") ];
 
-#include "AVSMediaData.h"
-#include "AVSAudioData.h"
-#include "AVSAudioDataEx.h"
-#include "AVSUncompressedVideoFrame.h"
-#include "AVSCompressedVideoFrame.h"
-#include "AVSVideoFrameColorTransform.h"
-#include "AVSDVDSubpictureFrame.h"
-#include "AVSVideoFramePainter.h"
-#include "AVSVideoFramePainter2.h"
-#include "AVSSubtitleData.h"
-#include "AVSPacketsAudioData.h"
\ No newline at end of file
+#include "ASCMediaData.h"
+#include "ASCAudioData.h"
+#include "ASCAudioDataEx.h"
+#include "ASCUncompressedVideoFrame.h"
+#include "ASCCompressedVideoFrame.h"
+#include "ASCVideoFrameColorTransform.h"
+#include "ASCDVDSubpictureFrame.h"
+#include "ASCVideoFramePainter.h"
+#include "ASCVideoFramePainter2.h"
+#include "ASCSubtitleData.h"
+#include "ASCPacketsAudioData.h"
\ No newline at end of file
diff --git a/ASCMediaCore3/ASCMediaCore3.rc b/ASCMediaCore3/ASCMediaCore3.rc
index 9911a65c14..eb0fdb2aff 100644
--- a/ASCMediaCore3/ASCMediaCore3.rc
+++ b/ASCMediaCore3/ASCMediaCore3.rc
@@ -114,7 +114,7 @@ END
 // REGISTRY
 //
 
-IDR_AVSMEDIACORE3       REGISTRY                "AVSMediaCore3.rgs"
+IDR_ASCMEDIACORE3       REGISTRY                "ASCMediaCore3.rgs"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -123,7 +123,7 @@ IDR_AVSMEDIACORE3       REGISTRY                "AVSMediaCore3.rgs"
 
 STRINGTABLE 
 BEGIN
-    IDS_PROJNAME            "AVSMediaCore3"
+    IDS_PROJNAME            "ASCMediaCore3"
 END
 
 #endif    // English (U.S.) resources
diff --git a/ASCMediaCore3/ASCMediaCore3.rgs b/ASCMediaCore3/ASCMediaCore3.rgs
index 7fc68e5caf..6923c19d11 100644
--- a/ASCMediaCore3/ASCMediaCore3.rgs
+++ b/ASCMediaCore3/ASCMediaCore3.rgs
@@ -2,8 +2,8 @@ HKCR
 {
 	NoRemove AppID
 	{
-		'%APPID%' = s 'AVSMediaCore3'
-		'AVSMediaCore3.DLL'
+		'%APPID%' = s 'ASCMediaCore3'
+		'ASCMediaCore3.DLL'
 		{
 			val AppID = s '%APPID%'
 		}
diff --git a/ASCMediaCore3/ASCMediaCore3.sln b/ASCMediaCore3/ASCMediaCore3.sln
index 839e15adf7..bca951bc37 100644
--- a/ASCMediaCore3/ASCMediaCore3.sln
+++ b/ASCMediaCore3/ASCMediaCore3.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSMediaCore3", "AVSMediaCore3.vcproj", "{C39EA7A2-78A4-4C36-8CF6-F175EEB51780}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCMediaCore3", "ASCMediaCore3.vcproj", "{C39EA7A2-78A4-4C36-8CF6-F175EEB51780}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DCD092A5-1FC9-4A77-BE0B-56B2407F4328} = {DCD092A5-1FC9-4A77-BE0B-56B2407F4328}
 	EndProjectSection
diff --git a/ASCMediaCore3/ASCMediaCore3.vcproj b/ASCMediaCore3/ASCMediaCore3.vcproj
index d25b7e0992..cf8b747707 100644
--- a/ASCMediaCore3/ASCMediaCore3.vcproj
+++ b/ASCMediaCore3/ASCMediaCore3.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSMediaCore3"
+	Name="ASCMediaCore3"
 	ProjectGUID="{C39EA7A2-78A4-4C36-8CF6-F175EEB51780}"
-	RootNamespace="AVSMediaCore3"
+	RootNamespace="ASCMediaCore3"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@@ -47,11 +47,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSMediaCore3.tlb"
-				HeaderFileName="AVSMediaCore3.h"
+				TypeLibraryName="$(IntDir)/ASCMediaCore3.tlb"
+				HeaderFileName="ASCMediaCore3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSMediaCore3_i.c"
-				ProxyFileName="AVSMediaCore3_p.c"
+				InterfaceIdentifierFileName="ASCMediaCore3_i.c"
+				ProxyFileName="ASCMediaCore3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -82,14 +82,14 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies=".\VideoFrameTransformLib\Debug\VideoFrameTransformLib.lib"
-				OutputFile="$(OutDir)/AVSMediaCore3.dll"
+				OutputFile="$(OutDir)/ASCMediaCore3.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=".\VideoFrameTransformLib\Debug"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD"
-				MergedIDLBaseFileName="_AVSMediaCore3.idl"
+				MergedIDLBaseFileName="_ASCMediaCore3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSMediaCore3.lib"
+				ImportLibrary="$(OutDir)/ASCMediaCore3.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -148,11 +148,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="3"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSMediaCore3.tlb"
-				HeaderFileName="AVSMediaCore3.h"
+				TypeLibraryName="$(IntDir)/ASCMediaCore3.tlb"
+				HeaderFileName="ASCMediaCore3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSMediaCore3_i.c"
-				ProxyFileName="AVSMediaCore3_p.c"
+				InterfaceIdentifierFileName="ASCMediaCore3_i.c"
+				ProxyFileName="ASCMediaCore3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -183,14 +183,14 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies=".\VideoFrameTransformLib\Debug\VideoFrameTransformLib.lib"
-				OutputFile="$(OutDir)/AVSMediaCore3.dll"
+				OutputFile="$(OutDir)/ASCMediaCore3.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=".\VideoFrameTransformLib\Debug"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD"
-				MergedIDLBaseFileName="_AVSMediaCore3.idl"
+				MergedIDLBaseFileName="_ASCMediaCore3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSMediaCore3.lib"
+				ImportLibrary="$(OutDir)/ASCMediaCore3.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -249,11 +249,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSMediaCore3.tlb"
-				HeaderFileName="AVSMediaCore3.h"
+				TypeLibraryName="$(IntDir)/ASCMediaCore3.tlb"
+				HeaderFileName="ASCMediaCore3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSMediaCore3_i.c"
-				ProxyFileName="AVSMediaCore3_p.c"
+				InterfaceIdentifierFileName="ASCMediaCore3_i.c"
+				ProxyFileName="ASCMediaCore3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -284,15 +284,15 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies=".\VideoFrameTransformLib\Release\VideoFrameTransformLib.lib"
-				OutputFile="$(OutDir)/AVSMediaCore3.dll"
+				OutputFile="$(OutDir)/ASCMediaCore3.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC,LIBCMT"
-				MergedIDLBaseFileName="_AVSMediaCore3.idl"
+				MergedIDLBaseFileName="_ASCMediaCore3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSMediaCore3.lib"
+				ImportLibrary="$(OutDir)/ASCMediaCore3.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -351,11 +351,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="3"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSMediaCore3.tlb"
-				HeaderFileName="AVSMediaCore3.h"
+				TypeLibraryName="$(IntDir)/ASCMediaCore3.tlb"
+				HeaderFileName="ASCMediaCore3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSMediaCore3_i.c"
-				ProxyFileName="AVSMediaCore3_p.c"
+				InterfaceIdentifierFileName="ASCMediaCore3_i.c"
+				ProxyFileName="ASCMediaCore3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -386,15 +386,15 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies=".\VideoFrameTransformLib\Release\VideoFrameTransformLib.lib"
-				OutputFile="$(OutDir)/AVSMediaCore3.dll"
+				OutputFile="$(OutDir)/ASCMediaCore3.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC,LIBCMT"
-				MergedIDLBaseFileName="_AVSMediaCore3.idl"
+				MergedIDLBaseFileName="_ASCMediaCore3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSMediaCore3.lib"
+				ImportLibrary="$(OutDir)/ASCMediaCore3.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -454,11 +454,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSMediaCore3.tlb"
-				HeaderFileName="AVSMediaCore3.h"
+				TypeLibraryName="$(IntDir)/ASCMediaCore3.tlb"
+				HeaderFileName="ASCMediaCore3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSMediaCore3_i.c"
-				ProxyFileName="AVSMediaCore3_p.c"
+				InterfaceIdentifierFileName="ASCMediaCore3_i.c"
+				ProxyFileName="ASCMediaCore3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -492,12 +492,12 @@
 				OutputFile="$(OutDir)/ASCMediaCore3.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC,LIBCMT"
-				MergedIDLBaseFileName="_AVSMediaCore3.idl"
+				MergedIDLBaseFileName="_ASCMediaCore3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSMediaCore3.lib"
+				ImportLibrary="$(OutDir)/ASCMediaCore3.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -595,19 +595,19 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="AVSAudioBuffer.cpp"
+				RelativePath="ASCAudioBuffer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="AVSExtraData.cpp"
+				RelativePath="ASCExtraData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="AVSMediaCore3.cpp"
+				RelativePath="ASCMediaCore3.cpp"
 				>
 			</File>
 			<File
-				RelativePath="AVSVideoFrameTransform.cpp"
+				RelativePath="ASCVideoFrameTransform.cpp"
 				>
 			</File>
 			<File
@@ -660,63 +660,63 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="AVSAudioBuffer.h"
+				RelativePath="ASCAudioBuffer.h"
 				>
 			</File>
 			<File
-				RelativePath="AVSAudioData.h"
+				RelativePath="ASCAudioData.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSAudioDataEx.h"
+				RelativePath=".\ASCAudioDataEx.h"
 				>
 			</File>
 			<File
-				RelativePath="AVSCompressedVideoFrame.h"
+				RelativePath="ASCCompressedVideoFrame.h"
 				>
 			</File>
 			<File
-				RelativePath="AVSDVDSubpictureFrame.h"
+				RelativePath="ASCDVDSubpictureFrame.h"
 				>
 			</File>
 			<File
-				RelativePath="AVSExtraData.h"
+				RelativePath="ASCExtraData.h"
 				>
 			</File>
 			<File
-				RelativePath="AVSMediaBuffer.h"
+				RelativePath="ASCMediaBuffer.h"
 				>
 			</File>
 			<File
-				RelativePath="AVSMediaData.h"
+				RelativePath="ASCMediaData.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSPacketsAudioData.h"
+				RelativePath=".\ASCPacketsAudioData.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSSubtitleData.h"
+				RelativePath=".\ASCSubtitleData.h"
 				>
 			</File>
 			<File
-				RelativePath="AVSUncompressedVideoFrame.h"
+				RelativePath="ASCUncompressedVideoFrame.h"
 				>
 			</File>
 			<File
-				RelativePath="AVSVideoFrameColorTransform.h"
+				RelativePath="ASCVideoFrameColorTransform.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSVideoFramePainter.h"
+				RelativePath=".\ASCVideoFramePainter.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSVideoFramePainter2.h"
+				RelativePath=".\ASCVideoFramePainter2.h"
 				>
 			</File>
 			<File
-				RelativePath="AVSVideoFrameTransform.h"
+				RelativePath="ASCVideoFrameTransform.h"
 				>
 			</File>
 			<File
@@ -737,11 +737,11 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="AVSMediaCore3.rc"
+				RelativePath="ASCMediaCore3.rc"
 				>
 			</File>
 			<File
-				RelativePath="AVSMediaCore3.rgs"
+				RelativePath="ASCMediaCore3.rgs"
 				>
 			</File>
 		</Filter>
@@ -753,7 +753,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Common\AVSVideoStudio3ID.h"
+				RelativePath="..\Common\ASCVideoStudio3ID.h"
 				>
 			</File>
 			<File
diff --git a/ASCMediaCore3/ASCMediaData.h b/ASCMediaCore3/ASCMediaData.h
index ebbfba6b68..d705eb4656 100644
--- a/ASCMediaCore3/ASCMediaData.h
+++ b/ASCMediaCore3/ASCMediaData.h
@@ -4,7 +4,7 @@
 #include <MediaFormatDefine.h>
 #include <MediaDataDefine.h>
 #include <VideoFileErrorDescription.h>
-#include "AVSMediaBuffer.h"
+#include "ASCMediaBuffer.h"
 	
 [object, uuid("C04D2557-D06D-406c-BA7D-27657B1F788C"), dual, pointer_default(unique)]
 __interface IAVSMediaData : IDispatch
diff --git a/ASCMediaCore3/ASCPacketsAudioData.h b/ASCMediaCore3/ASCPacketsAudioData.h
index 5f792d1e9b..d13ed02e2e 100644
--- a/ASCMediaCore3/ASCPacketsAudioData.h
+++ b/ASCMediaCore3/ASCPacketsAudioData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "AVSAudioData.h"
+#include "ASCAudioData.h"
 	
 [object, uuid("1B92459A-0727-491b-9E7F-FB0D1AA81F7B"), dual, pointer_default(unique)]
 __interface IAVSPacketsAudioData : IAVSAudioData
diff --git a/ASCMediaCore3/ASCSubtitleData.h b/ASCMediaCore3/ASCSubtitleData.h
index 480383b91a..3023e36b13 100644
--- a/ASCMediaCore3/ASCSubtitleData.h
+++ b/ASCMediaCore3/ASCSubtitleData.h
@@ -2,7 +2,7 @@
 
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSMediaData.h"
+#include "ASCMediaData.h"
 #include "MemoryUtils.h"
 #include <atlcoll.h>
 
diff --git a/ASCMediaCore3/ASCUncompressedVideoFrame.h b/ASCMediaCore3/ASCUncompressedVideoFrame.h
index 5c83f8db45..36015a70b7 100644
--- a/ASCMediaCore3/ASCUncompressedVideoFrame.h
+++ b/ASCMediaCore3/ASCUncompressedVideoFrame.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "AVSMediaData.h"
+#include "ASCMediaData.h"
 #include "MediaDataStruct.h"
 #include "atlenc.h"
 	
diff --git a/ASCMediaCore3/ASCVideoFrameColorTransform.h b/ASCMediaCore3/ASCVideoFrameColorTransform.h
index a9d9263bd7..1b63b2095b 100644
--- a/ASCMediaCore3/ASCVideoFrameColorTransform.h
+++ b/ASCMediaCore3/ASCVideoFrameColorTransform.h
@@ -2,7 +2,7 @@
 
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSUncompressedVideoFrame.h"
+#include "ASCUncompressedVideoFrame.h"
 #include <math.h>
 
 
diff --git a/ASCMediaCore3/ASCVideoFramePainter.h b/ASCMediaCore3/ASCVideoFramePainter.h
index 9a78026c9d..1f6e0c8e43 100644
--- a/ASCMediaCore3/ASCVideoFramePainter.h
+++ b/ASCMediaCore3/ASCVideoFramePainter.h
@@ -2,8 +2,8 @@
 
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSUncompressedVideoFrame.h"
-#include "AVSVideoFrameTransform.h" 
+#include "ASCUncompressedVideoFrame.h"
+#include "ASCVideoFrameTransform.h" 
 #include <math.h>
 
 
diff --git a/ASCMediaCore3/ASCVideoFramePainter2.h b/ASCMediaCore3/ASCVideoFramePainter2.h
index dbcd0a73c2..bbf0648201 100644
--- a/ASCMediaCore3/ASCVideoFramePainter2.h
+++ b/ASCMediaCore3/ASCVideoFramePainter2.h
@@ -1,4 +1,4 @@
-// AVSVideoFramePainter.h 
+// ASCVideoFramePainter.h 
 
 #pragma once
 #include "resource.h"       // main symbols
diff --git a/ASCMediaCore3/ASCVideoFrameTransform.cpp b/ASCMediaCore3/ASCVideoFrameTransform.cpp
index 9d5f2ba1d4..6faa0b1408 100644
--- a/ASCMediaCore3/ASCVideoFrameTransform.cpp
+++ b/ASCMediaCore3/ASCVideoFrameTransform.cpp
@@ -1,7 +1,7 @@
 // AVSVideoFrameTransform.cpp : Implementation of CAVSVideoFrameTransform
 
 #include "stdafx.h"
-#include "AVSVideoFrameTransform.h"
+#include "ASCVideoFrameTransform.h"
 #include <math.h>
 
 
diff --git a/ASCMediaCore3/ASCVideoFrameTransform.h b/ASCMediaCore3/ASCVideoFrameTransform.h
index 5fed73c3b6..db015f3f80 100644
--- a/ASCMediaCore3/ASCVideoFrameTransform.h
+++ b/ASCMediaCore3/ASCVideoFrameTransform.h
@@ -2,7 +2,7 @@
 
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSUncompressedVideoFrame.h"
+#include "ASCUncompressedVideoFrame.h"
 #include "./VideoFrameTransformLib/BaseTransform.h"
 
 
diff --git a/ASCMediaCore3/DrawLogo.h b/ASCMediaCore3/DrawLogo.h
index ca9248f1cf..046a9db242 100644
--- a/ASCMediaCore3/DrawLogo.h
+++ b/ASCMediaCore3/DrawLogo.h
@@ -1,10 +1,10 @@
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSUncompressedVideoFrame.h"
-#include "AVSVideoFrameTransform.h" 
+#include "ASCUncompressedVideoFrame.h"
+#include "ASCVideoFrameTransform.h" 
 #include <math.h>
 
-#import "../../../Redist/AVSMediaFormatSettings3.dll"	named_guids rename_namespace("MediaFormat"), exclude("tagRECT")
+#import "../Redist/ASCMediaFormatSettings3.dll"	named_guids rename_namespace("MediaFormat"), exclude("tagRECT")
 typedef IAVSUncompressedVideoFrame IMediaFrame;
 
 class CDrawLogo
diff --git a/ASCMediaCore3/Resource.h b/ASCMediaCore3/Resource.h
index 1da038c407..ca2b84e8dd 100644
--- a/ASCMediaCore3/Resource.h
+++ b/ASCMediaCore3/Resource.h
@@ -1,10 +1,10 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by AVSMediaCore3.rc
+// Used by ASCMediaCore3.rc
 //
 
 #define IDS_PROJNAME                    100
-#define IDR_AVSMEDIACORE3	101
+#define IDR_ASCMEDIACORE3	101
 
 // Next default values for new objects
 // 
diff --git a/ASCMediaCore3/stdafx.cpp b/ASCMediaCore3/stdafx.cpp
index 133323d92f..b8d37eb273 100644
--- a/ASCMediaCore3/stdafx.cpp
+++ b/ASCMediaCore3/stdafx.cpp
@@ -1,5 +1,5 @@
 // stdafx.cpp : source file that includes just the standard includes
-// AVSMediaCore3.pch will be the pre-compiled header
+// ASCMediaCore3.pch will be the pre-compiled header
 // stdafx.obj will contain the pre-compiled type information
 
 #include "stdafx.h"
diff --git a/ASCMediaCore3/stdafx.h b/ASCMediaCore3/stdafx.h
index 09dfcf01ff..926d2c648d 100644
--- a/ASCMediaCore3/stdafx.h
+++ b/ASCMediaCore3/stdafx.h
@@ -44,4 +44,4 @@
 
 using namespace ATL;
 
-#import "..\..\..\Redist\AVSMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat") 
\ No newline at end of file
+#import "..\Redist\ASCMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat") 
\ No newline at end of file