diff --git a/ASCMediaFormatSettings3/AASCVideoFormat.h b/ASCMediaFormatSettings3/AASCVideoFormat.h
index e8e6516f4b..5cc1c28740 100644
--- a/ASCMediaFormatSettings3/AASCVideoFormat.h
+++ b/ASCMediaFormatSettings3/AASCVideoFormat.h
@@ -1,8 +1,8 @@
-// AVSVideoFormat.h : Declaration of the CAVSVideoFormat
+// ASCVideoFormat.h : Declaration of the CASCVideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSMediaFormat.h"       // main symbols
+#include "ASCMediaFormat.h"       // main symbols
 
 #include "../Common/FourCCDefines.h"
 
diff --git a/ASCMediaFormatSettings3/ASCAudioFormat.h b/ASCMediaFormatSettings3/ASCAudioFormat.h
index a797410dd5..124e30db32 100644
--- a/ASCMediaFormatSettings3/ASCAudioFormat.h
+++ b/ASCMediaFormatSettings3/ASCAudioFormat.h
@@ -1,11 +1,11 @@
-// AVSAudioFormat.h : Declaration of the CAVSAudioFormat
+// ASCAudioFormat.h : Declaration of the CASCAudioFormat
 
 #pragma once
 #include "resource.h"       // main symbols
 #include "ATLDefine.h"
-#include "AVSMediaFormat.h"       // main symbols
+#include "ASCMediaFormat.h"       // main symbols
 #include "AudioDefines.h"
-#include "AVSUtils.h"
+#include "ASCUtils.h"
 
 class CAVSAudioFormat;
 // IAVSAudioFormat
diff --git a/ASCMediaFormatSettings3/ASCExternalVideoFormat.h b/ASCMediaFormatSettings3/ASCExternalVideoFormat.h
index 2f52da26b9..324a8f730d 100644
--- a/ASCMediaFormatSettings3/ASCExternalVideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCExternalVideoFormat.h
@@ -1,4 +1,4 @@
-// AVSExternalVideoFormat.h : Declaration of the CAVSExternalVideoFormat
+// ASCExternalVideoFormat.h : Declaration of the CASCExternalVideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
@@ -6,7 +6,7 @@
 
 
 #include "ATLDefine.h"
-//#include "AVSVideoFormat.h"
+//#include "ASCVideoFormat.h"
 
 class CAVSExternalVideoFormat;
 
diff --git a/ASCMediaFormatSettings3/ASCH263VideoFormat.h b/ASCMediaFormatSettings3/ASCH263VideoFormat.h
index e52523aa5e..a7740f13e5 100644
--- a/ASCMediaFormatSettings3/ASCH263VideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCH263VideoFormat.h
@@ -1,9 +1,9 @@
-// AVSH263VideoFormat.h : Declaration of the CAVSH263VideoFormat
+// ASCH263VideoFormat.h : Declaration of the CASCH263VideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
 #include "ATLDefine.h"
-#include "AVSVideoFormat.h"
+#include "ASCVideoFormat.h"
 
 class CAVSH263VideoFormat;
 // IAVSH263VideoFormat
diff --git a/ASCMediaFormatSettings3/ASCH264ExtVideoFormat.h b/ASCMediaFormatSettings3/ASCH264ExtVideoFormat.h
index 4b3ae09595..38828ed1f9 100644
--- a/ASCMediaFormatSettings3/ASCH264ExtVideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCH264ExtVideoFormat.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "resource.h"       // main symbols
 #include "ATLDefine.h"
-#include "AVSH264VideoFormat.h"
+#include "ASCH264VideoFormat.h"
 
 class CAVSH264ExtVideoFormat;
 // IAVSH264ExtVideoFormat
diff --git a/ASCMediaFormatSettings3/ASCH264VideoFormat.h b/ASCMediaFormatSettings3/ASCH264VideoFormat.h
index 47ac01059e..e666e1892d 100644
--- a/ASCMediaFormatSettings3/ASCH264VideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCH264VideoFormat.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "resource.h"       // main symbols
 #include "ATLDefine.h"
-#include "AVSVideoFormat.h"
+#include "ASCVideoFormat.h"
 
 class CAVSH264VideoFormat;
 // IAVSH264VideoFormat
diff --git a/ASCMediaFormatSettings3/ASCIntelMediaVideoFormat.cpp b/ASCMediaFormatSettings3/ASCIntelMediaVideoFormat.cpp
index 75b295170a..154254dd94 100644
--- a/ASCMediaFormatSettings3/ASCIntelMediaVideoFormat.cpp
+++ b/ASCMediaFormatSettings3/ASCIntelMediaVideoFormat.cpp
@@ -1,7 +1,7 @@
-// AVSIntelMediaVideoFormat.cpp : Implementation of CAVSIntelMediaVideoFormat
+// ASCIntelMediaVideoFormat.cpp : Implementation of CASCIntelMediaVideoFormat
 
 #include "stdafx.h"
-#include "AVSIntelMediaVideoFormat.h"
+#include "ASCIntelMediaVideoFormat.h"
 
 
 // CAVSIntelMediaVideoFormat
diff --git a/ASCMediaFormatSettings3/ASCIntelMediaVideoFormat.h b/ASCMediaFormatSettings3/ASCIntelMediaVideoFormat.h
index 0b31de1fbc..43ce7138da 100644
--- a/ASCMediaFormatSettings3/ASCIntelMediaVideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCIntelMediaVideoFormat.h
@@ -1,12 +1,12 @@
-// AVSIntelMediaVideoFormat.h : Declaration of the CAVSIntelMediaVideoFormat
+// ASCIntelMediaVideoFormat.h : Declaration of the CASCIntelMediaVideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSVideoFormat.h"
+#include "ASCVideoFormat.h"
 #include "ATLDefine.h"
 #include "VideoFileErrorDescription.h"
 
-#include "AVSH264VideoFormat.h"
+#include "ASCH264VideoFormat.h"
 #include "..\Common\mfxstructures.h"
 
 #include <math.h>
diff --git a/ASCMediaFormatSettings3/ASCMPEG2VideoFormat.h b/ASCMediaFormatSettings3/ASCMPEG2VideoFormat.h
index d4d76d25d4..3305766e3a 100644
--- a/ASCMediaFormatSettings3/ASCMPEG2VideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCMPEG2VideoFormat.h
@@ -1,10 +1,10 @@
-// AVSMPEG2VideoFormat.h : Declaration of the CAVSMPEG2VideoFormat
+// ASCMPEG2VideoFormat.h : Declaration of the CASCMPEG2VideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
 //#include "ATLDefine.h"
 //#include "
-#include "AVSVideoFormat.h"
+#include "ASCVideoFormat.h"
 
 class CAVSMPEG2VideoFormat;
 // IAVSMPEG2VideoFormat
diff --git a/ASCMediaFormatSettings3/ASCMPEG3AudioFormat.h b/ASCMediaFormatSettings3/ASCMPEG3AudioFormat.h
index 78e3647c65..c6bf3be2ba 100644
--- a/ASCMediaFormatSettings3/ASCMPEG3AudioFormat.h
+++ b/ASCMediaFormatSettings3/ASCMPEG3AudioFormat.h
@@ -1,4 +1,4 @@
-// AVSMPEG3AudioFormat.h : Declaration of the CAVSMPEG3AudioFormat
+// ASCMPEG3AudioFormat.h : Declaration of the CASCMPEG3AudioFormat
 
 #pragma once
 #include "resource.h"       // main symbols
diff --git a/ASCMediaFormatSettings3/ASCMPEG4AudioFormat.h b/ASCMediaFormatSettings3/ASCMPEG4AudioFormat.h
index 621223ce33..046db3afb5 100644
--- a/ASCMediaFormatSettings3/ASCMPEG4AudioFormat.h
+++ b/ASCMediaFormatSettings3/ASCMPEG4AudioFormat.h
@@ -1,4 +1,4 @@
-// AVSMPEG4AudioFormat.h : Declaration of the CAVSMPEG4AudioFormat
+// ASCMPEG4AudioFormat.h : Declaration of the CASCMPEG4AudioFormat
 
 #pragma once
 #include "resource.h"       // main symbols
diff --git a/ASCMediaFormatSettings3/ASCMPEG4VideoFormat.h b/ASCMediaFormatSettings3/ASCMPEG4VideoFormat.h
index 378c8d3d08..3734f3449c 100644
--- a/ASCMediaFormatSettings3/ASCMPEG4VideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCMPEG4VideoFormat.h
@@ -1,10 +1,10 @@
-// AVSMPEG4VideoFormat.h : Declaration of the CAVSMPEG4VideoFormat
+// ASCMPEG4VideoFormat.h : Declaration of the CASCMPEG4VideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
 #include <atlcoll.h>
 #include "ATLDefine.h"
-#include "AVSVideoFormat.h"
+#include "ASCVideoFormat.h"
 
 class CAVSMPEG4VideoFormat;
 // IAVSMPEG4VideoFormat
diff --git a/ASCMediaFormatSettings3/ASCMPEGsVideoFormat.h b/ASCMediaFormatSettings3/ASCMPEGsVideoFormat.h
index 6c8a89db85..2ca361ddec 100644
--- a/ASCMediaFormatSettings3/ASCMPEGsVideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCMPEGsVideoFormat.h
@@ -1,9 +1,9 @@
-// AVSMPEGsVideoFormat.h : Declaration of the CAVSMPEGsVideoFormat
+// ASCMPEGsVideoFormat.h : Declaration of the CASCMPEGsVideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
 //#include "ATLDefine.h"
-#include "AVSVideoFormat.h"
+#include "ASCVideoFormat.h"
 
 class CAVSMPEGsVideoFormat;
 // IAVSMPEGsVideoFormat
diff --git a/ASCMediaFormatSettings3/ASCMediaFormat.h b/ASCMediaFormatSettings3/ASCMediaFormat.h
index f450887ae6..509fbfd3a2 100644
--- a/ASCMediaFormatSettings3/ASCMediaFormat.h
+++ b/ASCMediaFormatSettings3/ASCMediaFormat.h
@@ -1,4 +1,4 @@
-// AVSMediaFormat.h : Declaration of the CAVSMediaFormat
+// ASCMediaFormat.h : Declaration of the CASCMediaFormat
 
 #pragma once
 #include "resource.h"       // main symbols
diff --git a/ASCMediaFormatSettings3/ASCMediaFormatSettings3.cpp b/ASCMediaFormatSettings3/ASCMediaFormatSettings3.cpp
index 752a2cacb7..be48514526 100644
--- a/ASCMediaFormatSettings3/ASCMediaFormatSettings3.cpp
+++ b/ASCMediaFormatSettings3/ASCMediaFormatSettings3.cpp
@@ -1,30 +1,30 @@
-// AVSMediaFormatSettings3.cpp : Implementation of DLL Exports.
+// ASCMediaFormatSettings3.cpp : Implementation of DLL Exports.
 
 #include "stdafx.h"
 #include "resource.h"
-#include "AVSAudioFormat.h"
-#include "AVSVideoFormat.h"
-#include "AVSMPEGsVideoFormat.h"
-#include "AVSMPEG2VideoFormat.h"
-#include "AVSMPEG4VideoFormat.h"
-#include "AVSH263VideoFormat.h"
-#include "AVSH264VideoFormat.h"
-#include "AVSH264ExtVideoFormat.h"
-#include "AVSWMVVideoFormat.h"
-#include "AVSRMVideoFormat.h"
-#include "AVSRMAudioFormat.h"
-#include "AVSWMAAudioFormat.h"
-#include "AVSMPEG4AudioFormat.h"
-#include "AVSMPEG3AudioFormat.h"
-#include "AVSExternalVideoFormat.h"
-#include "AVSOggVorbisAudioFormat.h"
-#include "AVSSubPictureFormat.h"
-#include "AVSVPXVideoFormat.h"
+#include "ASCAudioFormat.h"
+#include "ASCVideoFormat.h"
+#include "ASCMPEGsVideoFormat.h"
+#include "ASCMPEG2VideoFormat.h"
+#include "ASCMPEG4VideoFormat.h"
+#include "ASCH263VideoFormat.h"
+#include "ASCH264VideoFormat.h"
+#include "ASCH264ExtVideoFormat.h"
+#include "ASCWMVVideoFormat.h"
+#include "ASCRMVideoFormat.h"
+#include "ASCRMAudioFormat.h"
+#include "ASCWMAAudioFormat.h"
+#include "ASCMPEG4AudioFormat.h"
+#include "ASCMPEG3AudioFormat.h"
+#include "ASCExternalVideoFormat.h"
+#include "ASCOggVorbisAudioFormat.h"
+#include "ASCSubPictureFormat.h"
+#include "ASCVPXVideoFormat.h"
 
-#include "AVSMediaFormatSerialize.h"
+#include "ASCMediaFormatSerialize.h"
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{12481495-4D84-409F-B52E-E728AE3D3BC9}", 
-		name = "AVSMediaFormatSettings3", 
-		helpstring = "AVSMediaFormatSettings3 1.0 Type Library",
-		resource_name = "IDR_AVSMEDIAFORMATSETTINGS3")];
+		name = "ASCMediaFormatSettings3", 
+		helpstring = "ASCMediaFormatSettings3 1.0 Type Library",
+		resource_name = "IDR_ASCMEDIAFORMATSETTINGS3")];
diff --git a/ASCMediaFormatSettings3/ASCOggVorbisAudioFormat.h b/ASCMediaFormatSettings3/ASCOggVorbisAudioFormat.h
index 6999ff906f..edee0ed1f6 100644
--- a/ASCMediaFormatSettings3/ASCOggVorbisAudioFormat.h
+++ b/ASCMediaFormatSettings3/ASCOggVorbisAudioFormat.h
@@ -1,8 +1,8 @@
-// AVSOggVorbisAudioFormat.h : Declaration of the CAVSOggVorbisAudioFormat
+// ASCOggVorbisAudioFormat.h : Declaration of the CASCOggVorbisAudioFormat
 
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSAudioFormat.h" 
+#include "ASCAudioFormat.h" 
 
 
 #if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
diff --git a/ASCMediaFormatSettings3/ASCRMAudioFormat.h b/ASCMediaFormatSettings3/ASCRMAudioFormat.h
index 3509124b4f..b6b6798ba1 100644
--- a/ASCMediaFormatSettings3/ASCRMAudioFormat.h
+++ b/ASCMediaFormatSettings3/ASCRMAudioFormat.h
@@ -1,9 +1,9 @@
-// AVSRMVideoFormat.h : Declaration of the CAVSRMAudioFormat
+// ASCRMVideoFormat.h : Declaration of the CASCRMAudioFormat
 
 #pragma once
 #include "resource.h"       // main symbols
 //#include "ATLDefine.h"
-//#include "AVSAudioFormat.h"
+//#include "ASCAudioFormat.h"
 
 
 // IAVSRMAudioFormat
diff --git a/ASCMediaFormatSettings3/ASCRMVideoFormat.h b/ASCMediaFormatSettings3/ASCRMVideoFormat.h
index 26e59bec0f..5e96c6dbda 100644
--- a/ASCMediaFormatSettings3/ASCRMVideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCRMVideoFormat.h
@@ -1,9 +1,9 @@
-// AVSRMVideoFormat.h : Declaration of the CAVSRMVideoFormat
+// ASCRMVideoFormat.h : Declaration of the CASCRMVideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
 #include "ATLDefine.h"
-#include "AVSVideoFormat.h"
+#include "ASCVideoFormat.h"
 
 
 // IAVSRMVideoFormat
diff --git a/ASCMediaFormatSettings3/ASCSubPictureFormat.h b/ASCMediaFormatSettings3/ASCSubPictureFormat.h
index 7d10139525..8f0bcf492e 100644
--- a/ASCMediaFormatSettings3/ASCSubPictureFormat.h
+++ b/ASCMediaFormatSettings3/ASCSubPictureFormat.h
@@ -1,8 +1,8 @@
-// AVSVideoFormat.h : Declaration of the CAVSVideoFormat
+// ASCVideoFormat.h : Declaration of the CASCVideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
-#include "AVSMediaFormat.h"       // main symbols
+#include "ASCMediaFormat.h"       // main symbols
 
 
 class CAVSSubPictureFormat;
diff --git a/ASCMediaFormatSettings3/ASCVPXVideoFormat.h b/ASCMediaFormatSettings3/ASCVPXVideoFormat.h
index 4545c9706c..e49b96d703 100644
--- a/ASCMediaFormatSettings3/ASCVPXVideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCVPXVideoFormat.h
@@ -1,9 +1,9 @@
-// AVSVPXVideoFormat.h : Declaration of the CAVSVPXVideoFormat
+// ASCVPXVideoFormat.h : Declaration of the CASCVPXVideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
 #include "ATLDefine.h"
-#include "AVSVideoFormat.h"
+#include "ASCVideoFormat.h"
 
 class CAVSVPXVideoFormat;
 // IAVSVPXVideoFormat
diff --git a/ASCMediaFormatSettings3/ASCWMAAudioFormat.h b/ASCMediaFormatSettings3/ASCWMAAudioFormat.h
index 823f99e8f9..ea79bf207e 100644
--- a/ASCMediaFormatSettings3/ASCWMAAudioFormat.h
+++ b/ASCMediaFormatSettings3/ASCWMAAudioFormat.h
@@ -1,9 +1,9 @@
-// AVSWMAAudioFormat.h : Declaration of the CAVSWMAAudioFormat
+// ASCWMAAudioFormat.h : Declaration of the CASCWMAAudioFormat
 
 #pragma once
 #include "resource.h"       // main symbols
 //#include "ATLDefine.h"
-//#include "AVSAudioFormat.h"
+//#include "ASCAudioFormat.h"
 #include "CodecsWMA.h"
 
 // IAVSWMAAudioFormat
diff --git a/ASCMediaFormatSettings3/ASCWMVVideoFormat.h b/ASCMediaFormatSettings3/ASCWMVVideoFormat.h
index 339fd7771b..f98380eadc 100644
--- a/ASCMediaFormatSettings3/ASCWMVVideoFormat.h
+++ b/ASCMediaFormatSettings3/ASCWMVVideoFormat.h
@@ -1,9 +1,9 @@
-// AVSWMVVideoFormat.h : Declaration of the CAVSWMVVideoFormat
+// ASCWMVVideoFormat.h : Declaration of the CASCWMVVideoFormat
 
 #pragma once
 #include "resource.h"       // main symbols
 //#include "ATLDefine.h"
-#include "AVSVideoFormat.h"
+#include "ASCVideoFormat.h"
 
 
 // IAVSWMVVideoFormat