diff --git a/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Roles.cs b/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Roles.cs
index 035a2bd79..1eaa3f4de 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Roles.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Roles.cs
@@ -140,7 +140,7 @@ namespace Squidex.Domain.Apps.Core.Apps
 
         public bool TryGet(string app, string name, [MaybeNullWhen(false)] out Role value)
         {
-            Guard.NotNull(app, nameof(app));
+            Guard.NotNull(app);
 
             if (Defaults.TryGetValue(name, out var role) || inner.TryGetValue(name, out role))
             {
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs
index 4f27ea7ce..708bd815d 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs
@@ -163,7 +163,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
 
         public async Task<(object Data, object[]? Errors)> ExecuteAsync(GraphQLExecutionContext context, GraphQLQuery query)
         {
-            Guard.NotNull(context, nameof(context));
+            Guard.NotNull(context);
 
             var result = await new DocumentExecuter().ExecuteAsync(execution =>
             {
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs
index fce76d51e..54e50c013 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs
@@ -39,10 +39,10 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries
 
         public ContentEnricher(IAssetQueryService assetQuery, IAssetUrlGenerator assetUrlGenerator, Lazy<IContentQueryService> contentQuery, IContentWorkflow contentWorkflow)
         {
-            Guard.NotNull(assetQuery, nameof(assetQuery));
-            Guard.NotNull(assetUrlGenerator, nameof(assetUrlGenerator));
-            Guard.NotNull(contentQuery, nameof(contentQuery));
-            Guard.NotNull(contentWorkflow, nameof(contentWorkflow));
+            Guard.NotNull(assetQuery);
+            Guard.NotNull(assetUrlGenerator);
+            Guard.NotNull(contentQuery);
+            Guard.NotNull(contentWorkflow);
 
             this.assetQuery = assetQuery;
             this.assetUrlGenerator = assetUrlGenerator;
@@ -52,7 +52,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries
 
         public async Task<IEnrichedContentEntity> EnrichAsync(IContentEntity content, Context context)
         {
-            Guard.NotNull(content, nameof(content));
+            Guard.NotNull(content);
 
             var enriched = await EnrichAsync(Enumerable.Repeat(content, 1), context);
 
@@ -61,8 +61,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries
 
         public async Task<IReadOnlyList<IEnrichedContentEntity>> EnrichAsync(IEnumerable<IContentEntity> contents, Context context)
         {
-            Guard.NotNull(contents, nameof(contents));
-            Guard.NotNull(context, nameof(context));
+            Guard.NotNull(contents);
+            Guard.NotNull(context);
 
             using (Profiler.TraceMethod<ContentEnricher>())
             {
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Rules/Queries/RuleEnricher.cs b/backend/src/Squidex.Domain.Apps.Entities/Rules/Queries/RuleEnricher.cs
index a5ef426f2..d7c9b3a79 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Rules/Queries/RuleEnricher.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Rules/Queries/RuleEnricher.cs
@@ -21,14 +21,14 @@ namespace Squidex.Domain.Apps.Entities.Rules.Queries
 
         public RuleEnricher(IRuleEventRepository ruleEventRepository)
         {
-            Guard.NotNull(ruleEventRepository, nameof(ruleEventRepository));
+            Guard.NotNull(ruleEventRepository);
 
             this.ruleEventRepository = ruleEventRepository;
         }
 
         public async Task<IEnrichedRuleEntity> EnrichAsync(IRuleEntity rule, Context context)
         {
-            Guard.NotNull(rule, nameof(rule));
+            Guard.NotNull(rule);
 
             var enriched = await EnrichAsync(Enumerable.Repeat(rule, 1), context);
 
@@ -37,8 +37,8 @@ namespace Squidex.Domain.Apps.Entities.Rules.Queries
 
         public async Task<IReadOnlyList<IEnrichedRuleEntity>> EnrichAsync(IEnumerable<IRuleEntity> rules, Context context)
         {
-            Guard.NotNull(rules, nameof(rules));
-            Guard.NotNull(context, nameof(context));
+            Guard.NotNull(rules);
+            Guard.NotNull(context);
 
             using (Profiler.TraceMethod<RuleEnricher>())
             {
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Rules/Queries/RuleQueryService.cs b/backend/src/Squidex.Domain.Apps.Entities/Rules/Queries/RuleQueryService.cs
index a470206e1..e22acb830 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Rules/Queries/RuleQueryService.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Rules/Queries/RuleQueryService.cs
@@ -19,8 +19,8 @@ namespace Squidex.Domain.Apps.Entities.Rules.Queries
 
         public RuleQueryService(IRulesIndex rulesIndex, IRuleEnricher ruleEnricher)
         {
-            Guard.NotNull(rulesIndex, nameof(rulesIndex));
-            Guard.NotNull(ruleEnricher, nameof(ruleEnricher));
+            Guard.NotNull(rulesIndex);
+            Guard.NotNull(ruleEnricher);
 
             this.rulesIndex = rulesIndex;
             this.ruleEnricher = ruleEnricher;
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs
index 705cf8e05..9f02f0398 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs
@@ -22,10 +22,11 @@ namespace Squidex.Domain.Apps.Entities.Rules
         public RuleCommandMiddleware(IGrainFactory grainFactory, IRuleEnricher ruleEnricher, IContextProvider contextProvider)
             : base(grainFactory)
         {
-            Guard.NotNull(ruleEnricher, nameof(ruleEnricher));
-            Guard.NotNull(contextProvider, nameof(contextProvider));
+            Guard.NotNull(ruleEnricher);
+            Guard.NotNull(contextProvider);
 
             this.ruleEnricher = ruleEnricher;
+
             this.contextProvider = contextProvider;
         }
 
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleEnqueuer.cs b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleEnqueuer.cs
index 593685f40..9e3be0d0a 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleEnqueuer.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleEnqueuer.cs
@@ -65,8 +65,8 @@ namespace Squidex.Domain.Apps.Entities.Rules
 
         public async Task Enqueue(Rule rule, Guid ruleId, Envelope<IEvent> @event)
         {
-            Guard.NotNull(rule, nameof(rule));
-            Guard.NotNull(@event, nameof(@event));
+            Guard.NotNull(rule);
+            Guard.NotNull(@event);
 
             var job = await ruleService.CreateJobAsync(rule, ruleId, @event);
 
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs
index 02e614bff..1722572fd 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs
@@ -30,8 +30,8 @@ namespace Squidex.Domain.Apps.Entities.Rules
         public RuleGrain(IStore<Guid> store, ISemanticLog log, IAppProvider appProvider, IRuleEnqueuer ruleEnqueuer)
             : base(store, log)
         {
-            Guard.NotNull(appProvider, nameof(appProvider));
-            Guard.NotNull(ruleEnqueuer, nameof(ruleEnqueuer));
+            Guard.NotNull(appProvider);
+            Guard.NotNull(ruleEnqueuer);
 
             this.appProvider = appProvider;
 
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Schemas/Indexes/SchemasIndex.cs b/backend/src/Squidex.Domain.Apps.Entities/Schemas/Indexes/SchemasIndex.cs
index a0159e0d9..cda1a2c3c 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Schemas/Indexes/SchemasIndex.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Schemas/Indexes/SchemasIndex.cs
@@ -24,7 +24,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Indexes
 
         public SchemasIndex(IGrainFactory grainFactory)
         {
-            Guard.NotNull(grainFactory, nameof(grainFactory));
+            Guard.NotNull(grainFactory);
 
             this.grainFactory = grainFactory;
         }
diff --git a/backend/src/Squidex.Infrastructure/Collections/ArrayDictionary{TKey,TValue}.cs b/backend/src/Squidex.Infrastructure/Collections/ArrayDictionary{TKey,TValue}.cs
index 86a81a006..01a5e8184 100644
--- a/backend/src/Squidex.Infrastructure/Collections/ArrayDictionary{TKey,TValue}.cs
+++ b/backend/src/Squidex.Infrastructure/Collections/ArrayDictionary{TKey,TValue}.cs
@@ -58,8 +58,8 @@ namespace Squidex.Infrastructure.Collections
 
         public ArrayDictionary(IEqualityComparer<TKey> keyComparer, KeyValuePair<TKey, TValue>[] items)
         {
-            Guard.NotNull(items, nameof(items));
-            Guard.NotNull(keyComparer, nameof(keyComparer));
+            Guard.NotNull(items);
+            Guard.NotNull(keyComparer);
 
             this.items = items;