diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index 314523980..4adc37297 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -116,7 +116,7 @@
          **/
         function procInsertComment() {
             // 댓글 입력에 필요한 데이터 추출
-            $obj = Context::gets('document_srl','comment_srl','parent_srl','content','password','nick_name','user_name','member_srl','email_address','homepage');
+            $obj = Context::gets('document_srl','comment_srl','parent_srl','content','password','nick_name','nick_name','member_srl','email_address','homepage');
             $obj->module_srl = $this->module_srl;
 
             // comment 모듈의 model 객체 생성
diff --git a/modules/board/skins/default/comment_form.html b/modules/board/skins/default/comment_form.html
index a2a4a2c44..874bdfe75 100644
--- a/modules/board/skins/default/comment_form.html
+++ b/modules/board/skins/default/comment_form.html
@@ -17,8 +17,8 @@
       <td>{$source_comment->regdate}</td>
     </tr>
     <tr>
-      <th>{$lang->user_name}</th>
-      <td>{$source_comment->user_name}</td>
+      <th>{$lang->writer}</th>
+      <td><div class="member_{$source_comment->member_srl}"><a href="#">{$source_comment->nick_name}</a></div></td>
     </tr>
     <tr>
       <th>{$lang->content}</th>
@@ -40,8 +40,8 @@
   <col width="*" />
   <!--@if(!$is_logged)-->
   <tr>
-    <th>{$lang->user_name}</th>
-    <td><input type="text" name="user_name" value="{$comment->user_name}" /></td>
+    <th>{$lang->writer}</th>
+    <td><input type="text" name="nick_name" value="{$comment->nick_name}" /></td>
   </tr>
   <tr>
     <th>{$lang->password}</th>
diff --git a/modules/board/skins/default/filter/insert.xml b/modules/board/skins/default/filter/insert.xml
index 7e7970c5a..b5ab69376 100644
--- a/modules/board/skins/default/filter/insert.xml
+++ b/modules/board/skins/default/filter/insert.xml
@@ -1,7 +1,7 @@
 <filter name="insert" module="board" act="procInsertDocument" confirm_msg_code="confirm_submit">
   <form>
     <node target="document_srl" required="true" />
-    <node target="user_name" required="true" />
+    <node target="nick_name" required="true" />
     <node target="password" required="true" />
     <node target="email_address" maxlength="250" />
     <node target="homepage" maxlength="250"/>
diff --git a/modules/board/skins/default/filter/insert_comment.xml b/modules/board/skins/default/filter/insert_comment.xml
index 4f156424f..da7c77ef5 100644
--- a/modules/board/skins/default/filter/insert_comment.xml
+++ b/modules/board/skins/default/filter/insert_comment.xml
@@ -1,7 +1,7 @@
 <filter name="insert_comment" module="board" act="procInsertComment" confirm_msg_code="confirm_submit">
   <form>
     <node target="document_srl" required="true" />
-    <node target="user_name" required="true" />
+    <node target="nick_name" required="true" />
     <node target="password" required="true" />
     <node target="email_address" maxlength="250" />
     <node target="homepage" maxlength="250"/>
@@ -12,7 +12,7 @@
     <param name="document_srl" target="document_srl" />
     <param name="comment_srl" target="comment_srl" />
     <param name="parent_srl" target="parent_srl" />
-    <param name="user_name" target="user_name" />
+    <param name="nick_name" target="nick_name" />
     <param name="password" target="password" />
     <param name="email_address" target="email_address" />
     <param name="homepage" target="homepage" />
diff --git a/modules/board/skins/default/write_form.html b/modules/board/skins/default/write_form.html
index d25ff6b4f..0b87f65e2 100644
--- a/modules/board/skins/default/write_form.html
+++ b/modules/board/skins/default/write_form.html
@@ -23,8 +23,8 @@
 
   <!--@if(!$is_logged)-->
   <tr>
-    <th>{$lang->user_name}</th>
-    <td><input type="text" name="user_name" value="{$document->user_name}" /></td>
+    <th>{$lang->writer}</th>
+    <td><input type="text" name="nick_name" value="{$document->nick_name}" /></td>
   </tr>
   <tr>
     <th>{$lang->password}</th>
diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index e31d2976e..65786afc3 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -113,8 +113,8 @@
                 }
             }
 
-            // 로그인한 유저가 작성한 글인데 user_name이 없을 경우
-            if($source_obj->member_srl && !$obj->user_name) {
+            // 로그인한 유저가 작성한 글인데 nick_name이 없을 경우
+            if($source_obj->member_srl && !$obj->nick_name) {
                 $obj->member_srl = $source_obj->member_srl;
                 $obj->user_name = $source_obj->user_name;
                 $obj->nick_name = $source_obj->nick_name;
diff --git a/modules/comment/queries/insertComment.xml b/modules/comment/queries/insertComment.xml
index ac70cc883..664b9cd3c 100644
--- a/modules/comment/queries/insertComment.xml
+++ b/modules/comment/queries/insertComment.xml
@@ -9,8 +9,8 @@
     <column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
     <column name="content" var="content" notnull="notnull" minlength="2" maxlength="250" />
     <column name="password" var="password" minlength="2" maxlength="60" />
-    <column name="nick_name" var="nick_name" minlength="2" maxlength="40" />
-    <column name="user_name" var="user_name" default="" minlength="1" maxlength="80" />
+    <column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
+    <column name="user_name" var="user_name" default="" />
     <column name="member_srl" var="member_srl" default="0" filter="number" />
     <column name="email_address" var="email_address" filter="email" maxlength="250" />
     <column name="homepage" var="homepage" filter="homepage" maxlength="250" />
diff --git a/modules/comment/queries/updateComment.xml b/modules/comment/queries/updateComment.xml
index b3821ac75..81c3180bc 100644
--- a/modules/comment/queries/updateComment.xml
+++ b/modules/comment/queries/updateComment.xml
@@ -7,8 +7,8 @@
     <column name="parent_srl" var="parent_srl" filter="number" default="0" />
     <column name="content" var="content" notnull="notnull" minlength="2" maxlength="250" />
     <column name="password" var="password" minlength="2" maxlength="60" />
-    <column name="user_name" var="user_name" default="" minlength="1" maxlength="80" />
-    <column name="nick_name" var="nick_name" minlength="2" maxlength="40" />
+    <column name="user_name" var="user_name" default="" />
+    <column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
     <column name="email_address" var="email_address" filter="email" maxlength="250" />
     <column name="homepage" var="homepage" filter="homepage" maxlength="250" />
     <column name="uploaded_count" var="uploaded_count" default="0" />
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 67ab168d1..32b2c73af 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -152,8 +152,8 @@
                 }
             }
 
-            // 로그인한 유저가 작성한 글인데 user_name이 없을 경우
-            if($source_obj->member_srl && !$obj->user_name) {
+            // 로그인한 유저가 작성한 글인데 nick_name이 없을 경우
+            if($source_obj->member_srl && !$obj->nick_name) {
                 $obj->member_srl = $source_obj->member_srl;
                 $obj->user_name = $source_obj->user_name;
                 $obj->nick_name = $source_obj->nick_name;
diff --git a/modules/document/queries/insertDocument.xml b/modules/document/queries/insertDocument.xml
index 08c0d48eb..65bdbe827 100644
--- a/modules/document/queries/insertDocument.xml
+++ b/modules/document/queries/insertDocument.xml
@@ -16,9 +16,9 @@
     <column name="trackback_count" var="voted_count" default="0" />
     <column name="uploaded_count" var="uploaded_count" default="0" />
     <column name="password" var="password" minlength="2" maxlength="60" />
-    <column name="nick_name" var="nick_name" minlength="2" maxlength="40" />
+    <column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
     <column name="member_srl" var="member_srl" default="0" filter="number" />
-    <column name="user_name" var="user_name" default="" minlength="1" maxlength="80" />
+    <column name="user_name" var="user_name" default="" />
     <column name="email_address" var="email_address" filter="email" maxlength="250" />
     <column name="homepage" var="homepage" filter="homepage" maxlength="250" />
     <column name="tags" var="tags" />
diff --git a/modules/document/queries/updateDocument.xml b/modules/document/queries/updateDocument.xml
index 43d89bc00..3064bd6d7 100644
--- a/modules/document/queries/updateDocument.xml
+++ b/modules/document/queries/updateDocument.xml
@@ -11,9 +11,9 @@
     <column name="content" var="content" notnull="notnull" minlength="2" maxlength="250" />
     <column name="uploaded_count" var="uploaded_count" default="0" />
     <column name="password" var="password" minlength="2" maxlength="60" />
-    <column name="nick_name" var="nick_name" minlength="2" maxlength="40" />
+    <column name="nick_name" var="nick_name" minlength="1" maxlength="40" notnull="notnull" />
     <column name="member_srl" var="member_srl" default="0" filter="number" />
-    <column name="user_name" var="user_name" default="" minlength="1" maxlength="80" />
+    <column name="user_name" var="user_name" default="" />
     <column name="email_address" var="email_address" filter="email" maxlength="250" />
     <column name="homepage" var="homepage" filter="homepage" maxlength="250" />
     <column name="tags" var="tags" />
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 3aa353307..39c380cbe 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -670,10 +670,10 @@
                 $image_mark_file = sprintf('./files/attach/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
                 if(file_exists($image_mark_file)) {
                     list($width, $height, $type, $attrs) = getimagesize($image_mark_file);
-                    $text = sprintf('<span style="background:url(%s) no-repeat left;padding-left:%dpx;">%s</span>', $image_mark_file, $width+2, $text);
+                    $buff = sprintf('<span style="background:url(%s) no-repeat left;padding-left:%dpx;">%s</span>', $image_mark_file, $width+2, $text);
                 }
 
-                $GLOBALS['_transImageNameList'][$member_srl] = $text;
+                $GLOBALS['_transImageNameList'][$member_srl] = str_replace($matches[4], $buff, $matches[0]);
             }
 
             return $GLOBALS['_transImageNameList'][$member_srl];