diff --git a/websocket-sharp/Net/ChunkedInputStream.cs b/websocket-sharp/Net/ChunkedRequestStream.cs
similarity index 98%
rename from websocket-sharp/Net/ChunkedInputStream.cs
rename to websocket-sharp/Net/ChunkedRequestStream.cs
index f2452401..fe0818ed 100644
--- a/websocket-sharp/Net/ChunkedInputStream.cs
+++ b/websocket-sharp/Net/ChunkedRequestStream.cs
@@ -1,6 +1,6 @@
 #region License
 /*
- * ChunkedInputStream.cs
+ * ChunkedRequestStream.cs
  *
  * This code is derived from System.Net.ChunkedInputStream.cs of Mono
  * (http://www.mono-project.com).
@@ -42,7 +42,7 @@ using System.IO;
 
 namespace WebSocketSharp.Net
 {
-  internal class ChunkedInputStream : RequestStream
+  internal class ChunkedRequestStream : RequestStream
   {
     #region Private Const Fields
 
@@ -61,7 +61,7 @@ namespace WebSocketSharp.Net
 
     #region Public Constructors
 
-    public ChunkedInputStream (
+    public ChunkedRequestStream (
       HttpListenerContext context, Stream stream, byte [] buffer, int offset, int length)
       : base (stream, buffer, offset, length)
     {
diff --git a/websocket-sharp/Net/HttpConnection.cs b/websocket-sharp/Net/HttpConnection.cs
index 2db2049a..ed406cb3 100644
--- a/websocket-sharp/Net/HttpConnection.cs
+++ b/websocket-sharp/Net/HttpConnection.cs
@@ -485,7 +485,7 @@ namespace WebSocketSharp.Net
         if (chunked) {
           _chunked = true;
           _context.Response.SendChunked = true;
-          _inputStream = new ChunkedInputStream (
+          _inputStream = new ChunkedRequestStream (
             _context, _stream, buff, _position, len - _position);
         }
         else {
diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj
index 664eb1dc..bbba8f5d 100644
--- a/websocket-sharp/websocket-sharp.csproj
+++ b/websocket-sharp/websocket-sharp.csproj
@@ -72,7 +72,6 @@
     <Compile Include="Server\WebSocketService.cs" />
     <Compile Include="Net\AuthenticationSchemes.cs" />
     <Compile Include="Net\ChunkStream.cs" />
-    <Compile Include="Net\ChunkedInputStream.cs" />
     <Compile Include="Net\Cookie.cs" />
     <Compile Include="Net\CookieCollection.cs" />
     <Compile Include="Net\CookieException.cs" />
@@ -134,6 +133,7 @@
     <Compile Include="Net\ReadBufferState.cs" />
     <Compile Include="Net\Chunk.cs" />
     <Compile Include="Net\InputChunkState.cs" />
+    <Compile Include="Net\ChunkedRequestStream.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>