diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ValueConverters.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ValueConverters.cs
index 88c910587..ab9affe46 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ValueConverters.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ValueConverters.cs
@@ -55,7 +55,7 @@ namespace Squidex.Domain.Apps.Core.ConvertContent
         {
             return (value, field, parent) =>
             {
-                if (field is IField<JsonFieldProperties> && value is JsonScalar<string> s)
+                if (field is IField<JsonFieldProperties> && value is JsonString s)
                 {
                     var decoded = Encoding.UTF8.GetString(Convert.FromBase64String(s.Value));
 
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/DefaultValues/DefaultValueGenerator.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/DefaultValues/DefaultValueGenerator.cs
index 80c2d6275..11c66c239 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/DefaultValues/DefaultValueGenerator.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/DefaultValues/DefaultValueGenerator.cs
@@ -72,7 +72,7 @@ namespace Squidex.Domain.Apps.Core.DefaultValues
 
         private static bool ShouldApplyDefaultValue(IField field, IJsonValue value)
         {
-            return value.Type == JsonValueType.Null || (field is IField<StringFieldProperties> && value is JsonScalar<string> s && string.IsNullOrEmpty(s.Value));
+            return value.Type == JsonValueType.Null || (field is IField<StringFieldProperties> && value is JsonString s && string.IsNullOrEmpty(s.Value));
         }
     }
 }
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/JsonMapper.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/JsonMapper.cs
index 588c70d82..791fa1a4f 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/JsonMapper.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/JsonMapper.cs
@@ -26,11 +26,11 @@ namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper
             {
                 case JsonNull _:
                     return JsValue.Null;
-                case JsonScalar<string> s:
+                case JsonString s:
                     return new JsString(s.Value);
-                case JsonScalar<bool> b:
+                case JsonBoolean b:
                     return new JsBoolean(b.Value);
-                case JsonScalar<double> b:
+                case JsonNumber b:
                     return new JsNumber(b.Value);
                 case JsonObject obj:
                     return FromObject(obj, engine);
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs
index 8b1f4ac86..ee50150f4 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs
@@ -50,7 +50,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent
 
         public (object? Result, JsonError? Error) Visit(IField<BooleanFieldProperties> field)
         {
-            if (value is JsonScalar<bool> b)
+            if (value is JsonBoolean b)
             {
                 return (b.Value, null);
             }
@@ -60,7 +60,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent
 
         public (object? Result, JsonError? Error) Visit(IField<NumberFieldProperties> field)
         {
-            if (value is JsonScalar<double> n)
+            if (value is JsonNumber n)
             {
                 return (n.Value, null);
             }
@@ -70,7 +70,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent
 
         public (object? Result, JsonError? Error) Visit(IField<StringFieldProperties> field)
         {
-            if (value is JsonScalar<string> s)
+            if (value is JsonString s)
             {
                 return (s.Value, null);
             }
@@ -113,7 +113,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent
                     }
                 }
 
-                if (geolocation.TryGetValue("latitude", out var latValue) && latValue is JsonScalar<double> latNumber)
+                if (geolocation.TryGetValue("latitude", out var latValue) && latValue is JsonNumber latNumber)
                 {
                     var lat = latNumber.Value;
 
@@ -127,7 +127,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent
                     return (null, new JsonError("Invalid json type, expected latitude/longitude object."));
                 }
 
-                if (geolocation.TryGetValue("longitude", out var lonValue) && lonValue is JsonScalar<double> lonNumber)
+                if (geolocation.TryGetValue("longitude", out var lonValue) && lonValue is JsonNumber lonNumber)
                 {
                     var lon = lonNumber.Value;
 
@@ -160,7 +160,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent
 
                 foreach (var item in array)
                 {
-                    if (item is JsonScalar<string> s && Guid.TryParse(s.Value, out var guid))
+                    if (item is JsonString s && Guid.TryParse(s.Value, out var guid))
                     {
                         result.Add(guid);
                     }
@@ -188,7 +188,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent
                     {
                         result.Add(null);
                     }
-                    else if (item is JsonScalar<string> s)
+                    else if (item is JsonString s)
                     {
                         result.Add(s.Value);
                     }