diff --git a/websocket-sharp/RequestHandshake.cs b/websocket-sharp/HandshakeRequest.cs
similarity index 93%
rename from websocket-sharp/RequestHandshake.cs
rename to websocket-sharp/HandshakeRequest.cs
index 381435b1..f569347b 100644
--- a/websocket-sharp/RequestHandshake.cs
+++ b/websocket-sharp/HandshakeRequest.cs
@@ -1,6 +1,6 @@
 #region License
 /*
- * RequestHandshake.cs
+ * HandshakeRequest.cs
  *
  * The MIT License
  *
@@ -35,7 +35,7 @@ using WebSocketSharp.Net.WebSockets;
 
 namespace WebSocketSharp
 {
-  internal class RequestHandshake : HandshakeBase
+  internal class HandshakeRequest : HandshakeBase
   {
     #region Private Fields
 
@@ -45,7 +45,7 @@ namespace WebSocketSharp
 
     #region Private Constructors
 
-    private RequestHandshake ()
+    private HandshakeRequest ()
     {
     }
 
@@ -53,7 +53,7 @@ namespace WebSocketSharp
 
     #region Public Constructors
 
-    public RequestHandshake (string uriString)
+    public HandshakeRequest (string uriString)
     {
       HttpMethod = "GET";
       RequestUri = uriString.ToUri ();
@@ -137,7 +137,7 @@ namespace WebSocketSharp
 
     #region Public Methods
 
-    public static RequestHandshake Parse (string [] request)
+    public static HandshakeRequest Parse (string [] request)
     {
       var requestLine = request [0].Split (' ');
       if (requestLine.Length != 3)
@@ -150,7 +150,7 @@ namespace WebSocketSharp
       for (int i = 1; i < request.Length; i++)
         headers.SetInternal (request [i], false);
 
-      return new RequestHandshake {
+      return new HandshakeRequest {
         Headers = headers,
         HttpMethod = requestLine [0],
         RequestUri = requestLine [1].ToUri (),
@@ -158,9 +158,9 @@ namespace WebSocketSharp
       };
     }
 
-    public static RequestHandshake Parse (WebSocketContext context)
+    public static HandshakeRequest Parse (WebSocketContext context)
     {
-      return new RequestHandshake {
+      return new HandshakeRequest {
         Headers = context.Headers,
         HttpMethod = "GET",
         RequestUri = context.RequestUri,
diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
index 7e174ca2..a95d7d7b 100644
--- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
@@ -33,8 +33,8 @@ using System.Net.Sockets;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Principal;
 
-namespace WebSocketSharp.Net.WebSockets {
-
+namespace WebSocketSharp.Net.WebSockets
+{
   /// <summary>
   /// Provides access to the WebSocket connection request objects received by the <see cref="TcpListener"/>.
   /// </summary>
@@ -46,7 +46,7 @@ namespace WebSocketSharp.Net.WebSockets {
 
     private CookieCollection _cookies;
     private TcpClient        _client;
-    private RequestHandshake _request;
+    private HandshakeRequest _request;
     private bool             _secure;
     private WsStream         _stream;
     private WebSocket        _websocket;
@@ -55,13 +55,13 @@ namespace WebSocketSharp.Net.WebSockets {
 
     #region Internal Constructors
 
-    internal TcpListenerWebSocketContext(TcpClient client, bool secure, X509Certificate cert)
+    internal TcpListenerWebSocketContext (TcpClient client, bool secure, X509Certificate cert)
     {
       _client = client;
       _secure = secure;
-      _stream = WsStream.CreateServerStream(client, secure, cert);
-      _request = RequestHandshake.Parse(_stream.ReadHandshake());
-      _websocket = new WebSocket(this);
+      _stream = WsStream.CreateServerStream (client, secure, cert);
+      _request = HandshakeRequest.Parse (_stream.ReadHandshake ());
+      _websocket = new WebSocket (this);
     }
 
     #endregion
@@ -116,7 +116,7 @@ namespace WebSocketSharp.Net.WebSockets {
     /// </exception>
     public override bool IsAuthenticated {
       get {
-        throw new NotImplementedException();
+        throw new NotImplementedException ();
       }
     }
 
@@ -128,7 +128,7 @@ namespace WebSocketSharp.Net.WebSockets {
     /// </value>
     public override bool IsLocal {
       get {
-        return UserEndPoint.Address.IsLocal();
+        return UserEndPoint.Address.IsLocal ();
       }
     }
 
@@ -154,9 +154,9 @@ namespace WebSocketSharp.Net.WebSockets {
       get {
         return !_request.IsWebSocketRequest
                ? false
-               : SecWebSocketKey.IsNullOrEmpty()
+               : SecWebSocketKey.IsNullOrEmpty ()
                  ? false
-                 : !SecWebSocketVersion.IsNullOrEmpty();
+                 : !SecWebSocketVersion.IsNullOrEmpty ();
       }
     }
 
@@ -168,7 +168,7 @@ namespace WebSocketSharp.Net.WebSockets {
     /// </value>
     public override string Origin {
       get {
-        return Headers["Origin"];
+        return Headers ["Origin"];
       }
     }
 
@@ -180,7 +180,7 @@ namespace WebSocketSharp.Net.WebSockets {
     /// </value>
     public override string Path {
       get {
-        return _request.RequestUri.GetAbsolutePath();
+        return _request.RequestUri.GetAbsolutePath ();
       }
     }
 
@@ -219,7 +219,7 @@ namespace WebSocketSharp.Net.WebSockets {
     /// </value>
     public override string SecWebSocketKey {
       get {
-        return Headers["Sec-WebSocket-Key"];
+        return Headers ["Sec-WebSocket-Key"];
       }
     }
 
@@ -234,7 +234,7 @@ namespace WebSocketSharp.Net.WebSockets {
     /// </value>
     public override IEnumerable<string> SecWebSocketProtocols {
       get {
-        return Headers.GetValues("Sec-WebSocket-Protocol");
+        return Headers.GetValues ("Sec-WebSocket-Protocol");
       }
     }
 
@@ -249,7 +249,7 @@ namespace WebSocketSharp.Net.WebSockets {
     /// </value>
     public override string SecWebSocketVersion {
       get {
-        return Headers["Sec-WebSocket-Version"];
+        return Headers ["Sec-WebSocket-Version"];
       }
     }
 
@@ -261,7 +261,7 @@ namespace WebSocketSharp.Net.WebSockets {
     /// </value>
     public virtual System.Net.IPEndPoint ServerEndPoint {
       get {
-        return (System.Net.IPEndPoint)_client.Client.LocalEndPoint;
+        return (System.Net.IPEndPoint) _client.Client.LocalEndPoint;
       }
     }
 
@@ -276,7 +276,7 @@ namespace WebSocketSharp.Net.WebSockets {
     /// </exception>
     public override IPrincipal User {
       get {
-        throw new NotImplementedException();
+        throw new NotImplementedException ();
       }
     }
 
@@ -288,7 +288,7 @@ namespace WebSocketSharp.Net.WebSockets {
     /// </value>
     public virtual System.Net.IPEndPoint UserEndPoint {
       get {
-        return (System.Net.IPEndPoint)_client.Client.RemoteEndPoint;
+        return (System.Net.IPEndPoint) _client.Client.RemoteEndPoint;
       }
     }
 
@@ -308,10 +308,10 @@ namespace WebSocketSharp.Net.WebSockets {
 
     #region Internal Methods
 
-    internal void Close()
+    internal void Close ()
     {
-      _stream.Close();
-      _client.Close();
+      _stream.Close ();
+      _client.Close ();
     }
 
     #endregion
diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs
index 92eb31bd..0107b84d 100644
--- a/websocket-sharp/WebSocket.cs
+++ b/websocket-sharp/WebSocket.cs
@@ -499,7 +499,7 @@ namespace WebSocketSharp {
     // As server
     private bool acceptHandshake ()
     {
-      return processRequestHandshake ()
+      return processHandshakeRequest ()
              ? send (createResponseHandshake ())
              : false;
     }
@@ -722,35 +722,35 @@ namespace WebSocketSharp {
     }
 
     // As client
-    private RequestHandshake createRequestHandshake()
+    private HandshakeRequest createHandshakeRequest ()
     {
       var path = _uri.PathAndQuery;
       var host = _uri.Port == 80
                ? _uri.DnsSafeHost
                : _uri.Authority;
 
-      var req = new RequestHandshake(path);
-      req.AddHeader("Host", host);
+      var req = new HandshakeRequest (path);
+      req.AddHeader ("Host", host);
 
       if (_origin.Length > 0)
-        req.AddHeader("Origin", _origin);
+        req.AddHeader ("Origin", _origin);
 
-      req.AddHeader("Sec-WebSocket-Key", _base64key);
+      req.AddHeader ("Sec-WebSocket-Key", _base64key);
 
-      if (!_protocols.IsNullOrEmpty())
-        req.AddHeader("Sec-WebSocket-Protocol", _protocols);
+      if (!_protocols.IsNullOrEmpty ())
+        req.AddHeader ("Sec-WebSocket-Protocol", _protocols);
 
-      var extensions = createRequestExtensions();
+      var extensions = createRequestExtensions ();
       if (extensions.Length > 0)
-        req.AddHeader("Sec-WebSocket-Extensions", extensions);
+        req.AddHeader ("Sec-WebSocket-Extensions", extensions);
 
-      req.AddHeader("Sec-WebSocket-Version", _version);
+      req.AddHeader ("Sec-WebSocket-Version", _version);
 
       if (_preAuth && _credentials != null)
-        req.SetAuthorization(new AuthenticationResponse(_credentials));
+        req.SetAuthorization (new AuthenticationResponse (_credentials));
 
       if (_cookies.Count > 0)
-        req.SetCookies(_cookies);
+        req.SetCookies (_cookies);
 
       return req;
     }
@@ -789,10 +789,10 @@ namespace WebSocketSharp {
     }
 
     // As client
-    private bool doHandshake()
+    private bool doHandshake ()
     {
-      setClientStream();
-      return processResponseHandshake(sendRequestHandshake());
+      setClientStream ();
+      return processResponseHandshake (sendHandshakeRequest ());
     }
 
     private void error(string message)
@@ -1053,10 +1053,10 @@ namespace WebSocketSharp {
     }
 
     // As server
-    private bool processRequestHandshake ()
+    private bool processHandshakeRequest ()
     {
-      var req = RequestHandshake.Parse (_context);
-      _logger.Debug ("Request handshake from client:\n" + req.ToString ());
+      var req = HandshakeRequest.Parse (_context);
+      _logger.Debug ("A handshake request from a client:\n" + req.ToString ());
       if (!isValidRequesHandshake ())
       {
         var msg = "Invalid WebSocket connection request.";
@@ -1153,10 +1153,10 @@ namespace WebSocketSharp {
     }
 
     // As client
-    private void send(RequestHandshake request)
+    private void send (HandshakeRequest request)
     {
-      _logger.Debug("Request handshake to server:\n" + request.ToString());
-      _stream.WriteHandshake(request);
+      _logger.Debug ("A handshake Request to the server:\n" + request.ToString ());
+      _stream.WriteHandshake (request);
     }
 
     // As server
@@ -1301,34 +1301,34 @@ namespace WebSocketSharp {
     }
 
     // As client
-    private ResponseHandshake sendRequestHandshake()
+    private ResponseHandshake sendHandshakeRequest ()
     {
-      var req = createRequestHandshake();
-      var res = sendRequestHandshake(req);
+      var req = createHandshakeRequest ();
+      var res = sendHandshakeRequest (req);
       if (!_preAuth && res.IsUnauthorized && _credentials != null)
       {
         var challenge = res.AuthChallenge;
-        req.SetAuthorization(new AuthenticationResponse(_credentials, challenge));
-        res = sendRequestHandshake(req);
+        req.SetAuthorization (new AuthenticationResponse (_credentials, challenge));
+        res = sendHandshakeRequest (req);
       }
 
       return res;
     }
 
     // As client
-    private ResponseHandshake sendRequestHandshake (RequestHandshake request)
+    private ResponseHandshake sendHandshakeRequest (HandshakeRequest request)
     {
       send (request);
       return receiveResponseHandshake ();
     }
 
     // As client
-    private void setClientStream()
+    private void setClientStream ()
     {
       var host = _uri.DnsSafeHost;
       var port = _uri.Port;
-      _tcpClient = new TcpClient(host, port);
-      _stream = WsStream.CreateClientStream(_tcpClient, _secure, host, _certValidationCallback);
+      _tcpClient = new TcpClient (host, port);
+      _stream = WsStream.CreateClientStream (_tcpClient, _secure, host, _certValidationCallback);
     }
 
     private void startReceiving ()
diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj
index 181eb87c..5e9710a9 100644
--- a/websocket-sharp/websocket-sharp.csproj
+++ b/websocket-sharp/websocket-sharp.csproj
@@ -72,7 +72,6 @@
     <Compile Include="Server\WebSocketServer.cs" />
     <Compile Include="Server\WebSocketService.cs" />
     <Compile Include="WsStream.cs" />
-    <Compile Include="RequestHandshake.cs" />
     <Compile Include="ResponseHandshake.cs" />
     <Compile Include="Net\AuthenticationSchemeSelector.cs" />
     <Compile Include="Net\AuthenticationSchemes.cs" />
@@ -128,6 +127,7 @@
     <Compile Include="LogLevel.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="HandshakeBase.cs" />
+    <Compile Include="HandshakeRequest.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>