diff --git a/lib/cpp/src/server/TServer.h b/lib/cpp/src/server/TServer.h
index c19302f..ddb320d 100644
--- a/lib/cpp/src/server/TServer.h
+++ b/lib/cpp/src/server/TServer.h
@@ -21,10 +21,10 @@
  *
  * @author Mark Slee <mcslee@facebook.com>
  */
-class TServer : public concurrency::Runnable {
+class TServer {
 public:
   virtual ~TServer() {}
-  virtual void run() = 0;
+  virtual void serve() = 0;
   
 protected:
   TServer(shared_ptr<TProcessor> processor,
diff --git a/lib/cpp/src/server/TSimpleServer.cc b/lib/cpp/src/server/TSimpleServer.cc
index 041a52f..63b6c6b 100644
--- a/lib/cpp/src/server/TSimpleServer.cc
+++ b/lib/cpp/src/server/TSimpleServer.cc
@@ -11,7 +11,7 @@
  *
  * @author Mark Slee <mcslee@facebook.com>
  */
-void TSimpleServer::run() {
+void TSimpleServer::serve() {
 
   shared_ptr<TTransport> client;
   pair<shared_ptr<TTransport>,shared_ptr<TTransport> > io;
diff --git a/lib/cpp/src/server/TSimpleServer.h b/lib/cpp/src/server/TSimpleServer.h
index 973ba30..a0d22a7 100644
--- a/lib/cpp/src/server/TSimpleServer.h
+++ b/lib/cpp/src/server/TSimpleServer.h
@@ -24,7 +24,7 @@
     
   ~TSimpleServer() {}
 
-  void run();
+  void serve();
 
 };
 
diff --git a/lib/cpp/src/server/TThreadPoolServer.cc b/lib/cpp/src/server/TThreadPoolServer.cc
index 1eab53d..4285b05 100644
--- a/lib/cpp/src/server/TThreadPoolServer.cc
+++ b/lib/cpp/src/server/TThreadPoolServer.cc
@@ -55,7 +55,7 @@
 
 TThreadPoolServer::~TThreadPoolServer() {}
 
-void TThreadPoolServer::run() {
+void TThreadPoolServer::serve() {
 
   shared_ptr<TTransport> client;
   pair<shared_ptr<TTransport>,shared_ptr<TTransport> > io;
diff --git a/lib/cpp/src/server/TThreadPoolServer.h b/lib/cpp/src/server/TThreadPoolServer.h
index 34b216c..b8f8b47 100644
--- a/lib/cpp/src/server/TThreadPoolServer.h
+++ b/lib/cpp/src/server/TThreadPoolServer.h
@@ -26,7 +26,7 @@
 
   virtual ~TThreadPoolServer();
 
-  virtual void run();
+  virtual void serve();
 
 protected: