diff --git a/src/NetEvolve.Extensions.NUnit/BugAttribute.cs b/src/NetEvolve.Extensions.NUnit/BugAttribute.cs
index 4f1f44b..fbe072e 100644
--- a/src/NetEvolve.Extensions.NUnit/BugAttribute.cs
+++ b/src/NetEvolve.Extensions.NUnit/BugAttribute.cs
@@ -7,7 +7,7 @@
 /// Attribute used to decorate a test class or method as Bug, with optional Id
 /// </summary>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
-public sealed class BugAttribute : CategoryIdAttributeBase
+public sealed class BugAttribute : CategoryIdBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="BugAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.NUnit/EpicAttribute.cs b/src/NetEvolve.Extensions.NUnit/EpicAttribute.cs
index 65b277d..f152189 100644
--- a/src/NetEvolve.Extensions.NUnit/EpicAttribute.cs
+++ b/src/NetEvolve.Extensions.NUnit/EpicAttribute.cs
@@ -7,7 +7,7 @@
 /// Attribute used to decorate a test class or method as Epic, with optional Id
 /// </summary>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
-public sealed class EpicAttribute : CategoryIdAttributeBase
+public sealed class EpicAttribute : CategoryIdBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="EpicAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.NUnit/FeatureAttribute.cs b/src/NetEvolve.Extensions.NUnit/FeatureAttribute.cs
index 5337b37..8d493bc 100644
--- a/src/NetEvolve.Extensions.NUnit/FeatureAttribute.cs
+++ b/src/NetEvolve.Extensions.NUnit/FeatureAttribute.cs
@@ -7,7 +7,7 @@
 /// Attribute used to decorate a test class or method as Feature, with optional Id
 /// </summary>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
-public sealed class FeatureAttribute : CategoryIdAttributeBase
+public sealed class FeatureAttribute : CategoryIdBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="FeatureAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.NUnit/Internal/CategoryIdAttributeBase.cs b/src/NetEvolve.Extensions.NUnit/Internal/CategoryIdBaseAttribute.cs
similarity index 66%
rename from src/NetEvolve.Extensions.NUnit/Internal/CategoryIdAttributeBase.cs
rename to src/NetEvolve.Extensions.NUnit/Internal/CategoryIdBaseAttribute.cs
index c245b68..6872be5 100644
--- a/src/NetEvolve.Extensions.NUnit/Internal/CategoryIdAttributeBase.cs
+++ b/src/NetEvolve.Extensions.NUnit/Internal/CategoryIdBaseAttribute.cs
@@ -8,7 +8,12 @@
 /// Abstract class implementation.
 /// Extends <see cref="CategoryAttribute"/> with an additional property <see cref="Id"/>.
 /// </summary>
-public abstract class CategoryIdAttributeBase : CategoryAttribute, IApplyToTest
+[System.Diagnostics.CodeAnalysis.SuppressMessage(
+    "Style",
+    "IDE1006:Naming Styles",
+    Justification = "As designed."
+)]
+public abstract class CategoryIdBaseAttribute : CategoryAttribute, IApplyToTest
 {
     /// <summary>
     /// Gets the Id
@@ -16,18 +21,18 @@ public abstract class CategoryIdAttributeBase : CategoryAttribute, IApplyToTest
     public string? Id { get; }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="CategoryIdAttributeBase"/> class.
+    /// Initializes a new instance of the <see cref="CategoryIdBaseAttribute"/> class.
     /// </summary>
     /// <param name="category">Category</param>
-    protected CategoryIdAttributeBase(string category)
+    protected CategoryIdBaseAttribute(string category)
         : base(category) { }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="CategoryIdAttributeBase"/> class.
+    /// Initializes a new instance of the <see cref="CategoryIdBaseAttribute"/> class.
     /// </summary>
     /// <param name="category">Category</param>
     /// <param name="id">Id</param>
-    protected CategoryIdAttributeBase(string category, string? id)
+    protected CategoryIdBaseAttribute(string category, string? id)
         : base(category) => Id = id;
 
     /// <inheritdoc/>
diff --git a/src/NetEvolve.Extensions.NUnit/IssueAttribute.cs b/src/NetEvolve.Extensions.NUnit/IssueAttribute.cs
index 0bfcf42..84a1eff 100644
--- a/src/NetEvolve.Extensions.NUnit/IssueAttribute.cs
+++ b/src/NetEvolve.Extensions.NUnit/IssueAttribute.cs
@@ -7,7 +7,7 @@
 /// Attribute used to decorate a test class or method as Issue, with optional Id
 /// </summary>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
-public sealed class IssueAttribute : CategoryIdAttributeBase
+public sealed class IssueAttribute : CategoryIdBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="IssueAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.NUnit/UserStoryAttribute.cs b/src/NetEvolve.Extensions.NUnit/UserStoryAttribute.cs
index 60913f7..9363cae 100644
--- a/src/NetEvolve.Extensions.NUnit/UserStoryAttribute.cs
+++ b/src/NetEvolve.Extensions.NUnit/UserStoryAttribute.cs
@@ -7,7 +7,7 @@
 /// Attribute used to decorate a test class or method as UserStory, with optional Id
 /// </summary>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
-public sealed class UserStoryAttribute : CategoryIdAttributeBase
+public sealed class UserStoryAttribute : CategoryIdBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="UserStoryAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.NUnit/WorkItemAttribute.cs b/src/NetEvolve.Extensions.NUnit/WorkItemAttribute.cs
index 139902c..bcfbdc0 100644
--- a/src/NetEvolve.Extensions.NUnit/WorkItemAttribute.cs
+++ b/src/NetEvolve.Extensions.NUnit/WorkItemAttribute.cs
@@ -7,7 +7,7 @@
 /// Attribute used to decorate a test class or method as WorkItem, with optional Id
 /// </summary>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
-public sealed class WorkItemAttribute : CategoryIdAttributeBase
+public sealed class WorkItemAttribute : CategoryIdBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="WorkItemAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/AcceptanceTestAttribute.cs b/src/NetEvolve.Extensions.XUnit/AcceptanceTestAttribute.cs
index 4008b9a..08a6bbe 100644
--- a/src/NetEvolve.Extensions.XUnit/AcceptanceTestAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/AcceptanceTestAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as <see cref="AcceptanceTestAttribute"/>
 /// </summary>
-public sealed class AcceptanceTestAttribute : CategoryTraitAttributeBase
+public sealed class AcceptanceTestAttribute : CategoryTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="AcceptanceTestAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/BugAttribute.cs b/src/NetEvolve.Extensions.XUnit/BugAttribute.cs
index d499ecf..1c29075 100644
--- a/src/NetEvolve.Extensions.XUnit/BugAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/BugAttribute.cs
@@ -7,7 +7,7 @@
 /// Attribute used to decorate a test class or method as Bug, with optional Id
 /// </summary>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
-public sealed class BugAttribute : CategoryWithIdTraitAttributeBase
+public sealed class BugAttribute : CategoryWithIdTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="BugAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/EndToEndTestAttribute.cs b/src/NetEvolve.Extensions.XUnit/EndToEndTestAttribute.cs
index f8ac725..234d157 100644
--- a/src/NetEvolve.Extensions.XUnit/EndToEndTestAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/EndToEndTestAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as EndToEndTest
 /// </summary>
-public sealed class EndToEndTestAttribute : CategoryTraitAttributeBase
+public sealed class EndToEndTestAttribute : CategoryTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="EndToEndTestAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/EpicAttribute.cs b/src/NetEvolve.Extensions.XUnit/EpicAttribute.cs
index 459b997..9a4791e 100644
--- a/src/NetEvolve.Extensions.XUnit/EpicAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/EpicAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as Epic, with optional Id
 /// </summary>
-public sealed class EpicAttribute : CategoryWithIdTraitAttributeBase
+public sealed class EpicAttribute : CategoryWithIdTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="EpicAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/FeatureAttribute.cs b/src/NetEvolve.Extensions.XUnit/FeatureAttribute.cs
index 1b09c5d..325c304 100644
--- a/src/NetEvolve.Extensions.XUnit/FeatureAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/FeatureAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as Feature, with optional Id
 /// </summary>
-public sealed class FeatureAttribute : CategoryWithIdTraitAttributeBase
+public sealed class FeatureAttribute : CategoryWithIdTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="FeatureAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/FunctionalTestAttribute.cs b/src/NetEvolve.Extensions.XUnit/FunctionalTestAttribute.cs
index bb0e42c..3871baa 100644
--- a/src/NetEvolve.Extensions.XUnit/FunctionalTestAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/FunctionalTestAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as IntegrationTest
 /// </summary>
-public sealed class FunctionalTestAttribute : CategoryTraitAttributeBase
+public sealed class FunctionalTestAttribute : CategoryTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="FunctionalTestAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/IntegrationTestAttribute.cs b/src/NetEvolve.Extensions.XUnit/IntegrationTestAttribute.cs
index 2ca65c1..1d9c6fa 100644
--- a/src/NetEvolve.Extensions.XUnit/IntegrationTestAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/IntegrationTestAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as IntegrationTest
 /// </summary>
-public sealed class IntegrationTestAttribute : CategoryTraitAttributeBase
+public sealed class IntegrationTestAttribute : CategoryTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="IntegrationTestAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/Internal/CategoryTraitAttributeBase.cs b/src/NetEvolve.Extensions.XUnit/Internal/CategoryTraitBaseAttribute.cs
similarity index 72%
rename from src/NetEvolve.Extensions.XUnit/Internal/CategoryTraitAttributeBase.cs
rename to src/NetEvolve.Extensions.XUnit/Internal/CategoryTraitBaseAttribute.cs
index ee484fa..fd16f29 100644
--- a/src/NetEvolve.Extensions.XUnit/Internal/CategoryTraitAttributeBase.cs
+++ b/src/NetEvolve.Extensions.XUnit/Internal/CategoryTraitBaseAttribute.cs
@@ -15,12 +15,8 @@
     Inherited = true
 )]
 [TraitDiscoverer(Namespaces.CategoryTraitDiscoverer, Namespaces.Assembly)]
-[SuppressMessage(
-    "Naming",
-    "CA1710:Identifiers should have correct suffix",
-    Justification = "Conflicting naming convention"
-)]
-public abstract class CategoryTraitAttributeBase : Attribute, ITraitAttribute
+[SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "As designed.")]
+public abstract class CategoryTraitBaseAttribute : Attribute, ITraitAttribute
 {
     /// <summary>
     /// Gets the category value of the trait.
@@ -28,8 +24,8 @@ public abstract class CategoryTraitAttributeBase : Attribute, ITraitAttribute
     public string Category { get; }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="CategoryTraitAttributeBase"/> class.
+    /// Initializes a new instance of the <see cref="CategoryTraitBaseAttribute"/> class.
     /// </summary>
     /// <param name="category"></param>
-    protected CategoryTraitAttributeBase(string category) => Category = category;
+    protected CategoryTraitBaseAttribute(string category) => Category = category;
 }
diff --git a/src/NetEvolve.Extensions.XUnit/Internal/CategoryTraitDiscoverer.cs b/src/NetEvolve.Extensions.XUnit/Internal/CategoryTraitDiscoverer.cs
index 95b6346..c015078 100644
--- a/src/NetEvolve.Extensions.XUnit/Internal/CategoryTraitDiscoverer.cs
+++ b/src/NetEvolve.Extensions.XUnit/Internal/CategoryTraitDiscoverer.cs
@@ -5,7 +5,7 @@
 using Xunit.Abstractions;
 
 /// <summary>
-/// Discoverer for all implementations of <see cref="CategoryTraitAttributeBase"/>.
+/// Discoverer for all implementations of <see cref="CategoryTraitBaseAttribute"/>.
 /// </summary>
 public sealed class CategoryTraitDiscoverer : DiscovererBase
 {
diff --git a/src/NetEvolve.Extensions.XUnit/Internal/CategoryWithIdTraitAttributeBase.cs b/src/NetEvolve.Extensions.XUnit/Internal/CategoryWithIdTraitBaseAttribute.cs
similarity index 80%
rename from src/NetEvolve.Extensions.XUnit/Internal/CategoryWithIdTraitAttributeBase.cs
rename to src/NetEvolve.Extensions.XUnit/Internal/CategoryWithIdTraitBaseAttribute.cs
index 4053387..23ab439 100644
--- a/src/NetEvolve.Extensions.XUnit/Internal/CategoryWithIdTraitAttributeBase.cs
+++ b/src/NetEvolve.Extensions.XUnit/Internal/CategoryWithIdTraitBaseAttribute.cs
@@ -27,12 +27,8 @@
     Inherited = true
 )]
 [TraitDiscoverer(Namespaces.CategoryTraitDiscoverer, Namespaces.Assembly)]
-[SuppressMessage(
-    "Naming",
-    "CA1710:Identifiers should have correct suffix",
-    Justification = "Conflicting naming convention"
-)]
-public abstract class CategoryWithIdTraitAttributeBase : Attribute, ITraitAttribute
+[SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "As designed.")]
+public abstract class CategoryWithIdTraitBaseAttribute : Attribute, ITraitAttribute
 {
     /// <summary>
     /// Gets the category value of the trait.
@@ -45,22 +41,22 @@ public abstract class CategoryWithIdTraitAttributeBase : Attribute, ITraitAttrib
     public string? Id { get; }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="CategoryWithIdTraitAttributeBase"/> class.
+    /// Initializes a new instance of the <see cref="CategoryWithIdTraitBaseAttribute"/> class.
     /// </summary>
     /// <param name="category">Category</param>
     /// <param name="id">Id</param>
-    protected CategoryWithIdTraitAttributeBase(string category, string? id)
+    protected CategoryWithIdTraitBaseAttribute(string category, string? id)
     {
         Category = category;
         Id = id;
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="CategoryWithIdTraitAttributeBase"/> class.
+    /// Initializes a new instance of the <see cref="CategoryWithIdTraitBaseAttribute"/> class.
     /// </summary>
     /// <param name="category">Category</param>
     /// <param name="id">Id</param>
-    protected CategoryWithIdTraitAttributeBase(string category, long id)
+    protected CategoryWithIdTraitBaseAttribute(string category, long id)
     {
         Category = category;
         Id = $"{id}";
diff --git a/src/NetEvolve.Extensions.XUnit/IssueAttribute.cs b/src/NetEvolve.Extensions.XUnit/IssueAttribute.cs
index bb8bf70..20f0a70 100644
--- a/src/NetEvolve.Extensions.XUnit/IssueAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/IssueAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as Issue, with optional Id
 /// </summary>
-public sealed class IssueAttribute : CategoryWithIdTraitAttributeBase
+public sealed class IssueAttribute : CategoryWithIdTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="IssueAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/PerformanceTestAttribute.cs b/src/NetEvolve.Extensions.XUnit/PerformanceTestAttribute.cs
index 60576e6..1ee5e8a 100644
--- a/src/NetEvolve.Extensions.XUnit/PerformanceTestAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/PerformanceTestAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as PerformanceTest
 /// </summary>
-public sealed class PerformanceTestAttribute : CategoryTraitAttributeBase
+public sealed class PerformanceTestAttribute : CategoryTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="PerformanceTestAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/PostDeploymentAttribute.cs b/src/NetEvolve.Extensions.XUnit/PostDeploymentAttribute.cs
index 2ec3f33..8a02d2c 100644
--- a/src/NetEvolve.Extensions.XUnit/PostDeploymentAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/PostDeploymentAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method with TestCategory PostDeployment
 /// </summary>
-public sealed class PostDeploymentAttribute : CategoryTraitAttributeBase
+public sealed class PostDeploymentAttribute : CategoryTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="PostDeploymentAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/PreDeploymentAttribute.cs b/src/NetEvolve.Extensions.XUnit/PreDeploymentAttribute.cs
index 6c3a4af..bca131e 100644
--- a/src/NetEvolve.Extensions.XUnit/PreDeploymentAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/PreDeploymentAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method with TestCategory PreDeployment
 /// </summary>
-public sealed class PreDeploymentAttribute : CategoryTraitAttributeBase
+public sealed class PreDeploymentAttribute : CategoryTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="PreDeploymentAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/UnitTestAttribute.cs b/src/NetEvolve.Extensions.XUnit/UnitTestAttribute.cs
index 6a85b73..ba1b21d 100644
--- a/src/NetEvolve.Extensions.XUnit/UnitTestAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/UnitTestAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as UnitTest
 /// </summary>
-public sealed class UnitTestAttribute : CategoryTraitAttributeBase
+public sealed class UnitTestAttribute : CategoryTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="UnitTestAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/UserStoryAttribute.cs b/src/NetEvolve.Extensions.XUnit/UserStoryAttribute.cs
index ffa2cbe..a302a24 100644
--- a/src/NetEvolve.Extensions.XUnit/UserStoryAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/UserStoryAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as UserStory, with optional Id
 /// </summary>
-public sealed class UserStoryAttribute : CategoryWithIdTraitAttributeBase
+public sealed class UserStoryAttribute : CategoryWithIdTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="UserStoryAttribute"/> class.
diff --git a/src/NetEvolve.Extensions.XUnit/WorkItemAttribute.cs b/src/NetEvolve.Extensions.XUnit/WorkItemAttribute.cs
index 493b7b6..26a3b2c 100644
--- a/src/NetEvolve.Extensions.XUnit/WorkItemAttribute.cs
+++ b/src/NetEvolve.Extensions.XUnit/WorkItemAttribute.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Attribute used to decorate a test class or method as WorkItem, with optional Id
 /// </summary>
-public sealed class WorkItemAttribute : CategoryWithIdTraitAttributeBase
+public sealed class WorkItemAttribute : CategoryWithIdTraitBaseAttribute
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="WorkItemAttribute"/> class.