diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/README.md b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/README.md
index 03efe206..d1cdb6bb 100644
--- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/README.md
+++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/README.md
@@ -1,5 +1,5 @@
 WeixinMessageDecoder:对微信消息进行解码
 
-WeixinMessageEncoder:对微信消息进行编码
+WeixinRequestHandler:微信请求处理类
 
-WeixinServerHandler:微信请求处理类
\ No newline at end of file
+WeixinResponseEncoder:对微信回复进行编码
\ No newline at end of file
diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageHandler.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinRequestHandler.java
similarity index 98%
rename from weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageHandler.java
rename to weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinRequestHandler.java
index 095af6fc..f2f27447 100644
--- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageHandler.java
+++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinRequestHandler.java
@@ -38,7 +38,7 @@ import com.foxinmy.weixin4j.util.StringUtil;
  * @since JDK 1.7
  * @see
  */
-public class WeixinMessageHandler extends
+public class WeixinRequestHandler extends
 		SimpleChannelInboundHandler<WeixinRequest> {
 	private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -46,7 +46,7 @@ public class WeixinMessageHandler extends
 	private final WeixinMessageDispatcher messageDispatcher;
 	private final JAXBContext jaxbContext;
 
-	public WeixinMessageHandler(AesToken aesToken,
+	public WeixinRequestHandler(AesToken aesToken,
 			WeixinMessageDispatcher messageDispatcher) throws WeixinException {
 		this.aesToken = aesToken;
 		this.messageDispatcher = messageDispatcher;
diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageEncoder.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinResponseEncoder.java
similarity index 97%
rename from weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageEncoder.java
rename to weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinResponseEncoder.java
index 8ce571e7..0fe18d82 100644
--- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageEncoder.java
+++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinResponseEncoder.java
@@ -30,14 +30,14 @@ import com.foxinmy.weixin4j.util.StringUtil;
  * @see <a
  *      href="http://mp.weixin.qq.com/wiki/0/61c3a8b9d50ac74f18bdf2e54ddfc4e0.html">加密接入指引</a>
  */
-public class WeixinMessageEncoder extends
+public class WeixinResponseEncoder extends
 		MessageToMessageEncoder<WeixinResponse> {
 
 	private final Logger log = LoggerFactory.getLogger(getClass());
 
 	private final AesToken aesToken;
 
-	public WeixinMessageEncoder(AesToken aesToken) {
+	public WeixinResponseEncoder(AesToken aesToken) {
 		this.aesToken = aesToken;
 	}
 
diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinServerInitializer.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinServerInitializer.java
index 803f5321..aa66ec7c 100644
--- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinServerInitializer.java
+++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinServerInitializer.java
@@ -30,7 +30,7 @@ public class WeixinServerInitializer extends ChannelInitializer<SocketChannel> {
 		pipeline.addLast(new HttpServerCodec());
 		pipeline.addLast(new HttpObjectAggregator(65536));
 		pipeline.addLast(new WeixinMessageDecoder(aesToken));
-		pipeline.addLast(new WeixinMessageEncoder(aesToken));
-		pipeline.addLast(new WeixinMessageHandler(aesToken, messageDispatcher));
+		pipeline.addLast(new WeixinResponseEncoder(aesToken));
+		pipeline.addLast(new WeixinRequestHandler(aesToken, messageDispatcher));
 	}
 }