diff --git a/src/Squidex.Domain.Apps.Core/Schemas/AssetsField.cs b/src/Squidex.Domain.Apps.Core/Schemas/AssetsField.cs
index ec4743d14..dbf11c480 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/AssetsField.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/AssetsField.cs
@@ -72,7 +72,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return value.ToObject<List<Guid>>();
         }
 
-        public override T Visit<T>(IFieldVisitor<T> visitor)
+        public override T Accept<T>(IFieldVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/AssetsFieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/AssetsFieldProperties.cs
index 15aa36b17..10514d06d 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/AssetsFieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/AssetsFieldProperties.cs
@@ -50,7 +50,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return new JArray();
         }
 
-        public override T Visit<T>(IFieldPropertiesVisitor<T> visitor)
+        public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/BooleanField.cs b/src/Squidex.Domain.Apps.Core/Schemas/BooleanField.cs
index a4279b5fd..1065703c1 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/BooleanField.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/BooleanField.cs
@@ -37,7 +37,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return (bool?)value;
         }
 
-        public override T Visit<T>(IFieldVisitor<T> visitor)
+        public override T Accept<T>(IFieldVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/BooleanFieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/BooleanFieldProperties.cs
index 1f06cb821..b69d9b09b 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/BooleanFieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/BooleanFieldProperties.cs
@@ -50,7 +50,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return DefaultValue;
         }
 
-        public override T Visit<T>(IFieldPropertiesVisitor<T> visitor)
+        public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs b/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs
index 1f3133b51..4c6480c11 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs
@@ -57,7 +57,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             throw new InvalidCastException("Invalid json type, expected string.");
         }
 
-        public override T Visit<T>(IFieldVisitor<T> visitor)
+        public override T Accept<T>(IFieldVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/DateTimeFieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/DateTimeFieldProperties.cs
index 8bd5ee54f..d920b9d2e 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/DateTimeFieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/DateTimeFieldProperties.cs
@@ -108,7 +108,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             }
         }
 
-        public override T Visit<T>(IFieldPropertiesVisitor<T> visitor)
+        public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/Edm/EdmTypeVisitor.cs b/src/Squidex.Domain.Apps.Core/Schemas/Edm/EdmTypeVisitor.cs
index 9918b6936..324abf782 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/Edm/EdmTypeVisitor.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/Edm/EdmTypeVisitor.cs
@@ -20,7 +20,7 @@ namespace Squidex.Domain.Apps.Core.Schemas.Edm
 
         public static IEdmTypeReference CreateEdmType(Field field)
         {
-            return field.Visit(Instance);
+            return field.Accept(Instance);
         }
 
         public IEdmTypeReference Visit(AssetsField field)
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/Field.cs b/src/Squidex.Domain.Apps.Core/Schemas/Field.cs
index 5ceca2e45..b6b25e8cd 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/Field.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/Field.cs
@@ -126,6 +126,6 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return UpdateInternal(newProperties);
         }
 
-        public abstract T Visit<T>(IFieldVisitor<T> visitor);
+        public abstract T Accept<T>(IFieldVisitor<T> visitor);
     }
 }
\ No newline at end of file
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/FieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/FieldProperties.cs
index c5e2a43c9..ff52f7970 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/FieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/FieldProperties.cs
@@ -61,7 +61,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
 
         public abstract JToken GetDefaultValue();
 
-        public abstract T Visit<T>(IFieldPropertiesVisitor<T> visitor);
+        public abstract T Accept<T>(IFieldPropertiesVisitor<T> visitor);
 
         public virtual bool ShouldApplyDefaultValue(JToken value)
         {
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/GeolocationField.cs b/src/Squidex.Domain.Apps.Core/Schemas/GeolocationField.cs
index 92048ba50..e44b6cbfb 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/GeolocationField.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/GeolocationField.cs
@@ -56,7 +56,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return value;
         }
 
-        public override T Visit<T>(IFieldVisitor<T> visitor)
+        public override T Accept<T>(IFieldVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/GeolocationFieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/GeolocationFieldProperties.cs
index c597d6dc4..73ece9c7a 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/GeolocationFieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/GeolocationFieldProperties.cs
@@ -35,7 +35,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return null;
         }
 
-        public override T Visit<T>(IFieldPropertiesVisitor<T> visitor)
+        public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/JsonField.cs b/src/Squidex.Domain.Apps.Core/Schemas/JsonField.cs
index 39ed16ff6..6a97a2dec 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/JsonField.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/JsonField.cs
@@ -37,7 +37,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return value;
         }
 
-        public override T Visit<T>(IFieldVisitor<T> visitor)
+        public override T Accept<T>(IFieldVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/JsonFieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/JsonFieldProperties.cs
index a7e1c93d1..1bd0cc8b4 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/JsonFieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/JsonFieldProperties.cs
@@ -19,7 +19,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return JValue.CreateNull();
         }
 
-        public override T Visit<T>(IFieldPropertiesVisitor<T> visitor)
+        public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/JsonSchema/JsonSchemaExtensions.cs b/src/Squidex.Domain.Apps.Core/Schemas/JsonSchema/JsonSchemaExtensions.cs
index b08c7430c..e0e3f0b92 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/JsonSchema/JsonSchemaExtensions.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/JsonSchema/JsonSchemaExtensions.cs
@@ -33,7 +33,7 @@ namespace Squidex.Domain.Apps.Core.Schemas.JsonSchema
 
                 foreach (var partitionItem in partition)
                 {
-                    var partitionItemProperty = field.Visit(jsonTypeVisitor);
+                    var partitionItemProperty = field.Accept(jsonTypeVisitor);
 
                     partitionItemProperty.Description = partitionItem.Name;
                     partitionObject.Properties.Add(partitionItem.Key, partitionItemProperty);
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/NumberField.cs b/src/Squidex.Domain.Apps.Core/Schemas/NumberField.cs
index 8bddd6143..96abc8ae8 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/NumberField.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/NumberField.cs
@@ -43,7 +43,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             }
         }
 
-        public override T Visit<T>(IFieldVisitor<T> visitor)
+        public override T Accept<T>(IFieldVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/NumberFieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/NumberFieldProperties.cs
index 931646988..9accc9015 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/NumberFieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/NumberFieldProperties.cs
@@ -96,7 +96,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return DefaultValue;
         }
 
-        public override T Visit<T>(IFieldPropertiesVisitor<T> visitor)
+        public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/ReferencesField.cs b/src/Squidex.Domain.Apps.Core/Schemas/ReferencesField.cs
index 6e108e0cb..1d7111259 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/ReferencesField.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/ReferencesField.cs
@@ -80,7 +80,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return value.ToObject<List<Guid>>();
         }
 
-        public override T Visit<T>(IFieldVisitor<T> visitor)
+        public override T Accept<T>(IFieldVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/ReferencesFieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/ReferencesFieldProperties.cs
index 55a17006f..1ff1ffd58 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/ReferencesFieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/ReferencesFieldProperties.cs
@@ -66,7 +66,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return new JArray();
         }
 
-        public override T Visit<T>(IFieldPropertiesVisitor<T> visitor)
+        public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/StringField.cs b/src/Squidex.Domain.Apps.Core/Schemas/StringField.cs
index 689ecd51b..f14a3559e 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/StringField.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/StringField.cs
@@ -53,7 +53,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return value.ToString();
         }
 
-        public override T Visit<T>(IFieldVisitor<T> visitor)
+        public override T Accept<T>(IFieldVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/StringFieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/StringFieldProperties.cs
index 859e66ca1..5351ed8b6 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/StringFieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/StringFieldProperties.cs
@@ -132,7 +132,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
             return value.IsNull() || (value is JValue jValue && Equals(jValue.Value, string.Empty));
         }
 
-        public override T Visit<T>(IFieldPropertiesVisitor<T> visitor)
+        public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
         {
             return visitor.Visit(this);
         }
diff --git a/src/Squidex.Domain.Apps.Write/Schemas/Guards/FieldPropertiesValidator.cs b/src/Squidex.Domain.Apps.Write/Schemas/Guards/FieldPropertiesValidator.cs
index a6decb9df..51ea08937 100644
--- a/src/Squidex.Domain.Apps.Write/Schemas/Guards/FieldPropertiesValidator.cs
+++ b/src/Squidex.Domain.Apps.Write/Schemas/Guards/FieldPropertiesValidator.cs
@@ -22,7 +22,7 @@ namespace Squidex.Domain.Apps.Write.Schemas.Guards
 
         public static IEnumerable<ValidationError> Validate(FieldProperties properties)
         {
-            return properties.Visit(Instance);
+            return properties.Accept(Instance);
         }
 
         public IEnumerable<ValidationError> Visit(AssetsFieldProperties properties)
diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Schemas/FieldRegistryTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Schemas/FieldRegistryTests.cs
index ac0b861b3..07e486749 100644
--- a/tests/Squidex.Domain.Apps.Core.Tests/Schemas/FieldRegistryTests.cs
+++ b/tests/Squidex.Domain.Apps.Core.Tests/Schemas/FieldRegistryTests.cs
@@ -24,7 +24,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
                 return null;
             }
 
-            public override T Visit<T>(IFieldPropertiesVisitor<T> visitor)
+            public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
             {
                 return default(T);
             }
diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Schemas/SchemaTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Schemas/SchemaTests.cs
index 54f27eb8c..314df79a0 100644
--- a/tests/Squidex.Domain.Apps.Core.Tests/Schemas/SchemaTests.cs
+++ b/tests/Squidex.Domain.Apps.Core.Tests/Schemas/SchemaTests.cs
@@ -30,7 +30,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
                 return null;
             }
 
-            public override T Visit<T>(IFieldPropertiesVisitor<T> visitor)
+            public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
             {
                 return default(T);
             }