diff --git a/Examples/ApiExamples/ApiExamples/ExBookmarks.cs b/Examples/ApiExamples/ApiExamples/ExBookmarks.cs
index 7cf9e432..51756478 100644
--- a/Examples/ApiExamples/ApiExamples/ExBookmarks.cs
+++ b/Examples/ApiExamples/ApiExamples/ExBookmarks.cs
@@ -67,7 +67,7 @@ public void Insert()
         //ExFor:BookmarkCollection.Item(String)
         //ExFor:BookmarkCollection.GetEnumerator
         //ExFor:Range.Bookmarks
-        //ExFor:DocumentVisitor.VisitBookmarkStart 
+        //ExFor:DocumentVisitor.VisitBookmarkStart
         //ExFor:DocumentVisitor.VisitBookmarkEnd
         //ExSummary:Shows how to add bookmarks and update their contents.
         [Test] //ExSkip
diff --git a/Examples/ApiExamples/ApiExamples/ExBookmarksOutlineLevelCollection.cs b/Examples/ApiExamples/ApiExamples/ExBookmarksOutlineLevelCollection.cs
index 01291898..d198f46a 100644
--- a/Examples/ApiExamples/ApiExamples/ExBookmarksOutlineLevelCollection.cs
+++ b/Examples/ApiExamples/ApiExamples/ExBookmarksOutlineLevelCollection.cs
@@ -22,13 +22,13 @@ public void BookmarkLevels()
             //ExFor:BookmarksOutlineLevelCollection
             //ExFor:BookmarksOutlineLevelCollection.Add(String, Int32)
             //ExFor:BookmarksOutlineLevelCollection.Clear
-            //ExFor:BookmarksOutlineLevelCollection.Contains(System.String)
+            //ExFor:BookmarksOutlineLevelCollection.Contains(String)
             //ExFor:BookmarksOutlineLevelCollection.Count
-            //ExFor:BookmarksOutlineLevelCollection.IndexOfKey(System.String)
-            //ExFor:BookmarksOutlineLevelCollection.Item(System.Int32)
-            //ExFor:BookmarksOutlineLevelCollection.Item(System.String)
-            //ExFor:BookmarksOutlineLevelCollection.Remove(System.String)
-            //ExFor:BookmarksOutlineLevelCollection.RemoveAt(System.Int32)
+            //ExFor:BookmarksOutlineLevelCollection.IndexOfKey(String)
+            //ExFor:BookmarksOutlineLevelCollection.Item(Int32)
+            //ExFor:BookmarksOutlineLevelCollection.Item(String)
+            //ExFor:BookmarksOutlineLevelCollection.Remove(String)
+            //ExFor:BookmarksOutlineLevelCollection.RemoveAt(Int32)
             //ExFor:OutlineOptions.BookmarksOutlineLevels
             //ExSummary:Shows how to set outline levels for bookmarks.
             Document doc = new Document();
diff --git a/Examples/ApiExamples/ApiExamples/ExBuildingBlocks.cs b/Examples/ApiExamples/ApiExamples/ExBuildingBlocks.cs
index 5b47a9af..816dfdac 100644
--- a/Examples/ApiExamples/ApiExamples/ExBuildingBlocks.cs
+++ b/Examples/ApiExamples/ApiExamples/ExBuildingBlocks.cs
@@ -19,21 +19,21 @@ public class ExBuildingBlocks : ApiExampleBase
     {
         //ExStart
         //ExFor:Document.GlossaryDocument
-        //ExFor:BuildingBlocks.BuildingBlock
-        //ExFor:BuildingBlocks.BuildingBlock.#ctor(BuildingBlocks.GlossaryDocument) 
-        //ExFor:BuildingBlocks.BuildingBlock.Accept(DocumentVisitor)
-        //ExFor:BuildingBlocks.BuildingBlock.Behavior
-        //ExFor:BuildingBlocks.BuildingBlock.Category
-        //ExFor:BuildingBlocks.BuildingBlock.Description
-        //ExFor:BuildingBlocks.BuildingBlock.FirstSection
-        //ExFor:BuildingBlocks.BuildingBlock.Gallery
-        //ExFor:BuildingBlocks.BuildingBlock.Guid
-        //ExFor:BuildingBlocks.BuildingBlock.LastSection
-        //ExFor:BuildingBlocks.BuildingBlock.Name
-        //ExFor:BuildingBlocks.BuildingBlock.Sections
-        //ExFor:BuildingBlocks.BuildingBlock.Type
-        //ExFor:BuildingBlocks.BuildingBlockBehavior
-        //ExFor:BuildingBlocks.BuildingBlockType
+        //ExFor:BuildingBlock
+        //ExFor:BuildingBlock.#ctor(GlossaryDocument)
+        //ExFor:BuildingBlock.Accept(DocumentVisitor)
+        //ExFor:BuildingBlock.Behavior
+        //ExFor:BuildingBlock.Category
+        //ExFor:BuildingBlock.Description
+        //ExFor:BuildingBlock.FirstSection
+        //ExFor:BuildingBlock.Gallery
+        //ExFor:BuildingBlock.Guid
+        //ExFor:BuildingBlock.LastSection
+        //ExFor:BuildingBlock.Name
+        //ExFor:BuildingBlock.Sections
+        //ExFor:BuildingBlock.Type
+        //ExFor:BuildingBlockBehavior
+        //ExFor:BuildingBlockType
         //ExSummary:Shows how to add a custom building block to a document.
         [Test] //ExSkip
         public void CreateAndInsert()
@@ -132,16 +132,16 @@ public override VisitorAction VisitBuildingBlockEnd(BuildingBlock block)
         //ExEnd
 
         //ExStart
-        //ExFor:BuildingBlocks.GlossaryDocument
-        //ExFor:BuildingBlocks.GlossaryDocument.Accept(DocumentVisitor)
-        //ExFor:BuildingBlocks.GlossaryDocument.BuildingBlocks
-        //ExFor:BuildingBlocks.GlossaryDocument.FirstBuildingBlock
-        //ExFor:BuildingBlocks.GlossaryDocument.GetBuildingBlock(BuildingBlocks.BuildingBlockGallery,System.String,System.String)
-        //ExFor:BuildingBlocks.GlossaryDocument.LastBuildingBlock
-        //ExFor:BuildingBlocks.BuildingBlockCollection
-        //ExFor:BuildingBlocks.BuildingBlockCollection.Item(System.Int32)
-        //ExFor:BuildingBlocks.BuildingBlockCollection.ToArray
-        //ExFor:BuildingBlocks.BuildingBlockGallery
+        //ExFor:GlossaryDocument
+        //ExFor:GlossaryDocument.Accept(DocumentVisitor)
+        //ExFor:GlossaryDocument.BuildingBlocks
+        //ExFor:GlossaryDocument.FirstBuildingBlock
+        //ExFor:GlossaryDocument.GetBuildingBlock(BuildingBlockGallery,String,String)
+        //ExFor:GlossaryDocument.LastBuildingBlock
+        //ExFor:BuildingBlockCollection
+        //ExFor:BuildingBlockCollection.Item(Int32)
+        //ExFor:BuildingBlockCollection.ToArray
+        //ExFor:BuildingBlockGallery
         //ExFor:DocumentVisitor.VisitBuildingBlockEnd(BuildingBlock)
         //ExFor:DocumentVisitor.VisitBuildingBlockStart(BuildingBlock)
         //ExFor:DocumentVisitor.VisitGlossaryDocumentEnd(GlossaryDocument)
diff --git a/Examples/ApiExamples/ApiExamples/ExCharts.cs b/Examples/ApiExamples/ApiExamples/ExCharts.cs
index 42d2fceb..f1e8000d 100644
--- a/Examples/ApiExamples/ApiExamples/ExCharts.cs
+++ b/Examples/ApiExamples/ApiExamples/ExCharts.cs
@@ -5,7 +5,6 @@
 // "as is", without warranty of any kind, either expressed or implied.
 //////////////////////////////////////////////////////////////////////////
 
-using Aspose;
 using Aspose.Words;
 using Aspose.Words.Drawing;
 using Aspose.Words.Drawing.Charts;
@@ -127,8 +126,8 @@ public void AxisProperties()
             //ExFor:AxisTickLabels.Position
             //ExFor:AxisTickLabels.IsAutoSpacing
             //ExFor:ChartAxis.TickMarkSpacing
-            //ExFor:Charts.AxisCategoryType
-            //ExFor:Charts.AxisCrosses
+            //ExFor:AxisCategoryType
+            //ExFor:AxisCrosses
             //ExFor:Chart.AxisX
             //ExFor:Chart.AxisY
             //ExFor:Chart.AxisZ
@@ -237,10 +236,10 @@ public void DateTimeValues()
             //ExFor:AxisScaling.Minimum
             //ExFor:AxisScaling.Maximum
             //ExFor:ChartAxis.Scaling
-            //ExFor:Charts.AxisTickMark
-            //ExFor:Charts.AxisTickLabelPosition
-            //ExFor:Charts.AxisTimeUnit
-            //ExFor:Charts.ChartAxis.BaseTimeUnit
+            //ExFor:AxisTickMark
+            //ExFor:AxisTickLabelPosition
+            //ExFor:AxisTimeUnit
+            //ExFor:ChartAxis.BaseTimeUnit
             //ExFor:ChartAxis.HasMajorGridlines
             //ExFor:ChartAxis.HasMinorGridlines
             //ExSummary:Shows how to insert chart with date/time values.
@@ -353,9 +352,9 @@ public void SetNumberFormatToChartAxis()
         {
             //ExStart
             //ExFor:ChartAxis.NumberFormat
-            //ExFor:Charts.ChartNumberFormat
+            //ExFor:ChartNumberFormat
             //ExFor:ChartNumberFormat.FormatCode
-            //ExFor:Charts.ChartNumberFormat.IsLinkedToSource
+            //ExFor:ChartNumberFormat.IsLinkedToSource
             //ExSummary:Shows how to set formatting for chart values.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -626,7 +625,7 @@ private static void ApplyDataLabels(ChartSeries series, int labelsCount, string
         //ExFor:ChartDataPointCollection.ClearFormat
         //ExFor:ChartDataPointCollection.Count
         //ExFor:ChartDataPointCollection.GetEnumerator
-        //ExFor:ChartDataPointCollection.Item(System.Int32)
+        //ExFor:ChartDataPointCollection.Item(Int32)
         //ExFor:ChartMarker
         //ExFor:ChartMarker.Size
         //ExFor:ChartMarker.Symbol
@@ -694,7 +693,7 @@ private static void ApplyDataPoints(ChartSeries series, int dataPointsCount, Mar
         public void PieChartExplosion()
         {
             //ExStart
-            //ExFor:Charts.IChartDataPoint.Explosion
+            //ExFor:IChartDataPoint.Explosion
             //ExSummary:Shows how to move the slices of a pie chart away from the center.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -729,9 +728,9 @@ public void PieChartExplosion()
         public void Bubble3D()
         {
             //ExStart
-            //ExFor:Charts.ChartDataLabel.ShowBubbleSize
-            //ExFor:Charts.ChartDataLabel.Font
-            //ExFor:Charts.IChartDataPoint.Bubble3D
+            //ExFor:ChartDataLabel.ShowBubbleSize
+            //ExFor:ChartDataLabel.Font
+            //ExFor:IChartDataPoint.Bubble3D
             //ExSummary:Shows how to use 3D effects with bubble charts.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
diff --git a/Examples/ApiExamples/ApiExamples/ExChmLoadOptions.cs b/Examples/ApiExamples/ApiExamples/ExChmLoadOptions.cs
index 58f02877..8d53dd7a 100644
--- a/Examples/ApiExamples/ApiExamples/ExChmLoadOptions.cs
+++ b/Examples/ApiExamples/ApiExamples/ExChmLoadOptions.cs
@@ -27,7 +27,7 @@ public void OriginalFileName()
 
             Document doc = new Document(new MemoryStream(File.ReadAllBytes(MyDir + "Document with ms-its links.chm")),
                 loadOptions);
-            
+
             doc.Save(ArtifactsDir + "ExChmLoadOptions.OriginalFileName.html");
             //ExEnd
         }
diff --git a/Examples/ApiExamples/ApiExamples/ExDocument.cs b/Examples/ApiExamples/ApiExamples/ExDocument.cs
index 8bf65975..de9d2abc 100644
--- a/Examples/ApiExamples/ApiExamples/ExDocument.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDocument.cs
@@ -1630,7 +1630,7 @@ public void UpdateThumbnail()
 
             // 2 -  Use the first image found in the document:
             ThumbnailGeneratingOptions options = new ThumbnailGeneratingOptions();
-            Assert.AreEqual(new Size(600, 900), options.ThumbnailSize); //ExSKip
+            Assert.AreEqual(new Size(600, 900), options.ThumbnailSize); //ExSkip
             Assert.True(options.GenerateFromFirstPage); //ExSkip
             options.ThumbnailSize = new Size(400, 400);
             options.GenerateFromFirstPage = false;
@@ -1715,7 +1715,7 @@ public void OoxmlComplianceVersion()
         public void ImageSaveOptions()
         {
             //ExStart
-            //ExFor:Document.Save(String, Saving.SaveOptions)
+            //ExFor:Document.Save(String, SaveOptions)
             //ExFor:SaveOptions.UseAntiAliasing
             //ExFor:SaveOptions.UseHighQualityRendering
             //ExSummary:Shows how to improve the quality of a rendered document with SaveOptions.
@@ -1939,7 +1939,7 @@ public void LayoutOptionsHiddenText(bool showHiddenText)
             //ExStart
             //ExFor:Document.LayoutOptions
             //ExFor:LayoutOptions
-            //ExFor:Layout.LayoutOptions.ShowHiddenText
+            //ExFor:LayoutOptions.ShowHiddenText
             //ExSummary:Shows how to hide text in a rendered output document.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -1978,7 +1978,7 @@ public void LayoutOptionsParagraphMarks(bool showParagraphMarks)
             //ExStart
             //ExFor:Document.LayoutOptions
             //ExFor:LayoutOptions
-            //ExFor:Layout.LayoutOptions.ShowParagraphMarks
+            //ExFor:LayoutOptions.ShowParagraphMarks
             //ExSummary:Shows how to show paragraph marks in a rendered output document.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -2359,8 +2359,8 @@ public void ReadMacrosFromExistingDocument()
             //ExFor:Document.VbaProject
             //ExFor:VbaModuleCollection
             //ExFor:VbaModuleCollection.Count
-            //ExFor:VbaModuleCollection.Item(System.Int32)
-            //ExFor:VbaModuleCollection.Item(System.String)
+            //ExFor:VbaModuleCollection.Item(Int32)
+            //ExFor:VbaModuleCollection.Item(String)
             //ExFor:VbaModuleCollection.Remove
             //ExFor:VbaModule
             //ExFor:VbaModule.Name
diff --git a/Examples/ApiExamples/ApiExamples/ExDocumentBase.cs b/Examples/ApiExamples/ApiExamples/ExDocumentBase.cs
index 59ab275c..663bce3b 100644
--- a/Examples/ApiExamples/ApiExamples/ExDocumentBase.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDocumentBase.cs
@@ -102,7 +102,7 @@ public void ImportNode()
         public void ImportNodeCustom()
         {
             //ExStart
-            //ExFor:DocumentBase.ImportNode(Node, System.Boolean, ImportFormatMode)
+            //ExFor:DocumentBase.ImportNode(Node, Boolean, ImportFormatMode)
             //ExSummary:Shows how to import node from source document to destination document with specific options.
             // Create two documents and add a character style to each document.
             // Configure the styles to have the same name, but different text formatting.
diff --git a/Examples/ApiExamples/ApiExamples/ExDocumentBuilder.cs b/Examples/ApiExamples/ApiExamples/ExDocumentBuilder.cs
index a663df36..3242de94 100644
--- a/Examples/ApiExamples/ApiExamples/ExDocumentBuilder.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDocumentBuilder.cs
@@ -1119,7 +1119,7 @@ public void InsertCellsWithPreferredWidths()
             //ExFor:PreferredWidth
             //ExFor:PreferredWidth.Auto
             //ExFor:PreferredWidth.Equals(PreferredWidth)
-            //ExFor:PreferredWidth.Equals(System.Object)
+            //ExFor:PreferredWidth.Equals(Object)
             //ExFor:PreferredWidth.FromPoints
             //ExFor:PreferredWidth.FromPercent
             //ExFor:PreferredWidth.GetHashCode
diff --git a/Examples/ApiExamples/ApiExamples/ExDocumentProperties.cs b/Examples/ApiExamples/ApiExamples/ExDocumentProperties.cs
index 593ac605..d4159a2a 100644
--- a/Examples/ApiExamples/ApiExamples/ExDocumentProperties.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDocumentProperties.cs
@@ -424,8 +424,8 @@ public void HyperlinkBase()
         public void HeadingPairs()
         {
             //ExStart
-            //ExFor:Properties.BuiltInDocumentProperties.HeadingPairs
-            //ExFor:Properties.BuiltInDocumentProperties.TitlesOfParts
+            //ExFor:BuiltInDocumentProperties.HeadingPairs
+            //ExFor:BuiltInDocumentProperties.TitlesOfParts
             //ExSummary:Shows the relationship between "HeadingPairs" and "TitlesOfParts" properties.
             Document doc = new Document(MyDir + "Heading pairs and titles of parts.docx");
 
@@ -477,8 +477,8 @@ public void HeadingPairs()
         public void Security()
         {
             //ExStart
-            //ExFor:Properties.BuiltInDocumentProperties.Security
-            //ExFor:Properties.DocumentSecurity
+            //ExFor:BuiltInDocumentProperties.Security
+            //ExFor:DocumentSecurity
             //ExSummary:Shows how to use document properties to display the security level of a document.
             Document doc = new Document();
 
@@ -583,13 +583,13 @@ public void DocumentPropertyCollection()
             //ExFor:CustomDocumentProperties.Add(String,DateTime)
             //ExFor:CustomDocumentProperties.Add(String,Double)
             //ExFor:DocumentProperty.Type
-            //ExFor:Properties.DocumentPropertyCollection
-            //ExFor:Properties.DocumentPropertyCollection.Clear
-            //ExFor:Properties.DocumentPropertyCollection.Contains(System.String)
-            //ExFor:Properties.DocumentPropertyCollection.GetEnumerator
-            //ExFor:Properties.DocumentPropertyCollection.IndexOf(System.String)
-            //ExFor:Properties.DocumentPropertyCollection.RemoveAt(System.Int32)
-            //ExFor:Properties.DocumentPropertyCollection.Remove
+            //ExFor:DocumentPropertyCollection
+            //ExFor:DocumentPropertyCollection.Clear
+            //ExFor:DocumentPropertyCollection.Contains(String)
+            //ExFor:DocumentPropertyCollection.GetEnumerator
+            //ExFor:DocumentPropertyCollection.IndexOf(String)
+            //ExFor:DocumentPropertyCollection.RemoveAt(Int32)
+            //ExFor:DocumentPropertyCollection.Remove
             //ExFor:PropertyType
             //ExSummary:Shows how to work with a document's custom properties.
             Document doc = new Document();
diff --git a/Examples/ApiExamples/ApiExamples/ExDocumentVisitor.cs b/Examples/ApiExamples/ApiExamples/ExDocumentVisitor.cs
index 5bd6240b..e49fa71d 100644
--- a/Examples/ApiExamples/ApiExamples/ExDocumentVisitor.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDocumentVisitor.cs
@@ -219,12 +219,12 @@ private static void TestDocStructureToText(DocStructurePrinter visitor)
         //ExFor:Cell.Accept(DocumentVisitor)
         //ExFor:Cell.IsFirstCell
         //ExFor:Cell.IsLastCell
-        //ExFor:DocumentVisitor.VisitTableEnd(Tables.Table)
-        //ExFor:DocumentVisitor.VisitTableStart(Tables.Table)
-        //ExFor:DocumentVisitor.VisitRowEnd(Tables.Row)
-        //ExFor:DocumentVisitor.VisitRowStart(Tables.Row)
-        //ExFor:DocumentVisitor.VisitCellStart(Tables.Cell)
-        //ExFor:DocumentVisitor.VisitCellEnd(Tables.Cell)
+        //ExFor:DocumentVisitor.VisitTableEnd(Table)
+        //ExFor:DocumentVisitor.VisitTableStart(Table)
+        //ExFor:DocumentVisitor.VisitRowEnd(Row)
+        //ExFor:DocumentVisitor.VisitRowStart(Row)
+        //ExFor:DocumentVisitor.VisitCellStart(Cell)
+        //ExFor:DocumentVisitor.VisitCellEnd(Cell)
         //ExFor:Row.Accept(DocumentVisitor)
         //ExFor:Row.FirstCell
         //ExFor:Row.GetText
@@ -955,11 +955,11 @@ private static void TestFootnoteToText(FootnoteStructurePrinter visitor)
         }
         
         //ExStart
-        //ExFor:DocumentVisitor.VisitOfficeMathEnd(Math.OfficeMath)
-        //ExFor:DocumentVisitor.VisitOfficeMathStart(Math.OfficeMath)
-        //ExFor:Math.MathObjectType
-        //ExFor:Math.OfficeMath.Accept(DocumentVisitor)
-        //ExFor:Math.OfficeMath.MathObjectType
+        //ExFor:DocumentVisitor.VisitOfficeMathEnd(OfficeMath)
+        //ExFor:DocumentVisitor.VisitOfficeMathStart(OfficeMath)
+        //ExFor:MathObjectType
+        //ExFor:OfficeMath.Accept(DocumentVisitor)
+        //ExFor:OfficeMath.MathObjectType
         //ExSummary:Shows how to print the node structure of every office math node in a document.
         [Test] //ExSkip
         public void OfficeMathToText()
@@ -1064,8 +1064,8 @@ private static void TestOfficeMathToText(OfficeMathStructurePrinter visitor)
         }
 
         //ExStart
-        //ExFor:DocumentVisitor.VisitSmartTagEnd(Markup.SmartTag)
-        //ExFor:DocumentVisitor.VisitSmartTagStart(Markup.SmartTag)
+        //ExFor:DocumentVisitor.VisitSmartTagEnd(SmartTag)
+        //ExFor:DocumentVisitor.VisitSmartTagStart(SmartTag)
         //ExSummary:Shows how to print the node structure of every smart tag in a document.
         [Test] //ExSkip
         public void SmartTagToText()
@@ -1171,8 +1171,8 @@ private static void TestSmartTagToText(SmartTagStructurePrinter visitor)
 
         //ExStart
         //ExFor:StructuredDocumentTag.Accept(DocumentVisitor)
-        //ExFor:DocumentVisitor.VisitStructuredDocumentTagEnd(Markup.StructuredDocumentTag)
-        //ExFor:DocumentVisitor.VisitStructuredDocumentTagStart(Markup.StructuredDocumentTag)
+        //ExFor:DocumentVisitor.VisitStructuredDocumentTagEnd(StructuredDocumentTag)
+        //ExFor:DocumentVisitor.VisitStructuredDocumentTagStart(StructuredDocumentTag)
         //ExSummary:Shows how to print the node structure of every structured document tag in a document.
         [Test] //ExSkip
         public void StructuredDocumentTagToText()
diff --git a/Examples/ApiExamples/ApiExamples/ExDrawing.cs b/Examples/ApiExamples/ApiExamples/ExDrawing.cs
index e20e8bc7..0dc565f4 100644
--- a/Examples/ApiExamples/ApiExamples/ExDrawing.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDrawing.cs
@@ -29,15 +29,15 @@ public class ExDrawing : ApiExampleBase
         public void VariousShapes()
         {
             //ExStart
-            //ExFor:Drawing.ArrowLength
-            //ExFor:Drawing.ArrowType
-            //ExFor:Drawing.ArrowWidth
-            //ExFor:Drawing.DashStyle
-            //ExFor:Drawing.EndCap
-            //ExFor:Drawing.Fill.ForeColor
-            //ExFor:Drawing.Fill.ImageBytes
-            //ExFor:Drawing.Fill.Visible
-            //ExFor:Drawing.JoinStyle
+            //ExFor:ArrowLength
+            //ExFor:ArrowType
+            //ExFor:ArrowWidth
+            //ExFor:DashStyle
+            //ExFor:EndCap
+            //ExFor:Fill.ForeColor
+            //ExFor:Fill.ImageBytes
+            //ExFor:Fill.Visible
+            //ExFor:JoinStyle
             //ExFor:Shape.Stroke
             //ExFor:Stroke.Color
             //ExFor:Stroke.StartArrowLength
@@ -223,7 +223,7 @@ public void ImportImage()
         public void TypeOfImage()
         {
             //ExStart
-            //ExFor:Drawing.ImageType
+            //ExFor:ImageType
             //ExSummary:Shows how to add an image to a shape and check its type.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -337,9 +337,9 @@ public void StrokePattern()
         //ExFor:DocumentVisitor.VisitShapeStart(Shape)
         //ExFor:DocumentVisitor.VisitGroupShapeEnd(GroupShape)
         //ExFor:DocumentVisitor.VisitGroupShapeStart(GroupShape)
-        //ExFor:Drawing.GroupShape
-        //ExFor:Drawing.GroupShape.#ctor(DocumentBase)
-        //ExFor:Drawing.GroupShape.Accept(DocumentVisitor)
+        //ExFor:GroupShape
+        //ExFor:GroupShape.#ctor(DocumentBase)
+        //ExFor:GroupShape.Accept(DocumentVisitor)
         //ExFor:ShapeBase.IsGroup
         //ExFor:ShapeBase.ShapeType
         //ExSummary:Shows how to create a group of shapes, and print its contents using a document visitor.
@@ -454,7 +454,7 @@ private static void TestGroupShapes(Document doc)
         public void TextBox()
         {
             //ExStart
-            //ExFor:Drawing.LayoutFlow
+            //ExFor:LayoutFlow
             //ExSummary:Shows how to add text to a text box, and change its orientation
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
diff --git a/Examples/ApiExamples/ApiExamples/ExField.cs b/Examples/ApiExamples/ApiExamples/ExField.cs
index 1cc63805..b70fa643 100644
--- a/Examples/ApiExamples/ApiExamples/ExField.cs
+++ b/Examples/ApiExamples/ApiExamples/ExField.cs
@@ -816,11 +816,11 @@ private static void RemoveSequence(Node start, Node end)
         }
         
         //ExStart
-        //ExFor:Fields.FieldAsk
-        //ExFor:Fields.FieldAsk.BookmarkName
-        //ExFor:Fields.FieldAsk.DefaultResponse
-        //ExFor:Fields.FieldAsk.PromptOnceOnMailMerge
-        //ExFor:Fields.FieldAsk.PromptText
+        //ExFor:FieldAsk
+        //ExFor:FieldAsk.BookmarkName
+        //ExFor:FieldAsk.DefaultResponse
+        //ExFor:FieldAsk.PromptOnceOnMailMerge
+        //ExFor:FieldAsk.PromptText
         //ExFor:FieldOptions.UserPromptRespondent
         //ExFor:IFieldUserPromptRespondent
         //ExFor:IFieldUserPromptRespondent.Respond(String,String)
@@ -906,13 +906,13 @@ private void TestFieldAsk(DataTable dataTable, Document doc)
         public void FieldAdvance()
         {
             //ExStart
-            //ExFor:Fields.FieldAdvance
-            //ExFor:Fields.FieldAdvance.DownOffset
-            //ExFor:Fields.FieldAdvance.HorizontalPosition
-            //ExFor:Fields.FieldAdvance.LeftOffset
-            //ExFor:Fields.FieldAdvance.RightOffset
-            //ExFor:Fields.FieldAdvance.UpOffset
-            //ExFor:Fields.FieldAdvance.VerticalPosition
+            //ExFor:FieldAdvance
+            //ExFor:FieldAdvance.DownOffset
+            //ExFor:FieldAdvance.HorizontalPosition
+            //ExFor:FieldAdvance.LeftOffset
+            //ExFor:FieldAdvance.RightOffset
+            //ExFor:FieldAdvance.UpOffset
+            //ExFor:FieldAdvance.VerticalPosition
             //ExSummary:Shows how to insert an ADVANCE field, and edit its properties. 
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -978,11 +978,11 @@ public void FieldAdvance()
         public void FieldAddressBlock()
         {
             //ExStart
-            //ExFor:Fields.FieldAddressBlock.ExcludedCountryOrRegionName
-            //ExFor:Fields.FieldAddressBlock.FormatAddressOnCountryOrRegion
-            //ExFor:Fields.FieldAddressBlock.IncludeCountryOrRegionName
-            //ExFor:Fields.FieldAddressBlock.LanguageId
-            //ExFor:Fields.FieldAddressBlock.NameAndAddressFormat
+            //ExFor:FieldAddressBlock.ExcludedCountryOrRegionName
+            //ExFor:FieldAddressBlock.FormatAddressOnCountryOrRegion
+            //ExFor:FieldAddressBlock.IncludeCountryOrRegionName
+            //ExFor:FieldAddressBlock.LanguageId
+            //ExFor:FieldAddressBlock.NameAndAddressFormat
             //ExSummary:Shows how to insert an ADDRESSBLOCK field.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -1483,7 +1483,7 @@ public void FieldAutoNumOut()
         public void FieldAutoText()
         {
             //ExStart
-            //ExFor:Fields.FieldAutoText
+            //ExFor:FieldAutoText
             //ExFor:FieldAutoText.EntryName
             //ExFor:FieldOptions.BuiltInTemplatesPaths
             //ExFor:FieldGlossary
@@ -1547,10 +1547,10 @@ public void FieldAutoText()
         }
 
         //ExStart
-        //ExFor:Fields.FieldAutoTextList
-        //ExFor:Fields.FieldAutoTextList.EntryName
-        //ExFor:Fields.FieldAutoTextList.ListStyle
-        //ExFor:Fields.FieldAutoTextList.ScreenTip
+        //ExFor:FieldAutoTextList
+        //ExFor:FieldAutoTextList.EntryName
+        //ExFor:FieldAutoTextList.ListStyle
+        //ExFor:FieldAutoTextList.ScreenTip
         //ExSummary:Shows how to use an AUTOTEXTLIST field to select from a list of AutoText entries.
         [Test] //ExSkip
         public void FieldAutoTextList()
@@ -5018,7 +5018,7 @@ public void FieldAuthor()
         {
             //ExStart
             //ExFor:FieldAuthor
-            //ExFor:FieldAuthor.AuthorName  
+            //ExFor:FieldAuthor.AuthorName
             //ExFor:FieldOptions.DefaultDocumentAuthor
             //ExSummary:Shows how to use an AUTHOR field to display a document creator's name.
             Document doc = new Document();
@@ -5357,7 +5357,7 @@ public void FieldFillIn()
 
             doc.UpdateFields();
             doc.Save(ArtifactsDir + "Field.FILLIN.docx");
-            TestFieldFillIn(new Document(ArtifactsDir + "Field.FILLIN.docx")); //ExSKip
+            TestFieldFillIn(new Document(ArtifactsDir + "Field.FILLIN.docx")); //ExSkip
         }
 
         /// <summary>
@@ -5771,7 +5771,7 @@ public void FieldNext()
             // Our data source has 3 rows, and we skipped rows twice. 
             // Our output document will have 1 page with data from all 3 rows.
             doc.Save(ArtifactsDir + "Field.NEXT.NEXTIF.docx");
-            TestFieldNext(doc); //ExSKip
+            TestFieldNext(doc); //ExSkip
         }
 
         /// <summary>
@@ -6643,7 +6643,7 @@ public void FieldTOA()
 
             doc.UpdateFields();
             doc.Save(ArtifactsDir + "Field.TOA.TA.docx");
-            TestFieldTOA(new Document(ArtifactsDir + "Field.TOA.TA.docx")); //ExSKip
+            TestFieldTOA(new Document(ArtifactsDir + "Field.TOA.TA.docx")); //ExSkip
         }
 
         private static FieldTA InsertToaEntry(DocumentBuilder builder, string entryCategory, string longCitation)
diff --git a/Examples/ApiExamples/ApiExamples/ExFieldOptions.cs b/Examples/ApiExamples/ApiExamples/ExFieldOptions.cs
index 5ed768c3..42b8d3a4 100644
--- a/Examples/ApiExamples/ApiExamples/ExFieldOptions.cs
+++ b/Examples/ApiExamples/ApiExamples/ExFieldOptions.cs
@@ -416,7 +416,7 @@ public void BarcodeGenerator()
             Assert.IsNull(doc.FieldOptions.BarcodeGenerator); //ExSkip
 
             // We can use a custom IBarcodeGenerator implementation to generate barcodes,
-            // and then insert them into the document as images.            
+            // and then insert them into the document as images.
             doc.FieldOptions.BarcodeGenerator = new CustomBarcodeGenerator();
 
             // Below are four examples of different barcode types that we can create using our generator.
diff --git a/Examples/ApiExamples/ApiExamples/ExFont.cs b/Examples/ApiExamples/ApiExamples/ExFont.cs
index 14a74aa4..6c4b0b68 100644
--- a/Examples/ApiExamples/ApiExamples/ExFont.cs
+++ b/Examples/ApiExamples/ApiExamples/ExFont.cs
@@ -994,7 +994,7 @@ public void Style()
         public void GetAvailableFonts()
         {
             //ExStart
-            //ExFor:Fonts.PhysicalFontInfo
+            //ExFor:PhysicalFontInfo
             //ExFor:FontSourceBase.GetAvailableFonts
             //ExFor:PhysicalFontInfo.FontFamilyName
             //ExFor:PhysicalFontInfo.FullFontName
@@ -1324,8 +1324,8 @@ private void TestRemoveHiddenContent(Document doc)
         public void DefaultFonts()
         {
             //ExStart
-            //ExFor:Fonts.FontInfoCollection.Contains(String)
-            //ExFor:Fonts.FontInfoCollection.Count
+            //ExFor:FontInfoCollection.Contains(String)
+            //ExFor:FontInfoCollection.Count
             //ExSummary:Shows info about the fonts that are present in the blank document.
             Document doc = new Document();
 
@@ -1345,12 +1345,12 @@ public void DefaultFonts()
         public void ExtractEmbeddedFont()
         {
             //ExStart
-            //ExFor:Fonts.EmbeddedFontFormat
-            //ExFor:Fonts.EmbeddedFontStyle
-            //ExFor:Fonts.FontInfo.GetEmbeddedFont(EmbeddedFontFormat,EmbeddedFontStyle)
-            //ExFor:Fonts.FontInfo.GetEmbeddedFontAsOpenType(EmbeddedFontStyle)
-            //ExFor:Fonts.FontInfoCollection.Item(Int32)
-            //ExFor:Fonts.FontInfoCollection.Item(String)
+            //ExFor:EmbeddedFontFormat
+            //ExFor:EmbeddedFontStyle
+            //ExFor:FontInfo.GetEmbeddedFont(EmbeddedFontFormat,EmbeddedFontStyle)
+            //ExFor:FontInfo.GetEmbeddedFontAsOpenType(EmbeddedFontStyle)
+            //ExFor:FontInfoCollection.Item(Int32)
+            //ExFor:FontInfoCollection.Item(String)
             //ExSummary:Shows how to extract an embedded font from a document, and save it to the local file system.
             Document doc = new Document(MyDir + "Embedded font.docx");
 
@@ -1378,14 +1378,14 @@ public void ExtractEmbeddedFont()
         public void GetFontInfoFromFile()
         {
             //ExStart
-            //ExFor:Fonts.FontFamily
-            //ExFor:Fonts.FontPitch
-            //ExFor:Fonts.FontInfo.AltName
-            //ExFor:Fonts.FontInfo.Charset
-            //ExFor:Fonts.FontInfo.Family
-            //ExFor:Fonts.FontInfo.Panose
-            //ExFor:Fonts.FontInfo.Pitch
-            //ExFor:Fonts.FontInfoCollection.GetEnumerator
+            //ExFor:FontFamily
+            //ExFor:FontPitch
+            //ExFor:FontInfo.AltName
+            //ExFor:FontInfo.Charset
+            //ExFor:FontInfo.Family
+            //ExFor:FontInfo.Panose
+            //ExFor:FontInfo.Pitch
+            //ExFor:FontInfoCollection.GetEnumerator
             //ExSummary:Shows how to access and print details of each font in a document.
             Document doc = new Document(MyDir + "Document.docx");
 
diff --git a/Examples/ApiExamples/ApiExamples/ExFontSettings.cs b/Examples/ApiExamples/ApiExamples/ExFontSettings.cs
index c671d3f5..885b64ba 100644
--- a/Examples/ApiExamples/ApiExamples/ExFontSettings.cs
+++ b/Examples/ApiExamples/ApiExamples/ExFontSettings.cs
@@ -25,7 +25,7 @@ public class ExFontSettings : ApiExampleBase
         public void DefaultFontInstance()
         {
             //ExStart
-            //ExFor:Fonts.FontSettings.DefaultInstance
+            //ExFor:FontSettings.DefaultInstance
             //ExSummary:Shows how to configure the default font settings instance.
             // Configure the default font settings instance to use the "Courier New" font
             // as a backup substitute when we attempt to use an unknown font.
@@ -139,7 +139,7 @@ public void Warning(WarningInfo info)
         //ExStart
         //ExFor:IWarningCallback
         //ExFor:DocumentBase.WarningCallback
-        //ExFor:Fonts.FontSettings.DefaultInstance
+        //ExFor:FontSettings.DefaultInstance
         //ExSummary:Shows how to use the IWarningCallback interface to monitor font substitution warnings.
         [Test] //ExSkip
         public void SubstitutionWarning()
@@ -223,8 +223,8 @@ public void Warning(WarningInfo info)
         //ExEnd
 
         //ExStart
-        //ExFor:Fonts.FontInfoSubstitutionRule
-        //ExFor:Fonts.FontSubstitutionSettings.FontInfoSubstitution
+        //ExFor:FontInfoSubstitutionRule
+        //ExFor:FontSubstitutionSettings.FontInfoSubstitution
         //ExFor:LayoutOptions.KeepOriginalFontMetrics
         //ExFor:IWarningCallback
         //ExFor:IWarningCallback.Warning(WarningInfo)
@@ -389,15 +389,15 @@ public void GetSubstitutionWithoutSuffixes()
         public void FontSourceFile()
         {
             //ExStart
-            //ExFor:Fonts.FileFontSource
-            //ExFor:Fonts.FileFontSource.#ctor(String)
-            //ExFor:Fonts.FileFontSource.#ctor(String, Int32)
-            //ExFor:Fonts.FileFontSource.FilePath
-            //ExFor:Fonts.FileFontSource.Type
-            //ExFor:Fonts.FontSourceBase
-            //ExFor:Fonts.FontSourceBase.Priority
-            //ExFor:Fonts.FontSourceBase.Type
-            //ExFor:Fonts.FontSourceType
+            //ExFor:FileFontSource
+            //ExFor:FileFontSource.#ctor(String)
+            //ExFor:FileFontSource.#ctor(String, Int32)
+            //ExFor:FileFontSource.FilePath
+            //ExFor:FileFontSource.Type
+            //ExFor:FontSourceBase
+            //ExFor:FontSourceBase.Priority
+            //ExFor:FontSourceBase.Type
+            //ExFor:FontSourceType
             //ExSummary:Shows how to use a font file in the local file system as a font source.
             FileFontSource fileFontSource = new FileFontSource(MyDir + "Alte DIN 1451 Mittelschrift.ttf", 0);
 
@@ -415,12 +415,12 @@ public void FontSourceFile()
         public void FontSourceFolder()
         {
             //ExStart
-            //ExFor:Fonts.FolderFontSource
-            //ExFor:Fonts.FolderFontSource.#ctor(String, Boolean)
-            //ExFor:Fonts.FolderFontSource.#ctor(String, Boolean, Int32)
-            //ExFor:Fonts.FolderFontSource.FolderPath
-            //ExFor:Fonts.FolderFontSource.ScanSubfolders
-            //ExFor:Fonts.FolderFontSource.Type
+            //ExFor:FolderFontSource
+            //ExFor:FolderFontSource.#ctor(String, Boolean)
+            //ExFor:FolderFontSource.#ctor(String, Boolean, Int32)
+            //ExFor:FolderFontSource.FolderPath
+            //ExFor:FolderFontSource.ScanSubfolders
+            //ExFor:FolderFontSource.Type
             //ExSummary:Shows how to use a local system folder which contains fonts as a font source.
 
             // Create a font source from a folder that contains font files.
@@ -713,11 +713,11 @@ public void AddFontSubstitutes()
         public void FontSourceMemory()
         {
             //ExStart
-            //ExFor:Fonts.MemoryFontSource
-            //ExFor:Fonts.MemoryFontSource.#ctor(Byte[])
-            //ExFor:Fonts.MemoryFontSource.#ctor(Byte[], Int32)
-            //ExFor:Fonts.MemoryFontSource.FontData
-            //ExFor:Fonts.MemoryFontSource.Type
+            //ExFor:MemoryFontSource
+            //ExFor:MemoryFontSource.#ctor(Byte[])
+            //ExFor:MemoryFontSource.#ctor(Byte[], Int32)
+            //ExFor:MemoryFontSource.FontData
+            //ExFor:MemoryFontSource.Type
             //ExSummary:Shows how to use a byte array with data from a font file as a font source.
 
             byte[] fontBytes = File.ReadAllBytes(MyDir + "Alte DIN 1451 Mittelschrift.ttf");
@@ -739,14 +739,14 @@ public void FontSourceSystem()
             //ExFor:TableSubstitutionRule.AddSubstitutes(String, String[])
             //ExFor:FontSubstitutionRule.Enabled
             //ExFor:TableSubstitutionRule.GetSubstitutes(String)
-            //ExFor:Fonts.FontSettings.ResetFontSources
-            //ExFor:Fonts.FontSettings.SubstitutionSettings
-            //ExFor:Fonts.FontSubstitutionSettings
-            //ExFor:Fonts.SystemFontSource
-            //ExFor:Fonts.SystemFontSource.#ctor
-            //ExFor:Fonts.SystemFontSource.#ctor(Int32)
-            //ExFor:Fonts.SystemFontSource.GetSystemFontFolders
-            //ExFor:Fonts.SystemFontSource.Type
+            //ExFor:FontSettings.ResetFontSources
+            //ExFor:FontSettings.SubstitutionSettings
+            //ExFor:FontSubstitutionSettings
+            //ExFor:SystemFontSource
+            //ExFor:SystemFontSource.#ctor
+            //ExFor:SystemFontSource.#ctor(Int32)
+            //ExFor:SystemFontSource.GetSystemFontFolders
+            //ExFor:SystemFontSource.Type
             //ExSummary:Shows how to access a document's system font source and set font substitutes.
             Document doc = new Document();
             doc.FontSettings = new FontSettings();
@@ -902,9 +902,9 @@ public void LoadNotoFontsFallbackSettings()
         public void DefaultFontSubstitutionRule()
         {
             //ExStart
-            //ExFor:Fonts.DefaultFontSubstitutionRule
-            //ExFor:Fonts.DefaultFontSubstitutionRule.DefaultFontName
-            //ExFor:Fonts.FontSubstitutionSettings.DefaultFontSubstitution
+            //ExFor:DefaultFontSubstitutionRule
+            //ExFor:DefaultFontSubstitutionRule.DefaultFontName
+            //ExFor:FontSubstitutionSettings.DefaultFontSubstitution
             //ExSummary:Shows how to set the default font substitution rule.
             Document doc = new Document();
             FontSettings fontSettings = new FontSettings();
@@ -937,13 +937,13 @@ public void DefaultFontSubstitutionRule()
         public void FontConfigSubstitution()
         {
             //ExStart
-            //ExFor:Fonts.FontConfigSubstitutionRule
-            //ExFor:Fonts.FontConfigSubstitutionRule.Enabled
-            //ExFor:Fonts.FontConfigSubstitutionRule.IsFontConfigAvailable
-            //ExFor:Fonts.FontConfigSubstitutionRule.ResetCache
-            //ExFor:Fonts.FontSubstitutionRule
-            //ExFor:Fonts.FontSubstitutionRule.Enabled
-            //ExFor:Fonts.FontSubstitutionSettings.FontConfigSubstitution
+            //ExFor:FontConfigSubstitutionRule
+            //ExFor:FontConfigSubstitutionRule.Enabled
+            //ExFor:FontConfigSubstitutionRule.IsFontConfigAvailable
+            //ExFor:FontConfigSubstitutionRule.ResetCache
+            //ExFor:FontSubstitutionRule
+            //ExFor:FontSubstitutionRule.Enabled
+            //ExFor:FontSubstitutionSettings.FontConfigSubstitution
             //ExSummary:Shows operating system-dependent font config substitution.
             FontSettings fontSettings = new FontSettings();
             FontConfigSubstitutionRule fontConfigSubstitution =
@@ -979,8 +979,8 @@ public void FontConfigSubstitution()
         public void FallbackSettings()
         {
             //ExStart
-            //ExFor:Fonts.FontFallbackSettings.LoadMsOfficeFallbackSettings
-            //ExFor:Fonts.FontFallbackSettings.LoadNotoFallbackSettings
+            //ExFor:FontFallbackSettings.LoadMsOfficeFallbackSettings
+            //ExFor:FontFallbackSettings.LoadNotoFallbackSettings
             //ExSummary:Shows how to load pre-defined fallback font settings.
             Document doc = new Document();
 
@@ -1020,9 +1020,9 @@ public void FallbackSettings()
         public void FallbackSettingsCustom()
         {
             //ExStart
-            //ExFor:Fonts.FontSettings.FallbackSettings
-            //ExFor:Fonts.FontFallbackSettings
-            //ExFor:Fonts.FontFallbackSettings.BuildAutomatic
+            //ExFor:FontSettings.FallbackSettings
+            //ExFor:FontFallbackSettings
+            //ExFor:FontFallbackSettings.BuildAutomatic
             //ExSummary:Shows how to distribute fallback fonts across Unicode character code ranges.
             Document doc = new Document();
 
@@ -1101,11 +1101,11 @@ public void FallbackSettingsCustom()
         public void TableSubstitutionRule()
         {
             //ExStart
-            //ExFor:Fonts.TableSubstitutionRule
-            //ExFor:Fonts.TableSubstitutionRule.LoadLinuxSettings
-            //ExFor:Fonts.TableSubstitutionRule.LoadWindowsSettings
-            //ExFor:Fonts.TableSubstitutionRule.Save(System.IO.Stream)
-            //ExFor:Fonts.TableSubstitutionRule.Save(System.String)
+            //ExFor:TableSubstitutionRule
+            //ExFor:TableSubstitutionRule.LoadLinuxSettings
+            //ExFor:TableSubstitutionRule.LoadWindowsSettings
+            //ExFor:TableSubstitutionRule.Save(Stream)
+            //ExFor:TableSubstitutionRule.Save(String)
             //ExSummary:Shows how to access font substitution tables for Windows and Linux.
             Document doc = new Document();
             FontSettings fontSettings = new FontSettings();
@@ -1163,12 +1163,12 @@ public void TableSubstitutionRule()
         public void TableSubstitutionRuleCustom()
         {
             //ExStart
-            //ExFor:Fonts.FontSubstitutionSettings.TableSubstitution
-            //ExFor:Fonts.TableSubstitutionRule.AddSubstitutes(System.String,System.String[])
-            //ExFor:Fonts.TableSubstitutionRule.GetSubstitutes(System.String)
-            //ExFor:Fonts.TableSubstitutionRule.Load(System.IO.Stream)
-            //ExFor:Fonts.TableSubstitutionRule.Load(System.String)
-            //ExFor:Fonts.TableSubstitutionRule.SetSubstitutes(System.String,System.String[])
+            //ExFor:FontSubstitutionSettings.TableSubstitution
+            //ExFor:TableSubstitutionRule.AddSubstitutes(String,String[])
+            //ExFor:TableSubstitutionRule.GetSubstitutes(String)
+            //ExFor:TableSubstitutionRule.Load(Stream)
+            //ExFor:TableSubstitutionRule.Load(String)
+            //ExFor:TableSubstitutionRule.SetSubstitutes(String,String[])
             //ExSummary:Shows how to work with custom font substitution tables.
             Document doc = new Document();
             FontSettings fontSettings = new FontSettings();
diff --git a/Examples/ApiExamples/ApiExamples/ExFormFields.cs b/Examples/ApiExamples/ApiExamples/ExFormFields.cs
index df3106a7..bfa1223c 100644
--- a/Examples/ApiExamples/ApiExamples/ExFormFields.cs
+++ b/Examples/ApiExamples/ApiExamples/ExFormFields.cs
@@ -352,17 +352,17 @@ private void TestFormField(Document doc)
         public void DropDownItemCollection()
         {
             //ExStart
-            //ExFor:Fields.DropDownItemCollection
-            //ExFor:Fields.DropDownItemCollection.Add(String)
-            //ExFor:Fields.DropDownItemCollection.Clear
-            //ExFor:Fields.DropDownItemCollection.Contains(String)
-            //ExFor:Fields.DropDownItemCollection.Count
-            //ExFor:Fields.DropDownItemCollection.GetEnumerator
-            //ExFor:Fields.DropDownItemCollection.IndexOf(String)
-            //ExFor:Fields.DropDownItemCollection.Insert(Int32, String)
-            //ExFor:Fields.DropDownItemCollection.Item(Int32)
-            //ExFor:Fields.DropDownItemCollection.Remove(String)
-            //ExFor:Fields.DropDownItemCollection.RemoveAt(Int32)
+            //ExFor:DropDownItemCollection
+            //ExFor:DropDownItemCollection.Add(String)
+            //ExFor:DropDownItemCollection.Clear
+            //ExFor:DropDownItemCollection.Contains(String)
+            //ExFor:DropDownItemCollection.Count
+            //ExFor:DropDownItemCollection.GetEnumerator
+            //ExFor:DropDownItemCollection.IndexOf(String)
+            //ExFor:DropDownItemCollection.Insert(Int32, String)
+            //ExFor:DropDownItemCollection.Item(Int32)
+            //ExFor:DropDownItemCollection.Remove(String)
+            //ExFor:DropDownItemCollection.RemoveAt(Int32)
             //ExSummary:Shows how to insert a combo box field, and edit the elements in its item collection.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
diff --git a/Examples/ApiExamples/ApiExamples/ExHeaderFooter.cs b/Examples/ApiExamples/ApiExamples/ExHeaderFooter.cs
index 2b3595a7..7c94351d 100644
--- a/Examples/ApiExamples/ApiExamples/ExHeaderFooter.cs
+++ b/Examples/ApiExamples/ApiExamples/ExHeaderFooter.cs
@@ -77,9 +77,9 @@ public void Link()
         {
             //ExStart
             //ExFor:HeaderFooter.IsLinkedToPrevious
-            //ExFor:HeaderFooterCollection.Item(System.Int32)
-            //ExFor:HeaderFooterCollection.LinkToPrevious(Aspose.Words.HeaderFooterType,System.Boolean)
-            //ExFor:HeaderFooterCollection.LinkToPrevious(System.Boolean)
+            //ExFor:HeaderFooterCollection.Item(Int32)
+            //ExFor:HeaderFooterCollection.LinkToPrevious(HeaderFooterType,Boolean)
+            //ExFor:HeaderFooterCollection.LinkToPrevious(Boolean)
             //ExFor:HeaderFooter.ParentSection
             //ExSummary:Shows how to link headers and footers between sections.
             Document doc = new Document();
diff --git a/Examples/ApiExamples/ApiExamples/ExHyphenation.cs b/Examples/ApiExamples/ApiExamples/ExHyphenation.cs
index 5e5c3a78..50b321f8 100644
--- a/Examples/ApiExamples/ApiExamples/ExHyphenation.cs
+++ b/Examples/ApiExamples/ApiExamples/ExHyphenation.cs
@@ -86,7 +86,7 @@ public void UsePdfDocumentForDictionary()
         //ExFor:Hyphenation.RegisterDictionary(String, String)
         //ExFor:Hyphenation.WarningCallback
         //ExFor:IHyphenationCallback
-        //ExFor:IHyphenationCallback.RequestDictionary(System.String)
+        //ExFor:IHyphenationCallback.RequestDictionary(String)
         //ExSummary:Shows how to open and register a dictionary from a file.
         [Test] //ExSkip
         public void RegisterDictionary()
diff --git a/Examples/ApiExamples/ApiExamples/ExLayout.cs b/Examples/ApiExamples/ApiExamples/ExLayout.cs
index 896d24fa..9c4c56a7 100644
--- a/Examples/ApiExamples/ApiExamples/ExLayout.cs
+++ b/Examples/ApiExamples/ApiExamples/ExLayout.cs
@@ -22,15 +22,15 @@ class ExLayout : ApiExampleBase
         public void LayoutCollector()
         {
             //ExStart
-            //ExFor:Layout.LayoutCollector
-            //ExFor:Layout.LayoutCollector.#ctor(Document)
-            //ExFor:Layout.LayoutCollector.Clear
-            //ExFor:Layout.LayoutCollector.Document
-            //ExFor:Layout.LayoutCollector.GetEndPageIndex(Node)
-            //ExFor:Layout.LayoutCollector.GetEntity(Node)
-            //ExFor:Layout.LayoutCollector.GetNumPagesSpanned(Node)
-            //ExFor:Layout.LayoutCollector.GetStartPageIndex(Node)
-            //ExFor:Layout.LayoutEnumerator.Current
+            //ExFor:LayoutCollector
+            //ExFor:LayoutCollector.#ctor(Document)
+            //ExFor:LayoutCollector.Clear
+            //ExFor:LayoutCollector.Document
+            //ExFor:LayoutCollector.GetEndPageIndex(Node)
+            //ExFor:LayoutCollector.GetEntity(Node)
+            //ExFor:LayoutCollector.GetNumPagesSpanned(Node)
+            //ExFor:LayoutCollector.GetStartPageIndex(Node)
+            //ExFor:LayoutEnumerator.Current
             //ExSummary:Shows how to see the the ranges of pages that a node spans.
             Document doc = new Document();
             LayoutCollector layoutCollector = new LayoutCollector(doc);
@@ -84,24 +84,24 @@ public void LayoutCollector()
         }
 
         //ExStart
-        //ExFor:Layout.LayoutEntityType
-        //ExFor:Layout.LayoutEnumerator
-        //ExFor:Layout.LayoutEnumerator.#ctor(Document)
-        //ExFor:Layout.LayoutEnumerator.Document
-        //ExFor:Layout.LayoutEnumerator.Kind
-        //ExFor:Layout.LayoutEnumerator.MoveFirstChild
-        //ExFor:Layout.LayoutEnumerator.MoveLastChild
-        //ExFor:Layout.LayoutEnumerator.MoveNext
-        //ExFor:Layout.LayoutEnumerator.MoveNextLogical
-        //ExFor:Layout.LayoutEnumerator.MoveParent
-        //ExFor:Layout.LayoutEnumerator.MoveParent(Layout.LayoutEntityType)
-        //ExFor:Layout.LayoutEnumerator.MovePrevious
-        //ExFor:Layout.LayoutEnumerator.MovePreviousLogical
-        //ExFor:Layout.LayoutEnumerator.PageIndex
-        //ExFor:Layout.LayoutEnumerator.Rectangle
-        //ExFor:Layout.LayoutEnumerator.Reset
-        //ExFor:Layout.LayoutEnumerator.Text
-        //ExFor:Layout.LayoutEnumerator.Type
+        //ExFor:LayoutEntityType
+        //ExFor:LayoutEnumerator
+        //ExFor:LayoutEnumerator.#ctor(Document)
+        //ExFor:LayoutEnumerator.Document
+        //ExFor:LayoutEnumerator.Kind
+        //ExFor:LayoutEnumerator.MoveFirstChild
+        //ExFor:LayoutEnumerator.MoveLastChild
+        //ExFor:LayoutEnumerator.MoveNext
+        //ExFor:LayoutEnumerator.MoveNextLogical
+        //ExFor:LayoutEnumerator.MoveParent
+        //ExFor:LayoutEnumerator.MoveParent(LayoutEntityType)
+        //ExFor:LayoutEnumerator.MovePrevious
+        //ExFor:LayoutEnumerator.MovePreviousLogical
+        //ExFor:LayoutEnumerator.PageIndex
+        //ExFor:LayoutEnumerator.Rectangle
+        //ExFor:LayoutEnumerator.Reset
+        //ExFor:LayoutEnumerator.Text
+        //ExFor:LayoutEnumerator.Type
         //ExSummary:Shows ways of traversing a document's layout entities.
         [Test] //ExSkip
         public void LayoutEnumerator()
diff --git a/Examples/ApiExamples/ApiExamples/ExMailMerge.cs b/Examples/ApiExamples/ApiExamples/ExMailMerge.cs
index b9f2246c..7ac6d77f 100644
--- a/Examples/ApiExamples/ApiExamples/ExMailMerge.cs
+++ b/Examples/ApiExamples/ApiExamples/ExMailMerge.cs
@@ -489,9 +489,9 @@ public void ExecuteWithRegionsConcurrent()
         public void MailMergeRegionInfo()
         {
             //ExStart
-            //ExFor:MailMerge.GetFieldNamesForRegion(System.String)
-            //ExFor:MailMerge.GetFieldNamesForRegion(System.String,System.Int32)
-            //ExFor:MailMerge.GetRegionsByName(System.String)
+            //ExFor:MailMerge.GetFieldNamesForRegion(String)
+            //ExFor:MailMerge.GetFieldNamesForRegion(String,Int32)
+            //ExFor:MailMerge.GetRegionsByName(String)
             //ExFor:MailMerge.RegionEndTag
             //ExFor:MailMerge.RegionStartTag
             //ExFor:MailMergeRegionInfo.ParentRegion
diff --git a/Examples/ApiExamples/ApiExamples/ExMailMergeCustom.cs b/Examples/ApiExamples/ApiExamples/ExMailMergeCustom.cs
index df251425..6a61e126 100644
--- a/Examples/ApiExamples/ApiExamples/ExMailMergeCustom.cs
+++ b/Examples/ApiExamples/ApiExamples/ExMailMergeCustom.cs
@@ -22,7 +22,7 @@ public class ExMailMergeCustom : ApiExampleBase
         //ExFor:IMailMergeDataSource.TableName
         //ExFor:IMailMergeDataSource.MoveNext
         //ExFor:IMailMergeDataSource.GetValue
-        //ExFor:IMailMergeDataSource.GetChildDataSource        
+        //ExFor:IMailMergeDataSource.GetChildDataSource
         //ExSummary:Shows how to execute a mail merge with a data source in the form of a custom object.
         [Test] //ExSkip
         public void CustomDataSource()
diff --git a/Examples/ApiExamples/ApiExamples/ExMailMergeEvent.cs b/Examples/ApiExamples/ApiExamples/ExMailMergeEvent.cs
index 14c6a72c..140fe9c8 100644
--- a/Examples/ApiExamples/ApiExamples/ExMailMergeEvent.cs
+++ b/Examples/ApiExamples/ApiExamples/ExMailMergeEvent.cs
@@ -355,7 +355,7 @@ public void ImageFromUrl()
         //ExFor:IFieldMergingCallback.ImageFieldMerging
         //ExFor:ImageFieldMergingArgs.ImageStream
         //ExSummary:Shows how to insert images stored in a database BLOB field into a report.
-        [Test, Category("IgnoreOnJenkins"), Category("SkipGitHub")] //ExSkip        
+        [Test, Category("IgnoreOnJenkins"), Category("SkipGitHub")] //ExSkip
         public void ImageFromBlob()
         {
             Document doc = new Document(MyDir + "Mail merge destination - Northwind employees.docx");
diff --git a/Examples/ApiExamples/ApiExamples/ExMarkdownSaveOptions.cs b/Examples/ApiExamples/ApiExamples/ExMarkdownSaveOptions.cs
index 91966799..cea045cc 100644
--- a/Examples/ApiExamples/ApiExamples/ExMarkdownSaveOptions.cs
+++ b/Examples/ApiExamples/ApiExamples/ExMarkdownSaveOptions.cs
@@ -166,7 +166,7 @@ public void ImagesFolder()
             //ExSummary:Shows how to specifies the name of the folder used to construct image URIs.
             DocumentBuilder builder = new DocumentBuilder();
 
-            builder.Writeln("Some image below:");            
+            builder.Writeln("Some image below:");
             builder.InsertImage(ImageDir + "Logo.jpg");
 
             string imagesFolder = Path.Combine(ArtifactsDir, "ImagesDir");
diff --git a/Examples/ApiExamples/ApiExamples/ExNode.cs b/Examples/ApiExamples/ApiExamples/ExNode.cs
index 5e7e67ee..0a626fee 100644
--- a/Examples/ApiExamples/ApiExamples/ExNode.cs
+++ b/Examples/ApiExamples/ApiExamples/ExNode.cs
@@ -595,7 +595,7 @@ public void NodeChangingCallback()
             builder.Write("Cell 2");
             builder.EndTable();
 
-            builder.InsertImage(ImageDir + "Logo.jpg");            
+            builder.InsertImage(ImageDir + "Logo.jpg");
 
             builder.CurrentParagraph.ParentNode.RemoveAllChildren();
         }
@@ -686,7 +686,7 @@ public void NodeList()
         {
             //ExStart
             //ExFor:NodeList.Count
-            //ExFor:NodeList.Item(System.Int32)
+            //ExFor:NodeList.Item(Int32)
             //ExSummary:Shows how to use XPaths to navigate a NodeList.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -701,7 +701,7 @@ public void NodeList()
             builder.Write("Cell 2");
             builder.EndTable();
 
-            builder.InsertImage(ImageDir + "Logo.jpg");            
+            builder.InsertImage(ImageDir + "Logo.jpg");
 
             // Our document contains three Run nodes.
             NodeList nodeList = doc.SelectNodes("//Run");
diff --git a/Examples/ApiExamples/ApiExamples/ExNodeImporter.cs b/Examples/ApiExamples/ApiExamples/ExNodeImporter.cs
index 9dbfa4a0..901b4f56 100644
--- a/Examples/ApiExamples/ApiExamples/ExNodeImporter.cs
+++ b/Examples/ApiExamples/ApiExamples/ExNodeImporter.cs
@@ -74,7 +74,7 @@ public void KeepSourceNumbering(bool keepSourceNumbering)
             }
             //ExEnd
         }
-        
+
         //ExStart
         //ExFor:Paragraph.IsEndOfSection
         //ExFor:NodeImporter
diff --git a/Examples/ApiExamples/ApiExamples/ExRendering.cs b/Examples/ApiExamples/ApiExamples/ExRendering.cs
index 2b300854..ac6b1048 100644
--- a/Examples/ApiExamples/ApiExamples/ExRendering.cs
+++ b/Examples/ApiExamples/ApiExamples/ExRendering.cs
@@ -29,7 +29,7 @@ public class ExRendering : ApiExampleBase
         //ExStart
         //ExFor:NodeRendererBase.RenderToScale(Graphics, Single, Single, Single)
         //ExFor:NodeRendererBase.RenderToSize(Graphics, Single, Single, Single, Single)
-        //ExFor:ShapeRenderer        
+        //ExFor:ShapeRenderer
         //ExSummary:Shows how to render a shape with a Graphics object and display it using a Windows Form.
         [Test, Category("IgnoreOnJenkins"), Category("SkipMono")] //ExSkip
         public void RenderShapesOnForm()
@@ -87,10 +87,10 @@ private class ShapeForm : Form
         {
             public ShapeForm(Size size)
             {
-                Timer timer = new Timer(); //ExSKip
-                timer.Interval = 10000; //ExSKip
-                timer.Tick += TimerTick; //ExSKip
-                timer.Start(); //ExSKip
+                Timer timer = new Timer(); //ExSkip
+                timer.Interval = 10000; //ExSkip
+                timer.Tick += TimerTick; //ExSkip
+                timer.Start(); //ExSkip
                 Size = size;
                 mShapesToRender = new List<KeyValuePair<ShapeBase, float[]>>();
             }
diff --git a/Examples/ApiExamples/ApiExamples/ExRevision.cs b/Examples/ApiExamples/ApiExamples/ExRevision.cs
index f542d602..99d1d22f 100644
--- a/Examples/ApiExamples/ApiExamples/ExRevision.cs
+++ b/Examples/ApiExamples/ApiExamples/ExRevision.cs
@@ -306,7 +306,7 @@ public void RevisionSpecifiedCriteria()
             builder.Write("This does not count as a revision. ");
 
             // To register our edits as revisions, we need to declare an author, and then start tracking them.
-            doc.StartTrackRevisions("John Doe", DateTime.Now);            
+            doc.StartTrackRevisions("John Doe", DateTime.Now);
             builder.Write("This is insertion revision #1. ");
             doc.StopTrackRevisions();
 
diff --git a/Examples/ApiExamples/ApiExamples/ExShape.cs b/Examples/ApiExamples/ApiExamples/ExShape.cs
index 68e8867f..f6439ce0 100644
--- a/Examples/ApiExamples/ApiExamples/ExShape.cs
+++ b/Examples/ApiExamples/ApiExamples/ExShape.cs
@@ -856,11 +856,11 @@ public void GradientStops()
             //ExStart
             //ExFor:Fill.GradientStops
             //ExFor:GradientStopCollection
-            //ExFor:GradientStopCollection.Insert(System.Int32, GradientStop)
+            //ExFor:GradientStopCollection.Insert(Int32, GradientStop)
             //ExFor:GradientStopCollection.Add(GradientStop)
-            //ExFor:GradientStopCollection.RemoveAt(System.Int32)
+            //ExFor:GradientStopCollection.RemoveAt(Int32)
             //ExFor:GradientStopCollection.Remove(GradientStop)
-            //ExFor:GradientStopCollection.Item(System.Int32)
+            //ExFor:GradientStopCollection.Item(Int32)
             //ExFor:GradientStopCollection.Count
             //ExFor:GradientStop.#ctor(Color, Double)
             //ExFor:GradientStop.#ctor(Color, Double, Double)
@@ -1172,8 +1172,8 @@ public void GetActiveXControlProperties()
         {
             //ExStart
             //ExFor:OleControl
-            //ExFor:Ole.OleControl.IsForms2OleControl
-            //ExFor:Ole.OleControl.Name
+            //ExFor:OleControl.IsForms2OleControl
+            //ExFor:OleControl.Name
             //ExFor:OleFormat.OleControl
             //ExFor:Forms2OleControl
             //ExFor:Forms2OleControl.Caption
@@ -1356,9 +1356,9 @@ public void OleControlCollection()
         {
             //ExStart
             //ExFor:OleFormat.Clsid
-            //ExFor:Ole.Forms2OleControlCollection
-            //ExFor:Ole.Forms2OleControlCollection.Count
-            //ExFor:Ole.Forms2OleControlCollection.Item(Int32)
+            //ExFor:Forms2OleControlCollection
+            //ExFor:Forms2OleControlCollection.Count
+            //ExFor:Forms2OleControlCollection.Item(Int32)
             //ExSummary:Shows how to access an OLE control embedded in a document and its child controls.
             Document doc = new Document(MyDir + "OLE ActiveX controls.docm");
 
@@ -1904,7 +1904,7 @@ public void ShapeInsertion()
         public void VisitShapes()
         {
             Document doc = new Document(MyDir + "Revision shape.docx");
-            Assert.AreEqual(2, doc.GetChildNodes(NodeType.Shape, true).Count); //ExSKip
+            Assert.AreEqual(2, doc.GetChildNodes(NodeType.Shape, true).Count); //ExSkip
 
             ShapeAppearancePrinter visitor = new ShapeAppearancePrinter();
             doc.Accept(visitor);
diff --git a/Examples/ApiExamples/ApiExamples/ExSignDocumentCustom.cs b/Examples/ApiExamples/ApiExamples/ExSignDocumentCustom.cs
index fe4d42b6..df410219 100644
--- a/Examples/ApiExamples/ApiExamples/ExSignDocumentCustom.cs
+++ b/Examples/ApiExamples/ApiExamples/ExSignDocumentCustom.cs
@@ -125,9 +125,9 @@ private static void CreateSignees()
             mSignees = new List<Signee>
             {
                 new Signee(Guid.NewGuid(), "Ron Williams", "Chief Executive Officer",
-                    ImageToByteArray(signImagePath)),                
+                    ImageToByteArray(signImagePath)),
                 new Signee(Guid.NewGuid(), "Stephen Morse", "Head of Compliance",
-                    ImageToByteArray(signImagePath))                
+                    ImageToByteArray(signImagePath))
             };
         }
 
diff --git a/Examples/ApiExamples/ApiExamples/ExStructuredDocumentTag.cs b/Examples/ApiExamples/ApiExamples/ExStructuredDocumentTag.cs
index 0a9f27c2..8c7e0c8c 100644
--- a/Examples/ApiExamples/ApiExamples/ExStructuredDocumentTag.cs
+++ b/Examples/ApiExamples/ApiExamples/ExStructuredDocumentTag.cs
@@ -108,8 +108,8 @@ public void CheckBox()
             //ExStart
             //ExFor:StructuredDocumentTag.#ctor(DocumentBase, SdtType, MarkupLevel)
             //ExFor:StructuredDocumentTag.Checked
-            //ExFor:StructuredDocumentTag.SetCheckedSymbol(System.Int32, System.String)
-            //ExFor:StructuredDocumentTag.SetUncheckedSymbol(System.Int32, System.String)
+            //ExFor:StructuredDocumentTag.SetCheckedSymbol(Int32, String)
+            //ExFor:StructuredDocumentTag.SetUncheckedSymbol(Int32, String)
             //ExSummary:Show how to create a structured document tag in the form of a check box.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -402,17 +402,17 @@ public void ListItemCollection()
         {
             //ExStart
             //ExFor:SdtListItem
-            //ExFor:SdtListItem.#ctor(System.String)
-            //ExFor:SdtListItem.#ctor(System.String,System.String)
+            //ExFor:SdtListItem.#ctor(String)
+            //ExFor:SdtListItem.#ctor(String,String)
             //ExFor:SdtListItem.DisplayText
             //ExFor:SdtListItem.Value
             //ExFor:SdtListItemCollection
-            //ExFor:SdtListItemCollection.Add(Aspose.Words.Markup.SdtListItem)
+            //ExFor:SdtListItemCollection.Add(SdtListItem)
             //ExFor:SdtListItemCollection.Clear
             //ExFor:SdtListItemCollection.Count
             //ExFor:SdtListItemCollection.GetEnumerator
-            //ExFor:SdtListItemCollection.Item(System.Int32)
-            //ExFor:SdtListItemCollection.RemoveAt(System.Int32)
+            //ExFor:SdtListItemCollection.Item(Int32)
+            //ExFor:SdtListItemCollection.RemoveAt(Int32)
             //ExFor:SdtListItemCollection.SelectedValue
             //ExFor:StructuredDocumentTag.ListItems
             //ExSummary:Shows how to work with drop down-list structured document tags.
@@ -686,15 +686,15 @@ public void CustomXmlSchemaCollection()
         {
             //ExStart
             //ExFor:CustomXmlSchemaCollection
-            //ExFor:CustomXmlSchemaCollection.Add(System.String)
+            //ExFor:CustomXmlSchemaCollection.Add(String)
             //ExFor:CustomXmlSchemaCollection.Clear
             //ExFor:CustomXmlSchemaCollection.Clone
             //ExFor:CustomXmlSchemaCollection.Count
             //ExFor:CustomXmlSchemaCollection.GetEnumerator
-            //ExFor:CustomXmlSchemaCollection.IndexOf(System.String)
-            //ExFor:CustomXmlSchemaCollection.Item(System.Int32)
-            //ExFor:CustomXmlSchemaCollection.Remove(System.String)
-            //ExFor:CustomXmlSchemaCollection.RemoveAt(System.Int32)
+            //ExFor:CustomXmlSchemaCollection.IndexOf(String)
+            //ExFor:CustomXmlSchemaCollection.Item(Int32)
+            //ExFor:CustomXmlSchemaCollection.Remove(String)
+            //ExFor:CustomXmlSchemaCollection.RemoveAt(Int32)
             //ExSummary:Shows how to work with an XML schema collection.
             Document doc = new Document();
 
diff --git a/Examples/ApiExamples/ApiExamples/ExStyles.cs b/Examples/ApiExamples/ApiExamples/ExStyles.cs
index 3cd961af..338d6c8c 100644
--- a/Examples/ApiExamples/ApiExamples/ExStyles.cs
+++ b/Examples/ApiExamples/ApiExamples/ExStyles.cs
@@ -303,7 +303,7 @@ public void StyleAliases()
             //ExStart
             //ExFor:Style.Aliases
             //ExFor:Style.BaseStyleName
-            //ExFor:Style.Equals(Aspose.Words.Style)
+            //ExFor:Style.Equals(Style)
             //ExFor:Style.LinkedStyleName
             //ExSummary:Shows how to use style aliases.
             Document doc = new Document(MyDir + "Style with alias.docx");
@@ -363,14 +363,14 @@ public void LockStyle()
             Document doc = new Document();
 
             Style styleHeading1 = doc.Styles[StyleIdentifier.Heading1];
-            if (!styleHeading1.Locked)            
+            if (!styleHeading1.Locked)
                 styleHeading1.Locked = true;
 
             doc.Save(ArtifactsDir + "Styles.LockStyle.docx");
             //ExEnd:LockStyle
 
             doc = new Document(ArtifactsDir + "Styles.LockStyle.docx");
-            Assert.IsTrue(doc.Styles[StyleIdentifier.Heading1].Locked);            
+            Assert.IsTrue(doc.Styles[StyleIdentifier.Heading1].Locked);
         }
 
         [Test]
diff --git a/Examples/ApiExamples/ApiExamples/ExTabStop.cs b/Examples/ApiExamples/ApiExamples/ExTabStop.cs
index e41c2659..d245a90b 100644
--- a/Examples/ApiExamples/ApiExamples/ExTabStop.cs
+++ b/Examples/ApiExamples/ApiExamples/ExTabStop.cs
@@ -58,7 +58,7 @@ public void AddTabStops()
         [Test]
         public void TabStopCollection()
         {
-            //ExStart            
+            //ExStart
             //ExFor:TabStop.#ctor(Double)
             //ExFor:TabStop.#ctor(Double,TabAlignment,TabLeader)
             //ExFor:TabStop.Equals(TabStop)
diff --git a/Examples/ApiExamples/ApiExamples/ExTable.cs b/Examples/ApiExamples/ApiExamples/ExTable.cs
index a5979cbd..5e0e71f2 100644
--- a/Examples/ApiExamples/ApiExamples/ExTable.cs
+++ b/Examples/ApiExamples/ApiExamples/ExTable.cs
@@ -162,16 +162,16 @@ public void DisplayContentOfTables()
             //ExStart
             //ExFor:Cell
             //ExFor:CellCollection
-            //ExFor:CellCollection.Item(System.Int32)
+            //ExFor:CellCollection.Item(Int32)
             //ExFor:CellCollection.ToArray
             //ExFor:Row
             //ExFor:Row.Cells
             //ExFor:RowCollection
-            //ExFor:RowCollection.Item(System.Int32)
+            //ExFor:RowCollection.Item(Int32)
             //ExFor:RowCollection.ToArray
             //ExFor:Table
             //ExFor:Table.Rows
-            //ExFor:TableCollection.Item(System.Int32)
+            //ExFor:TableCollection.Item(Int32)
             //ExFor:TableCollection.ToArray
             //ExSummary:Shows how to iterate through all tables in the document and print the contents of each cell.
             Document doc = new Document(MyDir + "Tables.docx");
@@ -215,7 +215,7 @@ public void DisplayContentOfTables()
 
         //ExStart
         //ExFor:Node.GetAncestor(NodeType)
-        //ExFor:Node.GetAncestor(System.Type)
+        //ExFor:Node.GetAncestor(Type)
         //ExFor:Table.NodeType
         //ExFor:Cell.Tables
         //ExFor:TableCollection
diff --git a/Examples/ApiExamples/ApiExamples/ExThemes.cs b/Examples/ApiExamples/ApiExamples/ExThemes.cs
index b7f3d5ed..7514ebbd 100644
--- a/Examples/ApiExamples/ApiExamples/ExThemes.cs
+++ b/Examples/ApiExamples/ApiExamples/ExThemes.cs
@@ -24,23 +24,23 @@ public void CustomColorsAndFonts()
             //ExFor:Theme.Colors
             //ExFor:Theme.MajorFonts
             //ExFor:Theme.MinorFonts
-            //ExFor:Themes.ThemeColors
-            //ExFor:Themes.ThemeColors.Accent1
-            //ExFor:Themes.ThemeColors.Accent2
-            //ExFor:Themes.ThemeColors.Accent3
-            //ExFor:Themes.ThemeColors.Accent4
-            //ExFor:Themes.ThemeColors.Accent5
-            //ExFor:Themes.ThemeColors.Accent6
-            //ExFor:Themes.ThemeColors.Dark1
-            //ExFor:Themes.ThemeColors.Dark2
-            //ExFor:Themes.ThemeColors.FollowedHyperlink
-            //ExFor:Themes.ThemeColors.Hyperlink
-            //ExFor:Themes.ThemeColors.Light1
-            //ExFor:Themes.ThemeColors.Light2
-            //ExFor:Themes.ThemeFonts
-            //ExFor:Themes.ThemeFonts.ComplexScript
-            //ExFor:Themes.ThemeFonts.EastAsian
-            //ExFor:Themes.ThemeFonts.Latin
+            //ExFor:ThemeColors
+            //ExFor:ThemeColors.Accent1
+            //ExFor:ThemeColors.Accent2
+            //ExFor:ThemeColors.Accent3
+            //ExFor:ThemeColors.Accent4
+            //ExFor:ThemeColors.Accent5
+            //ExFor:ThemeColors.Accent6
+            //ExFor:ThemeColors.Dark1
+            //ExFor:ThemeColors.Dark2
+            //ExFor:ThemeColors.FollowedHyperlink
+            //ExFor:ThemeColors.Hyperlink
+            //ExFor:ThemeColors.Light1
+            //ExFor:ThemeColors.Light2
+            //ExFor:ThemeFonts
+            //ExFor:ThemeFonts.ComplexScript
+            //ExFor:ThemeFonts.EastAsian
+            //ExFor:ThemeFonts.Latin
             //ExSummary:Shows how to set custom colors and fonts for themes.
             Document doc = new Document(MyDir + "Theme colors.docx");
 
diff --git a/Examples/ApiExamples/ApiExamples/TestUtil.cs b/Examples/ApiExamples/ApiExamples/TestUtil.cs
index 41d45d74..364a5fd0 100644
--- a/Examples/ApiExamples/ApiExamples/TestUtil.cs
+++ b/Examples/ApiExamples/ApiExamples/TestUtil.cs
@@ -206,7 +206,7 @@ internal static void MailMergeMatchesDataTable(DataTable expectedResult, Documen
 
             for (int i = 0; i < expectedResult.Rows.Count; i++)
                 expectedStrings[i] = Array.ConvertAll(expectedResult.Rows[i].ItemArray, x => x.ToString());
-            
+
             MailMergeMatchesArray(expectedStrings, doc, onePagePerRow);
         }
 
@@ -262,9 +262,9 @@ internal static void DocPackageFileContainsString(string expected, string docFil
             using (ZipArchive archive = ZipFile.Open(docFilename, ZipArchiveMode.Update))
             {
                 ZipArchiveEntry entry = archive.Entries.First(e => e.Name == docPartFilename);
-                
+
                 using (Stream stream = entry.Open())
-                { 
+                {
                    StreamContainsString(expected, stream);
                 }
             }