diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 67ab098..771830a 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -11,7 +11,7 @@
                     src/concurrency/ThreadManager.cpp \
                     src/concurrency/TimerManager.cpp \
 	            src/protocol/TBinaryProtocol.cpp \
-                    src/transport/TBufferedFileWriter.cpp \
+                    src/transport/TFileTransport.cpp \
                     src/transport/TBufferedRouterTransport.cpp \
                     src/transport/TSocket.cpp \
                     src/transport/TServerSocket.cpp \
@@ -52,7 +52,7 @@
 
 include_transportdir = $(include_thriftdir)/transport
 include_transport_HEADERS = \
-                         src/transport/TBufferedFileWriter.h \
+                         src/transport/TFileTransport.h \
                          src/transport/TBufferedRouterTransport.h \
                          src/transport/TServerSocket.h \
                          src/transport/TServerTransport.h \
diff --git a/lib/cpp/src/transport/TBufferedRouterTransport.h b/lib/cpp/src/transport/TBufferedRouterTransport.h
index b89198e..3a5e394 100644
--- a/lib/cpp/src/transport/TBufferedRouterTransport.h
+++ b/lib/cpp/src/transport/TBufferedRouterTransport.h
@@ -14,7 +14,7 @@
 /**
  * BufferedRouterTransport. Funcationally equivalent to TBufferedTransport
  * but routes the request to another Transport (typical use case is to route
- * the request to TBufferedFileWriter to store the request on disk). The
+ * the request to TFileTransport to store the request on disk). The
  * underlying buffer expands to a keep a copy of the entire request/response.
  *
  * @author Aditya Agarwal <aditya@facebook.com>
diff --git a/lib/cpp/src/transport/TBufferedFileWriter.cpp b/lib/cpp/src/transport/TFileTransport.cpp
similarity index 99%
rename from lib/cpp/src/transport/TBufferedFileWriter.cpp
rename to lib/cpp/src/transport/TFileTransport.cpp
index 063c9fe..7bc0e4a 100644
--- a/lib/cpp/src/transport/TBufferedFileWriter.cpp
+++ b/lib/cpp/src/transport/TFileTransport.cpp
@@ -1,4 +1,4 @@
-#include "TBufferedFileWriter.h"
+#include "TFileTransport.h"
 #include "TTransportUtils.h"
 
 #include <pthread.h>
diff --git a/lib/cpp/src/transport/TBufferedFileWriter.h b/lib/cpp/src/transport/TFileTransport.h
similarity index 100%
rename from lib/cpp/src/transport/TBufferedFileWriter.h
rename to lib/cpp/src/transport/TFileTransport.h
diff --git a/test/cpp/src/main.cpp b/test/cpp/src/main.cpp
index 47ae671..47da797 100644
--- a/test/cpp/src/main.cpp
+++ b/test/cpp/src/main.cpp
@@ -10,7 +10,7 @@
 #include <transport/TSocket.h>
 #include <transport/TTransportUtils.h>
 #include <transport/TBufferedRouterTransport.h>
-#include <transport/TBufferedFileWriter.h>
+#include <transport/TFileTransport.h>
 #include <TLogging.h>
 
 #include "Service.h"