diff --git a/TaskStatus.png b/TaskStatus.png
index 43ca319..8c9c1eb 100644
--- a/TaskStatus.png
+++ b/TaskStatus.png
Binary files differ
diff --git a/TaskStatus.pu b/TaskStatus.pu
index 6f9a286..ccf4028 100644
--- a/TaskStatus.pu
+++ b/TaskStatus.pu
@@ -9,32 +9,32 @@
 state "NG" as NG #red {
 }
 
-state "予約済み" as RESERVED #yellow {
-	RESERVED : 編集者
+state "担当登録済み" as RESERVED #yellow {
+	RESERVED : 担当者
 }
 
 state "インポート済み" as IMPORTED #lightgreen {
-	IMPORTED : 編集者
+	IMPORTED : 担当者
 	IMPORTED : 変更セットNo
 }
 
 state "完了" as END #green {
-	END : 編集者
+	END : 担当者
 	END : 変更セットNo
 	END : 検証者
 }
 
 [*] --> PREPARATION
 PREPARATION --> ACCEPTING
-ACCEPTING --> RESERVED	: タスク予約
-NG --> RESERVED	: タスク予約
+ACCEPTING --> RESERVED	: 担当登録
+NG --> RESERVED	: 担当登録
 ACCEPTING --> IMPORTED	: 編集完了
 NG --> IMPORTED	: 編集完了
 RESERVED --> IMPORTED	: 編集完了
 IMPORTED --> IMPORTED	: 編集完了
-ACCEPTING <- RESERVED	: タスク予約取消
+ACCEPTING <- RESERVED	: 担当取消
 
-IMPORTED --> END	: 検証結果[OK]
-NG <- IMPORTED		: 検証結果[NG]
+IMPORTED --> END	: 検証[OK]
+NG <- IMPORTED		: 検証[NG]
 
 @enduml
\ No newline at end of file
diff --git a/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java b/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java
index 57ba70a..51b90fd 100644
--- a/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java
+++ b/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java
@@ -13,7 +13,6 @@
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 import lombok.RequiredArgsConstructor;
-import osm.surveyor.task.util.Role;
 
 @RequiredArgsConstructor
 @Configuration
diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties
index d927716..3459ea0 100644
--- a/src/main/resources/i18n/messages.properties
+++ b/src/main/resources/i18n/messages.properties
@@ -18,6 +18,7 @@
 operation = operation
 username = mapper
 changeSet = change set
+editor = editor
 validator = validator
 status = status
 citycode = city code
diff --git a/src/main/resources/i18n/messages_ja.properties b/src/main/resources/i18n/messages_ja.properties
index 5e55307..b7b231f 100644
--- a/src/main/resources/i18n/messages_ja.properties
+++ b/src/main/resources/i18n/messages_ja.properties
@@ -24,14 +24,15 @@
 path = ファイル
 updateTime = 更新日時
 changeSet = 変更セット
+editor = 担当者
 validator = 検証者
 comment = コメント
 
 # operation
 download = ダウンロード
 return = 戻る
-reserve = タスク予約
-cancel = タスク予約取消
+reserve = 担当登録
+cancel = 担当取消
 done = 編集完了
 NG = 検証(NG)
 OK = 検証(OK)
diff --git a/src/main/resources/templates/meshes.html b/src/main/resources/templates/meshes.html
index fe27902..f04e2e3 100644
--- a/src/main/resources/templates/meshes.html
+++ b/src/main/resources/templates/meshes.html
@@ -50,7 +50,7 @@
                       <th th:text="#{meshcode}"></th>
                       <th>version</th>
                       <th th:text="#{path}"></th>
-                      <th th:text="#{username}"></th>
+                      <th th:text="#{editor}"></th>
                       <th th:text="#{validator}"></th>                      
                       <th th:text="#{operation}"></th>
                     </tr>
diff --git a/src/main/resources/templates/meshlist.html b/src/main/resources/templates/meshlist.html
index c5ec6ff..32f71cd 100644
--- a/src/main/resources/templates/meshlist.html
+++ b/src/main/resources/templates/meshlist.html
@@ -36,7 +36,7 @@
                       <th th:text="#{meshcode}"></th>
                       <th>version</th>
                       <th th:text="#{path}"></th>
-                      <th th:text="#{username}"></th>
+                      <th th:text="#{editor}"></th>
                       <th th:text="#{validator}"></th>
                       <th th:text="#{operation}"></th>
                     </tr>
diff --git a/src/main/resources/templates/task.html b/src/main/resources/templates/task.html
index 2a25d43..1ee5b76 100644
--- a/src/main/resources/templates/task.html
+++ b/src/main/resources/templates/task.html
@@ -62,7 +62,7 @@
                       <td></td>
                     </tr>
                     <tr>
-                      <td th:text="#{username}"></td>
+                      <td th:text="#{editor}"></td>
                       <td><a th:text="*{username}" th:href="@{https://www.openstreetmap.org/user/{user}(user=*{username})}"></a></td>
                       <td></td>
                     </tr>
diff --git a/src/main/resources/templates/task_done.html b/src/main/resources/templates/task_done.html
index c64429f..8128162 100644
--- a/src/main/resources/templates/task_done.html
+++ b/src/main/resources/templates/task_done.html
@@ -62,7 +62,7 @@
                       <td></td>
                     </tr>
                     <tr>
-                      <td th:text="#{username}"></td>
+                      <td th:text="#{editor}"></td>
                       <td th:text="*{username}"></td>
                       <td></td>
                     </tr>
diff --git a/src/main/resources/templates/task_valid.html b/src/main/resources/templates/task_valid.html
index 9870514..92008cc 100644
--- a/src/main/resources/templates/task_valid.html
+++ b/src/main/resources/templates/task_valid.html
@@ -62,7 +62,7 @@
                       <td></td>
                     </tr>
                     <tr>
-                      <td th:text="#{username}"></td>
+                      <td th:text="#{editor}"></td>
                       <td th:text="*{username}"></td>
                       <td></td>
                     </tr>
diff --git a/src/main/resources/templates/tasks.html b/src/main/resources/templates/tasks.html
index 1da71f1..8b3b24f 100644
--- a/src/main/resources/templates/tasks.html
+++ b/src/main/resources/templates/tasks.html
@@ -98,7 +98,7 @@
                     <tr>
                       <th th:text="#{updateTime}"></th>
                       <th th:text="#{status}"></th>
-                      <th th:text="#{username}"></th>
+                      <th th:text="#{editor}"></th>
                       <th th:text="#{changeSet}"></th>
                       <th th:text="#{validator}"></th>
                       <th th:text="#{operation}"></th>