diff --git a/src/main/java/org/redkale/convert/json/JsonArray.java b/src/main/java/org/redkale/convert/json/JsonArray.java
index 652af01a1..3f4c73927 100644
--- a/src/main/java/org/redkale/convert/json/JsonArray.java
+++ b/src/main/java/org/redkale/convert/json/JsonArray.java
@@ -17,7 +17,7 @@ import org.redkale.util.*;
  * @author zhangjx
  * @since 2.8.0
  */
-public class JsonArray extends ArrayList<Object> implements JsonEntity {
+public class JsonArray extends ArrayList<Object> implements JsonElement {
 
     public JsonArray() {
     }
diff --git a/src/main/java/org/redkale/convert/json/JsonEntity.java b/src/main/java/org/redkale/convert/json/JsonElement.java
similarity index 56%
rename from src/main/java/org/redkale/convert/json/JsonEntity.java
rename to src/main/java/org/redkale/convert/json/JsonElement.java
index 25097a5c8..10bbaca1f 100644
--- a/src/main/java/org/redkale/convert/json/JsonEntity.java
+++ b/src/main/java/org/redkale/convert/json/JsonElement.java
@@ -14,7 +14,7 @@ import org.redkale.util.Utility;
  * @author zhangjx
  * @since 2.8.0
  */
-public interface JsonEntity extends java.io.Serializable {
+public interface JsonElement extends java.io.Serializable {
 
     public boolean isObject();
 
@@ -22,20 +22,20 @@ public interface JsonEntity extends java.io.Serializable {
 
     public boolean isString();
 
-    public static JsonEntity convertFrom(String text) {
+    public static JsonElement convertFrom(String text) {
         return convertFrom(Utility.charArray(text));
     }
 
-    public static JsonEntity convertFrom(char[] text) {
+    public static JsonElement convertFrom(char[] text) {
         return convertFrom(text, 0, text.length);
     }
 
-    public static JsonEntity convertFrom(char[] text, final int offset, final int length) {
-        Object val = JsonConvert.root().convertFrom(JsonEntity.class, text, offset, length);
+    public static JsonElement convertFrom(char[] text, final int offset, final int length) {
+        Object val = JsonConvert.root().convertFrom(JsonElement.class, text, offset, length);
         if (val instanceof CharSequence) {
             return new JsonString(val.toString());
         }
-        return (JsonEntity) val;
+        return (JsonElement) val;
     }
 
 }
diff --git a/src/main/java/org/redkale/convert/json/JsonEntityDecoder.java b/src/main/java/org/redkale/convert/json/JsonElementDecoder.java
similarity index 59%
rename from src/main/java/org/redkale/convert/json/JsonEntityDecoder.java
rename to src/main/java/org/redkale/convert/json/JsonElementDecoder.java
index 392ab51ce..1e4246033 100644
--- a/src/main/java/org/redkale/convert/json/JsonEntityDecoder.java
+++ b/src/main/java/org/redkale/convert/json/JsonElementDecoder.java
@@ -18,26 +18,26 @@ import org.redkale.util.*;
  * @author zhangjx
  * @since 2.8.0
  */
-class JsonEntityDecoder extends AnyDecoder<JsonEntity> {
+class JsonElementDecoder extends AnyDecoder<JsonElement> {
 
-    private static final Type arrayType = new TypeToken<Collection<JsonEntity>>() {
+    private static final Type arrayType = new TypeToken<Collection<JsonElement>>() {
     }.getType();
 
-    private static final Type objectType = new TypeToken<Map<String, JsonEntity>>() {
+    private static final Type objectType = new TypeToken<Map<String, JsonElement>>() {
     }.getType();
 
-    private static final Creator<JsonArray> arrayCreator = Creator.create(JsonArray.class);
+    private static final Creator<JsonArray> arrayCreator = t -> new JsonArray();
 
-    private static final Creator<JsonObject> objectCreator = Creator.create(JsonObject.class);
+    private static final Creator<JsonObject> objectCreator = t -> new JsonObject();
 
-    public static final JsonEntityDecoder instance = new JsonEntityDecoder();
+    public static final JsonElementDecoder instance = new JsonElementDecoder();
 
-    public JsonEntityDecoder() {
+    public JsonElementDecoder() {
         super(objectCreator, objectType, arrayCreator, arrayType, StringSimpledCoder.instance);
     }
 
     @Override
     public Type getType() {
-        return JsonEntity.class;
+        return JsonElement.class;
     }
 }
diff --git a/src/main/java/org/redkale/convert/json/JsonFactory.java b/src/main/java/org/redkale/convert/json/JsonFactory.java
index c5b66da7b..393f9e519 100644
--- a/src/main/java/org/redkale/convert/json/JsonFactory.java
+++ b/src/main/java/org/redkale/convert/json/JsonFactory.java
@@ -49,10 +49,10 @@ public final class JsonFactory extends ConvertFactory<JsonReader, JsonWriter> {
             this.register(java.time.LocalTime.class, LocalTimeSimpledCoder.LocalTimeJsonSimpledCoder.instance);
             this.register(java.time.LocalDateTime.class, LocalDateTimeSimpledCoder.LocalDateTimeJsonSimpledCoder.instance);
 
-            this.register(JsonEntity.class, (Decodeable) JsonEntityDecoder.instance);
-            this.register(JsonString.class, (Decodeable) JsonEntityDecoder.instance);
-            this.register(JsonObject.class, (Decodeable) JsonEntityDecoder.instance);
-            this.register(JsonArray.class, (Decodeable) JsonEntityDecoder.instance);
+            this.register(JsonElement.class, (Decodeable) JsonElementDecoder.instance);
+            this.register(JsonString.class, (Decodeable) JsonElementDecoder.instance);
+            this.register(JsonObject.class, (Decodeable) JsonElementDecoder.instance);
+            this.register(JsonArray.class, (Decodeable) JsonElementDecoder.instance);
         }
     }
 
diff --git a/src/main/java/org/redkale/convert/json/JsonObject.java b/src/main/java/org/redkale/convert/json/JsonObject.java
index f9c7cc676..764548292 100644
--- a/src/main/java/org/redkale/convert/json/JsonObject.java
+++ b/src/main/java/org/redkale/convert/json/JsonObject.java
@@ -17,7 +17,7 @@ import org.redkale.util.*;
  * @author zhangjx
  * @since 2.8.0
  */
-public class JsonObject extends LinkedHashMap<String, Object> implements JsonEntity {
+public class JsonObject extends LinkedHashMap<String, Object> implements JsonElement {
 
     public JsonObject() {
     }
diff --git a/src/main/java/org/redkale/convert/json/JsonString.java b/src/main/java/org/redkale/convert/json/JsonString.java
index 6dfe51fda..153d56e2c 100644
--- a/src/main/java/org/redkale/convert/json/JsonString.java
+++ b/src/main/java/org/redkale/convert/json/JsonString.java
@@ -14,7 +14,7 @@ import org.redkale.convert.ConvertDisabled;
  * @author zhangjx
  * @since 2.8.0
  */
-public class JsonString implements CharSequence, JsonEntity, Comparable<JsonString> {
+public class JsonString implements CharSequence, JsonElement, Comparable<JsonString> {
 
     private String value;