diff --git a/ChangeLog b/ChangeLog
index 46c558b9..76aa80b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Renamed member variables
+	* src/BtBitfieldMessageValidator.h
+	* src/BtHandshakeMessageValidator.h
+	* src/BtPieceMessageValidator.h
+
 2010-06-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Renamed member variables
diff --git a/src/BtBitfieldMessageValidator.h b/src/BtBitfieldMessageValidator.h
index cc59fc7b..6b4fc9c8 100644
--- a/src/BtBitfieldMessageValidator.h
+++ b/src/BtBitfieldMessageValidator.h
@@ -43,19 +43,19 @@ namespace aria2 {
 
 class BtBitfieldMessageValidator : public BtMessageValidator {
 private:
-  const BtBitfieldMessage* message;
-  size_t numPiece;
+  const BtBitfieldMessage* _message;
+  size_t _numPiece;
 public:
   BtBitfieldMessageValidator(const BtBitfieldMessage* message,
                              size_t numPiece):
-    message(message),
-    numPiece(numPiece) {}
+    _message(message),
+    _numPiece(numPiece) {}
 
   virtual void validate()
   {
-    bittorrent::checkBitfield(message->getBitfield(),
-                              message->getBitfieldLength(),
-                              numPiece);
+    bittorrent::checkBitfield(_message->getBitfield(),
+                              _message->getBitfieldLength(),
+                              _numPiece);
   }
 };
 
diff --git a/src/BtHandshakeMessageValidator.h b/src/BtHandshakeMessageValidator.h
index 62d74b4a..28f51694 100644
--- a/src/BtHandshakeMessageValidator.h
+++ b/src/BtHandshakeMessageValidator.h
@@ -42,38 +42,40 @@
 #include "BtHandshakeMessage.h"
 #include "util.h"
 #include "StringFormat.h"
+#include "BtConstants.h"
 
 namespace aria2 {
 
 class BtHandshakeMessageValidator : public BtMessageValidator {
 private:
-  const BtHandshakeMessage* message;
-  unsigned char infoHash[20];
+  const BtHandshakeMessage* _message;
+  unsigned char _infoHash[INFO_HASH_LENGTH];
 public:
   BtHandshakeMessageValidator(const BtHandshakeMessage* message,
                               const unsigned char* infoHash):
-    message(message)
+    _message(message)
   {
-    memcpy(this->infoHash, infoHash, sizeof(this->infoHash));
+    memcpy(_infoHash, infoHash, sizeof(_infoHash));
   }
 
   virtual void validate()
   {
-    if(message->getPstrlen() != 19) {
+    if(_message->getPstrlen() != 19) {
       throw DL_ABORT_EX(StringFormat("invalid handshake pstrlen=%u",
-                                     message->getPstrlen()).str());
+                                     _message->getPstrlen()).str());
     }
-    if(memcmp(BtHandshakeMessage::BT_PSTR, message->getPstr(), 19) != 0) {
+    if(memcmp(BtHandshakeMessage::BT_PSTR, _message->getPstr(), 19) != 0) {
       throw DL_ABORT_EX
         (StringFormat("invalid handshake pstr=%s",
                       util::percentEncode
-                      (message->getPstr(), 19).c_str()).str());
+                      (_message->getPstr(), 19).c_str()).str());
     }
-    if(memcmp(infoHash, message->getInfoHash(), 20) != 0) {
+    if(memcmp(_infoHash, _message->getInfoHash(), sizeof(_infoHash)) != 0) {
       throw DL_ABORT_EX
         (StringFormat("invalid handshake info hash: expected:%s, actual:%s",
-                      util::toHex(infoHash, 20).c_str(),
-                      util::toHex(message->getInfoHash(), 20).c_str()).str());
+                      util::toHex(_infoHash, sizeof(_infoHash)).c_str(),
+                      util::toHex(_message->getInfoHash(),
+                                  INFO_HASH_LENGTH).c_str()).str());
     }
   }
 };
diff --git a/src/BtPieceMessageValidator.h b/src/BtPieceMessageValidator.h
index 7813d834..abc202db 100644
--- a/src/BtPieceMessageValidator.h
+++ b/src/BtPieceMessageValidator.h
@@ -43,21 +43,21 @@ namespace aria2 {
 
 class BtPieceMessageValidator : public BtMessageValidator {
 private:
-  const BtPieceMessage* message;
-  size_t numPiece;
-  size_t pieceLength;
+  const BtPieceMessage* _message;
+  size_t _numPiece;
+  size_t _pieceLength;
 public:
   BtPieceMessageValidator(const BtPieceMessage* message,
                           size_t numPiece,
                           size_t pieceLength):
-    message(message),
-    numPiece(numPiece),
-    pieceLength(pieceLength) {}
+    _message(message),
+    _numPiece(numPiece),
+    _pieceLength(pieceLength) {}
 
   virtual void validate()
   {
-    bittorrent::checkIndex(message->getIndex(), numPiece);
-    bittorrent::checkBegin(message->getBegin(), pieceLength);
+    bittorrent::checkIndex(_message->getIndex(), _numPiece);
+    bittorrent::checkBegin(_message->getBegin(), _pieceLength);
   }
 };