diff --git a/src/test/java/org/codelibs/fess/it/admin/AccessTokenTests.java b/src/test/java/org/codelibs/fess/it/admin/AccessTokenTests.java
index 901477d65..b41e6373b 100644
--- a/src/test/java/org/codelibs/fess/it/admin/AccessTokenTests.java
+++ b/src/test/java/org/codelibs/fess/it/admin/AccessTokenTests.java
@@ -84,9 +84,9 @@ public class AccessTokenTests extends CrudTestBase {
     protected void testCreate() {
         // Test: create setting api.
         for (int i = 0; i < NUM; i++) {
-            final String name = NAME_PREFIX + i;
+            final String keyProp = NAME_PREFIX + i;
             final Map<String, Object> requestBody = new HashMap<>();
-            requestBody.put("name", name);
+            requestBody.put(KEY_PROPERTY, keyProp);
             requestBody.put("permissions", "Radmin-api");
 
             checkPutMethod(requestBody, ITEM_ENDPOINT_SUFFIX).then().body("response.created", equalTo(true))
@@ -104,12 +104,12 @@ public class AccessTokenTests extends CrudTestBase {
         // Test: get settings api.
         final Map<String, Object> searchBody = new HashMap<>();
         searchBody.put("size", NUM * 2);
-        List<String> nameList = getPropList(searchBody, "name");
-        assertEquals(NUM, nameList.size());
+        List<String> propList = getPropList(searchBody, KEY_PROPERTY);
+        assertEquals(NUM, propList.size());
 
         for (int i = 0; i < NUM; i++) {
-            final String name = NAME_PREFIX + i;
-            assertTrue(nameList.contains(name), name);
+            final String prop = NAME_PREFIX + i;
+            assertTrue(propList.contains(prop), prop);
         }
 
         List<String> idList = getPropList(searchBody, "id");
@@ -117,7 +117,7 @@ public class AccessTokenTests extends CrudTestBase {
             // Test: get setting api
             checkGetMethod(searchBody, ITEM_ENDPOINT_SUFFIX + "/" + id).then()
                     .body("response." + ITEM_ENDPOINT_SUFFIX + ".id", equalTo(id))
-                    .body("response." + ITEM_ENDPOINT_SUFFIX + ".name", startsWith(NAME_PREFIX))
+                    .body("response." + ITEM_ENDPOINT_SUFFIX + "." + KEY_PROPERTY, startsWith(NAME_PREFIX))
                     .body("response." + ITEM_ENDPOINT_SUFFIX + ".token.length()", greaterThan(0));
         });
 
@@ -140,7 +140,7 @@ public class AccessTokenTests extends CrudTestBase {
         for (Map<String, Object> setting : settings) {
             final Map<String, Object> requestBody = new HashMap<>();
             requestBody.put("id", setting.get("id"));
-            requestBody.put("name", setting.get("name"));
+            requestBody.put(KEY_PROPERTY, setting.get(KEY_PROPERTY));
             requestBody.put("permissions", newPermission);
             requestBody.put("version_no", 1);
 
diff --git a/src/test/java/org/codelibs/fess/it/admin/BoostDocTests.java b/src/test/java/org/codelibs/fess/it/admin/BoostDocTests.java
index 0baf0ad13..6beb4a83f 100644
--- a/src/test/java/org/codelibs/fess/it/admin/BoostDocTests.java
+++ b/src/test/java/org/codelibs/fess/it/admin/BoostDocTests.java
@@ -78,8 +78,8 @@ public class BoostDocTests extends CrudTestBase {
         // Test: create setting api.
         for (int i = 0; i < NUM; i++) {
             final Map<String, Object> requestBody = new HashMap<>();
-            final String url_expr = NAME_PREFIX + i;
-            requestBody.put("url_expr", url_expr);
+            final String keyProp = NAME_PREFIX + i;
+            requestBody.put(KEY_PROPERTY, keyProp);
             requestBody.put("boost_expr", new Integer(i).toString());
             requestBody.put("sort_order", i);
 
@@ -98,7 +98,7 @@ public class BoostDocTests extends CrudTestBase {
         // Test: get settings api.
         final Map<String, Object> searchBody = new HashMap<>();
         searchBody.put("size", NUM * 2);
-        List<String> nameList = getPropList(searchBody, "url_expr");
+        List<String> nameList = getPropList(searchBody, KEY_PROPERTY);
 
         assertEquals(NUM, nameList.size());
         for (int i = 0; i < NUM; i++) {
@@ -111,7 +111,7 @@ public class BoostDocTests extends CrudTestBase {
             // Test: get setting api
             checkGetMethod(searchBody, ITEM_ENDPOINT_SUFFIX + "/" + id).then()
                     .body("response." + ITEM_ENDPOINT_SUFFIX + ".id", equalTo(id))
-                    .body("response." + ITEM_ENDPOINT_SUFFIX + ".url_expr", startsWith(NAME_PREFIX));
+                    .body("response." + ITEM_ENDPOINT_SUFFIX + "." + KEY_PROPERTY, startsWith(NAME_PREFIX));
         });
 
         // Test: paging
@@ -134,7 +134,7 @@ public class BoostDocTests extends CrudTestBase {
         for (Map<String, Object> setting : settings) {
             final Map<String, Object> requestBody = new HashMap<>();
             requestBody.put("id", setting.get("id"));
-            requestBody.put("url_expr", setting.get("url_expr"));
+            requestBody.put(KEY_PROPERTY, setting.get(KEY_PROPERTY));
             requestBody.put("boost_expr", newBoostExpr);
             requestBody.put("sort_order", setting.get("sort_order"));
             requestBody.put("version_no", 1);
diff --git a/src/test/java/org/codelibs/fess/it/admin/DataConfigTests.java b/src/test/java/org/codelibs/fess/it/admin/DataConfigTests.java
index c92f7a191..c8da0963a 100644
--- a/src/test/java/org/codelibs/fess/it/admin/DataConfigTests.java
+++ b/src/test/java/org/codelibs/fess/it/admin/DataConfigTests.java
@@ -78,9 +78,9 @@ public class DataConfigTests extends CrudTestBase {
         // Test: create setting api.
         for (int i = 0; i < NUM; i++) {
             final Map<String, Object> requestBody = new HashMap<>();
-            final String name = NAME_PREFIX + i;
+            final String keyProp = NAME_PREFIX + i;
+            requestBody.put(KEY_PROPERTY, keyProp);
             final String handlerName = "DatabaseDataStore";
-            requestBody.put("name", name);
             requestBody.put("handler_name", handlerName);
             requestBody.put("boost", i);
             requestBody.put("available", true);
@@ -137,7 +137,7 @@ public class DataConfigTests extends CrudTestBase {
         for (Map<String, Object> setting : settings) {
             final Map<String, Object> requestBody = new HashMap<>();
             requestBody.put("id", setting.get("id"));
-            requestBody.put("name", setting.get("name"));
+            requestBody.put(KEY_PROPERTY, setting.get(KEY_PROPERTY));
             requestBody.put("handler_name", newHandlerName);
             requestBody.put("boost", setting.get("boost"));
             requestBody.put("available", true);
diff --git a/src/test/java/org/codelibs/fess/it/admin/FileConfigTests.java b/src/test/java/org/codelibs/fess/it/admin/FileConfigTests.java
index eba7f7428..2a8c653b8 100644
--- a/src/test/java/org/codelibs/fess/it/admin/FileConfigTests.java
+++ b/src/test/java/org/codelibs/fess/it/admin/FileConfigTests.java
@@ -78,9 +78,9 @@ public class FileConfigTests extends CrudTestBase {
         // Test: create setting api.
         for (int i = 0; i < NUM; i++) {
             final Map<String, Object> requestBody = new HashMap<>();
-            final String name = NAME_PREFIX + i;
+            final String keyProp = NAME_PREFIX + i;
             final String paths = "file:///" + NAME_PREFIX + i;
-            requestBody.put("name", name);
+            requestBody.put(KEY_PROPERTY, keyProp);
             requestBody.put("paths", paths);
             requestBody.put("num_of_thread", 5);
             requestBody.put("interval_time", 1000);
@@ -103,12 +103,12 @@ public class FileConfigTests extends CrudTestBase {
         // Test: get settings api.
         final Map<String, Object> searchBody = new HashMap<>();
         searchBody.put("size", NUM * 2);
-        List<String> nameList = getPropList(searchBody, KEY_PROPERTY);
+        List<String> propList = getPropList(searchBody, KEY_PROPERTY);
 
-        assertEquals(NUM, nameList.size());
+        assertEquals(NUM, propList.size());
         for (int i = 0; i < NUM; i++) {
-            final String name = NAME_PREFIX + i;
-            assertTrue(nameList.contains(name), name);
+            final String prop = NAME_PREFIX + i;
+            assertTrue(propList.contains(prop), prop);
         }
 
         List<String> idList = getPropList(searchBody, "id");
@@ -140,7 +140,7 @@ public class FileConfigTests extends CrudTestBase {
             final Map<String, Object> requestBody = new HashMap<>();
 
             requestBody.put("id", setting.get("id"));
-            requestBody.put("name", setting.get("name"));
+            requestBody.put(KEY_PROPERTY, setting.get(KEY_PROPERTY));
             requestBody.put("paths", newPaths);
             requestBody.put("num_of_thread", setting.get("num_of_thread"));
             requestBody.put("interval_time", setting.get("interval_time"));
diff --git a/src/test/java/org/codelibs/fess/it/admin/WebConfigTests.java b/src/test/java/org/codelibs/fess/it/admin/WebConfigTests.java
index 48eabbe81..fe6c95073 100644
--- a/src/test/java/org/codelibs/fess/it/admin/WebConfigTests.java
+++ b/src/test/java/org/codelibs/fess/it/admin/WebConfigTests.java
@@ -78,9 +78,9 @@ public class WebConfigTests extends CrudTestBase {
         // Test: create setting api.
         for (int i = 0; i < NUM; i++) {
             final Map<String, Object> requestBody = new HashMap<>();
-            final String name = NAME_PREFIX + i;
+            final String keyProp = NAME_PREFIX + i;
             final String urls = "http://" + NAME_PREFIX + i;
-            requestBody.put("name", name);
+            requestBody.put(KEY_PROPERTY, keyProp);
             requestBody.put("urls", urls);
             requestBody.put("user_agent", "Mozilla/5.0");
             requestBody.put("num_of_thread", 5);
@@ -104,12 +104,12 @@ public class WebConfigTests extends CrudTestBase {
         // Test: get settings api.
         final Map<String, Object> searchBody = new HashMap<>();
         searchBody.put("size", NUM * 2);
-        List<String> nameList = getPropList(searchBody, KEY_PROPERTY);
+        List<String> propList = getPropList(searchBody, KEY_PROPERTY);
 
-        assertEquals(NUM, nameList.size());
+        assertEquals(NUM, propList.size());
         for (int i = 0; i < NUM; i++) {
-            final String name = NAME_PREFIX + i;
-            assertTrue(nameList.contains(name), name);
+            final String prop = NAME_PREFIX + i;
+            assertTrue(propList.contains(prop), prop);
         }
 
         List<String> idList = getPropList(searchBody, "id");
@@ -141,7 +141,7 @@ public class WebConfigTests extends CrudTestBase {
             final Map<String, Object> requestBody = new HashMap<>();
 
             requestBody.put("id", setting.get("id"));
-            requestBody.put("name", setting.get("name"));
+            requestBody.put(KEY_PROPERTY, setting.get(KEY_PROPERTY));
             requestBody.put("urls", newUrls);
             requestBody.put("user_agent", setting.get("user_agent"));
             requestBody.put("num_of_thread", setting.get("num_of_thread"));