diff --git a/websocket-sharp/HandshakeRequest.cs b/websocket-sharp/HandshakeRequest.cs
index c7c84337..cdc17acd 100644
--- a/websocket-sharp/HandshakeRequest.cs
+++ b/websocket-sharp/HandshakeRequest.cs
@@ -33,7 +33,7 @@ using WebSocketSharp.Net;
 
 namespace WebSocketSharp
 {
-  internal class HandshakeRequest : HandshakeBase
+  internal class HandshakeRequest : HttpBase
   {
     #region Private Fields
 
diff --git a/websocket-sharp/HandshakeResponse.cs b/websocket-sharp/HandshakeResponse.cs
index f70768ed..29c6f345 100644
--- a/websocket-sharp/HandshakeResponse.cs
+++ b/websocket-sharp/HandshakeResponse.cs
@@ -33,7 +33,7 @@ using WebSocketSharp.Net;
 
 namespace WebSocketSharp
 {
-  internal class HandshakeResponse : HandshakeBase
+  internal class HandshakeResponse : HttpBase
   {
     #region Private Fields
 
diff --git a/websocket-sharp/HandshakeBase.cs b/websocket-sharp/HttpBase.cs
similarity index 95%
rename from websocket-sharp/HandshakeBase.cs
rename to websocket-sharp/HttpBase.cs
index 68de881b..393a241a 100644
--- a/websocket-sharp/HandshakeBase.cs
+++ b/websocket-sharp/HttpBase.cs
@@ -1,6 +1,6 @@
 #region License
 /*
- * HandshakeBase.cs
+ * HttpBase.cs
  *
  * The MIT License
  *
@@ -33,7 +33,7 @@ using WebSocketSharp.Net;
 
 namespace WebSocketSharp
 {
-  internal abstract class HandshakeBase
+  internal abstract class HttpBase
   {
     #region Private Fields
 
@@ -56,7 +56,7 @@ namespace WebSocketSharp
 
     #region Protected Constructors
 
-    protected HandshakeBase (Version version, NameValueCollection headers)
+    protected HttpBase (Version version, NameValueCollection headers)
     {
       _version = version;
       _headers = headers;
diff --git a/websocket-sharp/WebSocketStream.cs b/websocket-sharp/WebSocketStream.cs
index 4406b431..94c20786 100644
--- a/websocket-sharp/WebSocketStream.cs
+++ b/websocket-sharp/WebSocketStream.cs
@@ -151,7 +151,7 @@ namespace WebSocketSharp
     #region Internal Methods
 
     internal T ReadHandshake<T> (Func<string [], T> parser, int millisecondsTimeout)
-      where T : HandshakeBase
+      where T : HttpBase
     {
       var timeout = false;
       var timer = new Timer (
@@ -277,7 +277,7 @@ namespace WebSocketSharp
       return Write (frame.ToByteArray ());
     }
 
-    public bool WriteHandshake (HandshakeBase handshake)
+    public bool WriteHandshake (HttpBase handshake)
     {
       return Write (handshake.ToByteArray ());
     }
diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj
index b077310a..d112786d 100644
--- a/websocket-sharp/websocket-sharp.csproj
+++ b/websocket-sharp/websocket-sharp.csproj
@@ -113,7 +113,6 @@
     <Compile Include="LogData.cs" />
     <Compile Include="LogLevel.cs" />
     <Compile Include="Logger.cs" />
-    <Compile Include="HandshakeBase.cs" />
     <Compile Include="HandshakeRequest.cs" />
     <Compile Include="HandshakeResponse.cs" />
     <Compile Include="WebSocketState.cs" />
@@ -136,6 +135,7 @@
     <Compile Include="Net\AuthenticationChallenge.cs" />
     <Compile Include="Net\AuthenticationResponse.cs" />
     <Compile Include="Net\AuthenticationBase.cs" />
+    <Compile Include="HttpBase.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>