diff --git a/ASCImageStudio3/ASCGraphics/Common/GraphicsPath.h b/ASCImageStudio3/ASCGraphics/Common/GraphicsPath.h
index a9f3f9e433..8a830d0b89 100644
--- a/ASCImageStudio3/ASCGraphics/Common/GraphicsPath.h
+++ b/ASCImageStudio3/ASCGraphics/Common/GraphicsPath.h
@@ -13,9 +13,9 @@
 #endif
 
 #include "..\VectorGraphics\SPath.h"
-#include "..\Interfaces\IAVSPen.h"
-#include "..\Interfaces\IAVSBrush.h"
-#include "..\Objects\AVSSolidPattern.h"
+#include "..\Interfaces\IASCPen.h"
+#include "..\Interfaces\IASCBrush.h"
+#include "..\Objects\ASCSolidPattern.h"
 
 class CGraphicsPath : public SPath
 {
diff --git a/ASCImageStudio3/ASCGraphics/Common/Pixels.h b/ASCImageStudio3/ASCGraphics/Common/Pixels.h
index c1edd23329..09611dfcc0 100644
--- a/ASCImageStudio3/ASCGraphics/Common/Pixels.h
+++ b/ASCImageStudio3/ASCGraphics/Common/Pixels.h
@@ -4,8 +4,8 @@
 #include "..\VectorGraphics\STypes.h"
 #include "..\VectorGraphics\MemoryUtils.h"
 
-#include "..\Interfaces\IAVSPattern.h"
-#include "..\..\AVSVideoStudio3\Common\AVSUtils.h"
+#include "..\Interfaces\IASCPattern.h"
+#include "..\..\..\Common\ASCUtils.h"
 
 class CPixels
 {
diff --git a/ASCImageStudio3/ASCGraphics/DocumentViewer/Metafile.h b/ASCImageStudio3/ASCGraphics/DocumentViewer/Metafile.h
index 3f8dd6d301..de77d20e3f 100644
--- a/ASCImageStudio3/ASCGraphics/DocumentViewer/Metafile.h
+++ b/ASCImageStudio3/ASCGraphics/DocumentViewer/Metafile.h
@@ -2,18 +2,18 @@
 #include "..\stdafx.h"
 
 #include "..\Objects\Structures.h"
-#include "..\Interfaces\AVSRenderer.h"
-#include "..\Interfaces\IAVSGraphicsRenderer.h"
+#include "..\Interfaces\ASCRenderer.h"
+#include "..\Interfaces\IASCGraphicsRenderer.h"
 #include "TemporaryCS.h"
 
-#include "..\..\AVSOfficeStudio\Common\OfficeDrawing\File.h"
-#include "..\Objects\AVSImage.h"
+#include "..\..\..\Common\OfficeDrawing\File.h"
+#include "..\Objects\ASCImage.h"
 #include "..\DocumentViewer\DIB.h"
 
 #include "..\Objects\Image\EmfFile.h"
-#include "..\agg\AVSWrapper\ArrowHead.h"
+#include "..\agg\ASCWrapper\ArrowHead.h"
 
-#include "..\..\AVSVideoStudio3\Common\MediaFormatDefine.h"
+#include "..\..\..\Common\MediaFormatDefine.h"
 
 // IAVSMetafile
 [object, uuid("8E19E616-F99C-46c9-B56D-BFF98241EB39"), dual, pointer_default(unique)]
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/ASCDocumentRenderer.cpp b/ASCImageStudio3/ASCGraphics/Interfaces/ASCDocumentRenderer.cpp
index 11fe744396..799a2c4a6f 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/ASCDocumentRenderer.cpp
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/ASCDocumentRenderer.cpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "stdafx.h"
-#include "AVSDocumentRenderer.h"
+#include "ASCDocumentRenderer.h"
 #include "ImageSerializeObjects2.h"
 
 void CAVSDocumentRenderer::DrawWatermark(LONG lPageNumber, IUnknown* punkRenderer)
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/ASCDocumentRenderer.h b/ASCImageStudio3/ASCGraphics/Interfaces/ASCDocumentRenderer.h
index 36f265ccc2..687e4fb03b 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/ASCDocumentRenderer.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/ASCDocumentRenderer.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "AVSMetafile.h"
-#include "AVSGraphicsRenderer.h"
+#include "ASCMetafile.h"
+#include "ASCGraphicsRenderer.h"
 #include "..\DocumentViewer\Viewer.h"
 
 // IAVSDocumentRenderer
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/ASCGraphicsSimpleConverter.h b/ASCImageStudio3/ASCGraphics/Interfaces/ASCGraphicsSimpleConverter.h
index d6892622fa..4120e1f6e2 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/ASCGraphicsSimpleConverter.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/ASCGraphicsSimpleConverter.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "..\stdafx.h"
-#include "..\agg\AVSWrapper\GraphicsPath.h"
+#include "..\agg\ASCWrapper\GraphicsPath.h"
 
 // IAVSGraphicSimpleComverter
 [object, uuid("45EC6624-B5E1-4e60-ADD4-8DD310B6CF96"), dual, pointer_default(unique)]
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/ASCMetafile.h b/ASCImageStudio3/ASCGraphics/Interfaces/ASCMetafile.h
index 2cca8660db..94acc097a5 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/ASCMetafile.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/ASCMetafile.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "AVSRenderer.h"
+#include "ASCRenderer.h"
 #include "..\DocumentViewer\Metafile.h"
-#include "..\..\AVSOfficeStudio\Common\OfficeFileTemplate.h"
+#include "..\..\ASCOfficeStudio\Common\OfficeFileTemplate.h"
 
 
 #define PROPERTY_META(NameBase, Name, Type)				\
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/IASCBrush.h b/ASCImageStudio3/ASCGraphics/Interfaces/IASCBrush.h
index 973486a902..d26bdb89f2 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/IASCBrush.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/IASCBrush.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "..\stdafx.h"
 
-#include "IAVSGraphicsBase.h"
+#include "IASCGraphicsBase.h"
 
 [object, uuid("64AE5000-6CF6-461a-A766-344F88DC8381"), dual, pointer_default(unique)]
 __interface IAVSBrush : IAVSGraphicsBase
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/IASCFontManager.h b/ASCImageStudio3/ASCGraphics/Interfaces/IASCFontManager.h
index 931d95b8db..96938dfc5f 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/IASCFontManager.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/IASCFontManager.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "../stdafx.h"
 
-#include "IAVSGraphicsBase.h"
-#include "IAVSGlyphImage.h"
+#include "IASCGraphicsBase.h"
+#include "IASCGlyphImage.h"
 
 [object, uuid("472691CD-1FC6-424a-A44E-8E7549ECDCFF"), dual, pointer_default(unique)]
 __interface IAVSFontManager : IAVSGraphicsBase
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/IASCGlyphImage.h b/ASCImageStudio3/ASCGraphics/Interfaces/IASCGlyphImage.h
index 090d5afced..f3f8fb53d0 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/IASCGlyphImage.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/IASCGlyphImage.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "..\stdafx.h"
 
-#include "IAVSGraphicsBase.h"
+#include "IASCGraphicsBase.h"
 
 [object, uuid("280F9CFE-D5F6-4594-B6C5-A7F3D6984CF2"), dual, pointer_default(unique)]
 __interface IAVSGlyphImage : IAVSGraphicsBase
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsPath.h b/ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsPath.h
index c0f950f050..b8d880a93a 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsPath.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsPath.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "../stdafx.h"
 
-#include "IAVSStringFormat.h"
-#include "IAVSFontManager.h"
-#include "IAVSPattern.h"
+#include "IASCStringFormat.h"
+#include "IASCFontManager.h"
+#include "IASCPattern.h"
 
 const long c_ag_FillModeAlternate			= 0;
 const long c_ag_FillModeWinding				= 1;
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsRenderer.h b/ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsRenderer.h
index 82b080df34..a93a00efda 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsRenderer.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsRenderer.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "AVSRenderer.h"
+#include "ASCRenderer.h"
 
 // IAVSGraphicsRenderer
 [object, uuid("A278FE9F-622A-43a3-9F18-363311637073"), dual, pointer_default(unique)]
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/IASCPattern.h b/ASCImageStudio3/ASCGraphics/Interfaces/IASCPattern.h
index 799e850a2b..75fe0f0e8d 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/IASCPattern.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/IASCPattern.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "..\stdafx.h"
 
-#include "IAVSGraphicsBase.h"
+#include "IASCGraphicsBase.h"
 
 [object, uuid("90445113-FEDD-4e88-AC18-06564C5399E6"), dual, pointer_default(unique)]
 __interface IAVSPattern : IAVSGraphicsBase
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/IASCPen.h b/ASCImageStudio3/ASCGraphics/Interfaces/IASCPen.h
index 3c8569ad53..2b53f67127 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/IASCPen.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/IASCPen.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "..\stdafx.h"
 
-#include "IAVSGraphicsBase.h"
+#include "IASCGraphicsBase.h"
 
 [object, uuid("166BB233-E93A-4159-8BC7-A2B2B5394B23"), dual, pointer_default(unique)]
 __interface IAVSPen : IAVSGraphicsBase
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/IASCStringFormat.h b/ASCImageStudio3/ASCGraphics/Interfaces/IASCStringFormat.h
index b15b73dc34..2822fcb820 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/IASCStringFormat.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/IASCStringFormat.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../stdafx.h"
 
-#include "IAVSGraphicsBase.h"
+#include "IASCGraphicsBase.h"
 
 [object, uuid("A03E5FD2-2F5D-464a-9CFF-F9B09BC5FC72"), dual, pointer_default(unique)]
 __interface IAVSStringFormat : IAVSGraphicsBase
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/IASCWinFonts.h b/ASCImageStudio3/ASCGraphics/Interfaces/IASCWinFonts.h
index 1e5904364a..4587649e01 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/IASCWinFonts.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/IASCWinFonts.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../stdafx.h"
 
-#include "IAVSGraphicsBase.h"
+#include "IASCGraphicsBase.h"
 
 [object, uuid("6C1AFC19-C954-4b74-B66C-9194D22A448A"), dual, pointer_default(unique)]
 __interface IAVSWinFonts : IAVSGraphicsBase
diff --git a/ASCImageStudio3/ASCGraphics/Interfaces/SVGRenderer.h b/ASCImageStudio3/ASCGraphics/Interfaces/SVGRenderer.h
index c275f9d36b..73e75b3eec 100644
--- a/ASCImageStudio3/ASCGraphics/Interfaces/SVGRenderer.h
+++ b/ASCImageStudio3/ASCGraphics/Interfaces/SVGRenderer.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "AVSRenderer.h"
+#include "ASCRenderer.h"
 #include "StringWriter.h"
 #include "..\Objects\Structures.h"
-#include "AVSGraphicsSimpleConverter.h"
-#include "..\Objects\AVSWinFonts.h"
-#include "..\Objects\AVSFontManager.h"
+#include "ASCGraphicsSimpleConverter.h"
+#include "..\Objects\ASCWinFonts.h"
+#include "..\Objects\ASCFontManager.h"
 #include "GdiplusEx.h"
 
 namespace NSSVG
diff --git a/ASCImageStudio3/ASCGraphics/Objects/ASCFontManager.cpp b/ASCImageStudio3/ASCGraphics/Objects/ASCFontManager.cpp
index 0d27363700..d4ad1369e4 100644
--- a/ASCImageStudio3/ASCGraphics/Objects/ASCFontManager.cpp
+++ b/ASCImageStudio3/ASCGraphics/Objects/ASCFontManager.cpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "stdafx.h"
-#include "AVSFontManager.h"
-#include "../Interfaces/AVSGraphicsRenderer.h"
+#include "ASCFontManager.h"
+#include "../Interfaces/ASCGraphicsRenderer.h"
 
 void CAVSFontManager::DumpToJSEditor(CString strDirectory, bool bIsUnionFamily)
 {
diff --git a/ASCImageStudio3/ASCGraphics/Objects/ASCFontManager.h b/ASCImageStudio3/ASCGraphics/Objects/ASCFontManager.h
index 8ce97baf44..52990461de 100644
--- a/ASCImageStudio3/ASCGraphics/Objects/ASCFontManager.h
+++ b/ASCImageStudio3/ASCGraphics/Objects/ASCFontManager.h
@@ -1,10 +1,10 @@
 // FontManager.h : Declaration of the CFontManager
 
 #pragma once
-#include "../Interfaces/IAVSFontManager.h"
-#include "../Interfaces/IAVSGraphicsPath.h"
-#include "../Interfaces/IAVSWinFonts.h"
-#include "../Objects/AVSWinFonts.h"
+#include "../Interfaces/IASCFontManager.h"
+#include "../Interfaces/IASCGraphicsPath.h"
+#include "../Interfaces/IASCWinFonts.h"
+#include "../Objects/ASCWinFonts.h"
 
 #include "Font/FontConsts.h"
 #include "Font/WinFont.h"
@@ -19,12 +19,12 @@
 
 #include "Font/WinFontStorage.h"
 
-#include "AVSGlyphImage.h"
-#include "AVSGraphicsPath.h"
+#include "ASCGlyphImage.h"
+#include "ASCGraphicsPath.h"
 
 #include "TimeMeasurer.h"
 #include "../Interfaces/XmlUtils.h"
-#include "../../../AVSOfficeStudio/Common/OfficeDrawing/File.h"
+#include "../../../Common/OfficeDrawing/File.h"
 
 #include FT_ADVANCES_H
 #include FT_GLYPH_H
diff --git a/ASCImageStudio3/ASCGraphics/Objects/ASCWinFonts.h b/ASCImageStudio3/ASCGraphics/Objects/ASCWinFonts.h
index abfeb1b2d9..fe493c87d5 100644
--- a/ASCImageStudio3/ASCGraphics/Objects/ASCWinFonts.h
+++ b/ASCImageStudio3/ASCGraphics/Objects/ASCWinFonts.h
@@ -2,12 +2,12 @@
 
 #pragma once
 
-#include "..\Interfaces\IAVSWinFonts.h"
+#include "..\Interfaces\IASCWinFonts.h"
 #include "Font\WinFont.h"
 #include "Font\WinFontStorage.h"
 
 #include "..\Interfaces\BaseThread.h"
-#include "../../../AVSOfficeStudio/Common/OfficeDrawing/File.h"
+#include "../../../Common/OfficeDrawing/File.h"
 
 #if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
 #error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
diff --git a/ASCImageStudio3/ASCGraphics/Objects/Font/FontPath.cpp b/ASCImageStudio3/ASCGraphics/Objects/Font/FontPath.cpp
index 1535c7d3aa..5aba711da6 100644
--- a/ASCImageStudio3/ASCGraphics/Objects/Font/FontPath.cpp
+++ b/ASCImageStudio3/ASCGraphics/Objects/Font/FontPath.cpp
@@ -5,7 +5,7 @@
 #include <xmlutils.h>
 
 #include "FontPath.h"
-#include "../../Interfaces/IAVSGraphicsPath.h"
+#include "../../Interfaces/IASCGraphicsPath.h"
 
 //-------------------------------------------------------------------------------------------------------------------------------
 // CPath
diff --git a/ASCImageStudio3/ASCGraphics/Objects/Image/SVG/SVGFramework.h b/ASCImageStudio3/ASCGraphics/Objects/Image/SVG/SVGFramework.h
index 9938148abf..5338da819e 100644
--- a/ASCImageStudio3/ASCGraphics/Objects/Image/SVG/SVGFramework.h
+++ b/ASCImageStudio3/ASCGraphics/Objects/Image/SVG/SVGFramework.h
@@ -14,11 +14,11 @@
 
 #include <../../../Interfaces/XmlUtils.h>
 #include <../../../Interfaces/BaseThread.h>
-#include <../../../Objects/AVSFontManager.h>
-#include <../../../Interfaces/AVSRenderer.h>
+#include <../../../Objects/ASCFontManager.h>
+#include <../../../Interfaces/ASCRenderer.h>
 #include <../../../agg/AVSWrapper/GraphicsPath.h>
 
-#include "../../../Interfaces/IAVSGraphicsRenderer.h"
+#include "../../../Interfaces/IASCGraphicsRenderer.h"
 
 #define GET_ATTRIBUTEN(NAME)	if(style==##NAME)return m_n##NAME;
 #define GET_ATTRIBUTED(NAME)	if(style==##NAME)return m_n##NAME;
diff --git a/ASCImageStudio3/ASCGraphics/Objects/Image/SVG/SVGTransformer.h b/ASCImageStudio3/ASCGraphics/Objects/Image/SVG/SVGTransformer.h
index de5c9d073c..1e25f31451 100644
--- a/ASCImageStudio3/ASCGraphics/Objects/Image/SVG/SVGTransformer.h
+++ b/ASCImageStudio3/ASCGraphics/Objects/Image/SVG/SVGTransformer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../../Interfaces/AVSRenderer.h"
-#include "../../../../../AVSOfficeStudio/Common/OfficeFileErrorDescription.h"
-#include "../../../../../../../Common/GdiPlusEx.h"
+#include "../../../Interfaces/ASCRenderer.h"
+#include "../../../../../Common/OfficeFileErrorDescription.h"
+#include "../../../../../Common/GdiPlusEx.h"
 
 #include "SVGFramework.h"
 
diff --git a/ASCImageStudio3/ASCGraphics/Objects/Structures.h b/ASCImageStudio3/ASCGraphics/Objects/Structures.h
index f07f304fb8..2777298b3a 100644
--- a/ASCImageStudio3/ASCGraphics/Objects/Structures.h
+++ b/ASCImageStudio3/ASCGraphics/Objects/Structures.h
@@ -2,7 +2,7 @@
 //#include "..\stdafx.h"
 #include "..\Interfaces\XmlUtils.h"
 #include "..\..\AVSVideoStudio3\Common\AVSUtils.h"
-#include "./../Interfaces/AVSRenderer.h"
+#include "./../Interfaces/ASCRenderer.h"
 #include "./../agg/ap_aggplusenums.h"
 
 #include <gdiplus.h>
diff --git a/ASCImageStudio3/ASCGraphics/agg/ASCWrapper/GraphicsPath.h b/ASCImageStudio3/ASCGraphics/agg/ASCWrapper/GraphicsPath.h
index 4b03749dda..f8dc914e14 100644
--- a/ASCImageStudio3/ASCGraphics/agg/ASCWrapper/GraphicsPath.h
+++ b/ASCImageStudio3/ASCGraphics/agg/ASCWrapper/GraphicsPath.h
@@ -19,7 +19,7 @@
 
 #include "Matrix.h"
 
-#include "..\..\Objects\AVSFontManager.h"
+#include "..\..\Objects\ASCFontManager.h"
 #include "..\..\Objects\Structures.h"
 
 namespace Aggplus