diff --git a/src/Cake.Issues.Reporting.Generic/GenericIssueReportGenerator.cs b/src/Cake.Issues.Reporting.Generic/GenericIssueReportGenerator.cs
index 64c7c3305..89a8890c5 100644
--- a/src/Cake.Issues.Reporting.Generic/GenericIssueReportGenerator.cs
+++ b/src/Cake.Issues.Reporting.Generic/GenericIssueReportGenerator.cs
@@ -41,10 +41,10 @@ protected override FilePath InternalCreateReport(IEnumerable<IIssue> issues)
                     .WithModel(issues)
                     .WithReferences(
                         typeof(System.Linq.Enumerable).Assembly,
-                        typeof(Cake.Issues.IIssue).Assembly,
-                        typeof(Cake.Issues.Reporting.IIssueReportFormat).Assembly,
-                        typeof(Cake.Issues.Reporting.Generic.DevExtremeTheme).Assembly,
-                        typeof(Cake.Core.IO.FilePath).Assembly)
+                        typeof(IIssue).Assembly,
+                        typeof(IIssueReportFormat).Assembly,
+                        typeof(DevExtremeTheme).Assembly,
+                        typeof(FilePath).Assembly)
                     .WithViewBag(this.genericIssueReportFormatSettings.Options)
                     .ProcessTemplateAsync(this.genericIssueReportFormatSettings.Template)
                     .ConfigureAwait(false)
diff --git a/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs b/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs
index 9fcfb56c3..17bcb0efa 100644
--- a/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs
+++ b/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs
@@ -19,17 +19,17 @@ public static class IIssueExtensions
     /// <param name="addRun">Flag if value of <see cref="IIssue.Run"/> should be added.</param>
     /// <param name="addPriority">Flag if value of <see cref="IIssue.Priority"/> should be added.</param>
     /// <param name="addPriorityName">Flag if value of <see cref="IIssue.PriorityName"/> should be added.</param>
-    /// <param name="addProjectPath">Flag if value of <see cref="Cake.Issues.IIssueExtensions.ProjectPath"/> should be added.</param>
+    /// <param name="addProjectPath">Flag if value of <see cref="Issues.IIssueExtensions.ProjectPath"/> should be added.</param>
     /// <param name="addProjectName">Flag if value of <see cref="IIssue.ProjectName"/> should be added.</param>
     /// <param name="addFilePath">Flag if value of <see cref="IIssue.AffectedFileRelativePath"/> should be added.</param>
-    /// <param name="addFileDirectory">Flag if value of <see cref="Cake.Issues.IIssueExtensions.FileDirectory"/> should be added.</param>
-    /// <param name="addFileName">Flag if value of <see cref="Cake.Issues.IIssueExtensions.FileName"/> should be added.</param>
+    /// <param name="addFileDirectory">Flag if value of <see cref="Issues.IIssueExtensions.FileDirectory"/> should be added.</param>
+    /// <param name="addFileName">Flag if value of <see cref="Issues.IIssueExtensions.FileName"/> should be added.</param>
     /// <param name="addFileLink">Flag if value of <see cref="IIssue.FileLink"/> should be added.</param>
     /// <param name="addLine">Flag if value of <see cref="IIssue.Line"/> should be added.</param>
     /// <param name="addEndLine">Flag if value of <see cref="IIssue.EndLine"/> should be added.</param>
     /// <param name="addColumn">Flag if value of <see cref="IIssue.Column"/> should be added.</param>
     /// <param name="addEndColumn">Flag if value of <see cref="IIssue.EndColumn"/> should be added.</param>
-    /// <param name="addLocation">Flag if value of <see cref="Cake.Issues.IIssueExtensions.LineRange(IIssue)"/> should be added.</param>
+    /// <param name="addLocation">Flag if value of <see cref="Issues.IIssueExtensions.LineRange(IIssue)"/> should be added.</param>
     /// <param name="addRuleId">Flag if value of <see cref="IIssue.RuleId"/> should be added.</param>
     /// <param name="addRuleName">Flag if value of <see cref="IIssue.RuleName"/> should be added.</param>
     /// <param name="addRuleUrl">Flag if value of <see cref="IIssue.RuleUrl"/> should be added.</param>
diff --git a/src/Cake.Issues.Tests/FileLinking/IDictionaryExtensionsTests.cs b/src/Cake.Issues.Tests/FileLinking/IDictionaryExtensionsTests.cs
index e3d747fd8..ef236d59b 100644
--- a/src/Cake.Issues.Tests/FileLinking/IDictionaryExtensionsTests.cs
+++ b/src/Cake.Issues.Tests/FileLinking/IDictionaryExtensionsTests.cs
@@ -10,7 +10,7 @@ public sealed class TheGetValueOrDefaultExtension
         public void Should_Throw_If_Dictionary_Is_Null()
         {
             // Given
-            const System.Collections.Generic.IDictionary<string, string> dictionary = null;
+            const IDictionary<string, string> dictionary = null;
 
             // When
             var result = Record.Exception(() => dictionary.GetValueOrDefault("foo", null));
@@ -25,7 +25,7 @@ public void Should_Return_Value_If_Exists()
             // Given
             const string key = "foo";
             const string value = "bar";
-            var dictionary = new System.Collections.Generic.Dictionary<string, string> { { key, value } };
+            var dictionary = new Dictionary<string, string> { { key, value } };
 
             // When
             var result = dictionary.GetValueOrDefault(key, null);
@@ -39,7 +39,7 @@ public void Should_Return_DefaultValue_If_Value_Does_Not_Exist()
         {
             // Given
             const string defaultValue = "defaultValue";
-            var dictionary = new System.Collections.Generic.Dictionary<string, string> { { "foo", "bar" } };
+            var dictionary = new Dictionary<string, string> { { "foo", "bar" } };
 
             // When
             var result = dictionary.GetValueOrDefault("bar", defaultValue);
diff --git a/src/Cake.Issues.Tests/Serialization/IssueSerializationExtensionsTests.cs b/src/Cake.Issues.Tests/Serialization/IssueSerializationExtensionsTests.cs
index 047a555aa..2358a02ea 100644
--- a/src/Cake.Issues.Tests/Serialization/IssueSerializationExtensionsTests.cs
+++ b/src/Cake.Issues.Tests/Serialization/IssueSerializationExtensionsTests.cs
@@ -1000,9 +1000,9 @@ public void Should_Give_Correct_Result_For_Identifier_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1029,9 +1029,9 @@ public void Should_Give_Correct_Result_For_MessageText_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1059,9 +1059,9 @@ public void Should_Give_Correct_Result_For_MessageMarkdown_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1089,9 +1089,9 @@ public void Should_Give_Correct_Result_For_MessageHtml_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1118,9 +1118,9 @@ public void Should_Give_Correct_Result_For_ProviderType_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1147,9 +1147,9 @@ public void Should_Give_Correct_Result_For_ProviderName_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1177,9 +1177,9 @@ public void Should_Give_Correct_Result_For_Run_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1207,9 +1207,9 @@ public void Should_Give_Correct_Result_For_AdditionalInformation_After_Roundtrip
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1237,9 +1237,9 @@ public void Should_Give_Correct_Result_For_ProjectFileRelativePath_After_Roundtr
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1267,9 +1267,9 @@ public void Should_Give_Correct_Result_For_ProjectName_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1297,9 +1297,9 @@ public void Should_Give_Correct_Result_For_AffectedFileRelativePath_After_Roundt
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1327,9 +1327,9 @@ public void Should_Give_Correct_Result_For_Line_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1357,9 +1357,9 @@ public void Should_Give_Correct_Result_For_EndLine_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1387,9 +1387,9 @@ public void Should_Give_Correct_Result_For_Column_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1417,9 +1417,9 @@ public void Should_Give_Correct_Result_For_EndColumn_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1447,9 +1447,9 @@ public void Should_Give_Correct_Result_For_FileLink_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1477,9 +1477,9 @@ public void Should_Give_Correct_Result_For_Priority_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1507,9 +1507,9 @@ public void Should_Give_Correct_Result_For_PriorityName_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1537,9 +1537,9 @@ public void Should_Give_Correct_Result_For_RuleId_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1567,9 +1567,9 @@ public void Should_Give_Correct_Result_For_RuleName_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1597,9 +1597,9 @@ public void Should_Give_Correct_Result_For_RuleUrl_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1666,9 +1666,9 @@ public void Should_Give_Correct_Result_For_Identifier_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1704,9 +1704,9 @@ public void Should_Give_Correct_Result_For_MessageText_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1744,9 +1744,9 @@ public void Should_Give_Correct_Result_For_MessageMarkdown_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1784,9 +1784,9 @@ public void Should_Give_Correct_Result_For_MessageHtml_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1822,9 +1822,9 @@ public void Should_Give_Correct_Result_For_ProviderType_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1860,9 +1860,9 @@ public void Should_Give_Correct_Result_For_ProviderName_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1900,9 +1900,9 @@ public void Should_Give_Correct_Result_For_Run_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1940,9 +1940,9 @@ public void Should_Give_Correct_Result_For_ProjectFileRelativePath_After_Roundtr
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -1980,9 +1980,9 @@ public void Should_Give_Correct_Result_For_ProjectName_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2020,9 +2020,9 @@ public void Should_Give_Correct_Result_For_AffectedFileRelativePath_After_Roundt
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2060,9 +2060,9 @@ public void Should_Give_Correct_Result_For_Line_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2100,9 +2100,9 @@ public void Should_Give_Correct_Result_For_EndLine_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2140,9 +2140,9 @@ public void Should_Give_Correct_Result_For_Column_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2180,9 +2180,9 @@ public void Should_Give_Correct_Result_For_EndColumn_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2220,9 +2220,9 @@ public void Should_Give_Correct_Result_For_FileLink_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2260,9 +2260,9 @@ public void Should_Give_Correct_Result_For_Priority_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2300,9 +2300,9 @@ public void Should_Give_Correct_Result_For_PriorityName_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2340,9 +2340,9 @@ public void Should_Give_Correct_Result_For_RuleId_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2380,9 +2380,9 @@ public void Should_Give_Correct_Result_For_RuleName_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }
@@ -2420,9 +2420,9 @@ public void Should_Give_Correct_Result_For_RuleUrl_After_Roundtrip()
             }
             finally
             {
-                if (System.IO.File.Exists(filePath.FullPath))
+                if (File.Exists(filePath.FullPath))
                 {
-                    System.IO.File.Delete(filePath.FullPath);
+                    File.Delete(filePath.FullPath);
                 }
             }
         }