diff --git a/tutorial.md b/tutorial.md
index 4eef3ade6..d081086b0 100644
--- a/tutorial.md
+++ b/tutorial.md
@@ -42,7 +42,7 @@ This needs to be the final handler in the pipeline. Now the definition of the pi
 // where we define the chain of handlers for each messeage received
 class EchoPipelineFactory : public PipelineFactory<EchoPipeline> {
  public:
-  EchoPipeline::Ptr newPipeline(std::shared_ptr<AsyncTransportWrapper> sock) {
+  EchoPipeline::Ptr newPipeline(std::shared_ptr<AsyncTransport> sock) {
     auto pipeline = EchoPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(LineBasedFrameDecoder(8192));
@@ -99,7 +99,7 @@ class EchoHandler : public HandlerAdapter<std::string> {
 // where we define the chain of handlers for each message received
 class EchoPipelineFactory : public PipelineFactory<EchoPipeline> {
  public:
-  EchoPipeline::Ptr newPipeline(std::shared_ptr<AsyncTransportWrapper> sock) {
+  EchoPipeline::Ptr newPipeline(std::shared_ptr<AsyncTransport> sock) {
     auto pipeline = EchoPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(LineBasedFrameDecoder(8192));
@@ -154,7 +154,7 @@ Now onto the client’s pipeline factory. It is identical the server’s pipelin
 // chains the handlers together to define the response pipeline
 class EchoPipelineFactory : public PipelineFactory<EchoPipeline> {
  public:
-  EchoPipeline::Ptr newPipeline(std::shared_ptr<AsyncTransportWrapper> sock) {
+  EchoPipeline::Ptr newPipeline(std::shared_ptr<AsyncTransport> sock) {
     auto pipeline = EchoPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(
@@ -207,7 +207,7 @@ class EchoHandler : public HandlerAdapter<std::string> {
 // chains the handlers together to define the response pipeline
 class EchoPipelineFactory : public PipelineFactory<EchoPipeline> {
  public:
-  EchoPipeline::Ptr newPipeline(std::shared_ptr<AsyncTransportWrapper> sock) {
+  EchoPipeline::Ptr newPipeline(std::shared_ptr<AsyncTransport> sock) {
     auto pipeline = EchoPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(
diff --git a/wangle/acceptor/Acceptor.cpp b/wangle/acceptor/Acceptor.cpp
index ff42b6949..1a43ab45a 100644
--- a/wangle/acceptor/Acceptor.cpp
+++ b/wangle/acceptor/Acceptor.cpp
@@ -17,6 +17,7 @@
 #include <wangle/acceptor/Acceptor.h>
 
 #include <fizz/server/TicketTypes.h>
+#include <folly/io/async/AsyncTransport.h>
 #include <folly/io/async/AsyncSSLSocket.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/EventBase.h>
@@ -34,7 +35,7 @@
 using folly::AsyncServerSocket;
 using folly::AsyncSocket;
 using folly::AsyncSSLSocket;
-using folly::AsyncTransportWrapper;
+using folly::AsyncTransport;
 using folly::EventBase;
 using folly::SocketAddress;
 using std::string;
@@ -315,7 +316,7 @@ void Acceptor::startHandshakeManager(
 }
 
 void Acceptor::connectionReady(
-    AsyncTransportWrapper::UniquePtr sock,
+    AsyncTransport::UniquePtr sock,
     const SocketAddress& clientAddr,
     const string& nextProtocolName,
     SecureTransportType secureTransportType,
@@ -338,7 +339,7 @@ void Acceptor::connectionReady(
 }
 
 void Acceptor::plaintextConnectionReady(
-    AsyncTransportWrapper::UniquePtr sock,
+    AsyncTransport::UniquePtr sock,
     const SocketAddress& clientAddr,
     const string& nextProtocolName,
     SecureTransportType secureTransportType,
@@ -352,7 +353,7 @@ void Acceptor::plaintextConnectionReady(
 }
 
 void Acceptor::sslConnectionReady(
-    AsyncTransportWrapper::UniquePtr sock,
+    AsyncTransport::UniquePtr sock,
     const SocketAddress& clientAddr,
     const string& nextProtocol,
     SecureTransportType secureTransportType,
diff --git a/wangle/acceptor/Acceptor.h b/wangle/acceptor/Acceptor.h
index bd76d3d82..4fdc5d980 100644
--- a/wangle/acceptor/Acceptor.h
+++ b/wangle/acceptor/Acceptor.h
@@ -39,7 +39,6 @@
 
 namespace wangle {
 
-class AsyncTransport;
 class ManagedConnection;
 class SecurityProtocolContextManager;
 class SSLContextManager;
@@ -287,7 +286,7 @@ class Acceptor : public folly::AsyncServerSocket::AcceptCallback,
    * subclasses to deal with plaintext connections.
    */
   virtual void plaintextConnectionReady(
-      folly::AsyncTransportWrapper::UniquePtr sock,
+      folly::AsyncTransport::UniquePtr sock,
       const folly::SocketAddress& clientAddr,
       const std::string& nextProtocolName,
       SecureTransportType secureTransportType,
@@ -300,7 +299,7 @@ class Acceptor : public folly::AsyncServerSocket::AcceptCallback,
    * for SSL connections.
    */
   void connectionReady(
-      folly::AsyncTransportWrapper::UniquePtr sock,
+      folly::AsyncTransport::UniquePtr sock,
       const folly::SocketAddress& clientAddr,
       const std::string& nextProtocolName,
       SecureTransportType secureTransportType,
@@ -311,7 +310,7 @@ class Acceptor : public folly::AsyncServerSocket::AcceptCallback,
    * pending SSL connections. This should normally not be overridden.
    */
   virtual void sslConnectionReady(
-      folly::AsyncTransportWrapper::UniquePtr sock,
+      folly::AsyncTransport::UniquePtr sock,
       const folly::SocketAddress& clientAddr,
       const std::string& nextProtocol,
       SecureTransportType secureTransportType,
@@ -328,7 +327,7 @@ class Acceptor : public folly::AsyncServerSocket::AcceptCallback,
    * sock may be nullptr.
    */
   virtual void updateSSLStats(
-      const folly::AsyncTransportWrapper* /*sock*/,
+      const folly::AsyncTransport* /*sock*/,
       std::chrono::milliseconds /*acceptLatency*/,
       SSLErrorEnum /*error*/,
       const folly::exception_wrapper& /*ex*/) noexcept {}
@@ -370,7 +369,7 @@ class Acceptor : public folly::AsyncServerSocket::AcceptCallback,
    *                            requested by the client.
    */
   virtual void onNewConnection(
-      folly::AsyncTransportWrapper::UniquePtr /*sock*/,
+      folly::AsyncTransport::UniquePtr /*sock*/,
       const folly::SocketAddress* /*address*/,
       const std::string& /*nextProtocolName*/,
       SecureTransportType /*secureTransportType*/,
diff --git a/wangle/acceptor/AcceptorHandshakeManager.cpp b/wangle/acceptor/AcceptorHandshakeManager.cpp
index e4b3276e3..9973e19af 100644
--- a/wangle/acceptor/AcceptorHandshakeManager.cpp
+++ b/wangle/acceptor/AcceptorHandshakeManager.cpp
@@ -27,7 +27,7 @@ void AcceptorHandshakeManager::start(
 }
 
 void AcceptorHandshakeManager::connectionReady(
-      folly::AsyncTransportWrapper::UniquePtr transport,
+      folly::AsyncTransport::UniquePtr transport,
       std::string nextProtocol,
       SecureTransportType secureTransportType,
       folly::Optional<SSLErrorEnum> sslErr) noexcept {
@@ -54,7 +54,7 @@ void AcceptorHandshakeManager::connectionReady(
 }
 
 void AcceptorHandshakeManager::connectionError(
-    folly::AsyncTransportWrapper* transport,
+    folly::AsyncTransport* transport,
     folly::exception_wrapper ex,
     folly::Optional<SSLErrorEnum> sslErr) noexcept {
   if (sslErr) {
diff --git a/wangle/acceptor/AcceptorHandshakeManager.h b/wangle/acceptor/AcceptorHandshakeManager.h
index ef3427b30..886dbcbf4 100644
--- a/wangle/acceptor/AcceptorHandshakeManager.h
+++ b/wangle/acceptor/AcceptorHandshakeManager.h
@@ -45,7 +45,7 @@ class AcceptorHandshakeHelper : public folly::DelayedDestruction {
      * If sslErr is set, Acceptor::updateSSLStats will be called.
      */
     virtual void connectionReady(
-        folly::AsyncTransportWrapper::UniquePtr transport,
+        folly::AsyncTransport::UniquePtr transport,
         std::string nextProtocol,
         SecureTransportType secureTransportType,
         folly::Optional<SSLErrorEnum> sslErr) noexcept = 0;
@@ -56,7 +56,7 @@ class AcceptorHandshakeHelper : public folly::DelayedDestruction {
      * If sslErr is set, Acceptor::updateSSLStats will be called.
      */
     virtual void connectionError(
-        folly::AsyncTransportWrapper* transport,
+        folly::AsyncTransport* transport,
         folly::exception_wrapper ex,
         folly::Optional<SSLErrorEnum> sslErr) noexcept = 0;
   };
@@ -115,14 +115,14 @@ class AcceptorHandshakeManager : public ManagedConnection,
 
  protected:
   void connectionReady(
-      folly::AsyncTransportWrapper::UniquePtr transport,
+      folly::AsyncTransport::UniquePtr transport,
       std::string nextProtocol,
       SecureTransportType secureTransportType,
       folly::Optional<SSLErrorEnum>
           details) noexcept override;
 
   void connectionError(
-      folly::AsyncTransportWrapper* transport,
+      folly::AsyncTransport* transport,
       folly::exception_wrapper ex,
       folly::Optional<SSLErrorEnum>
           details) noexcept override;
diff --git a/wangle/acceptor/EvbHandshakeHelper.cpp b/wangle/acceptor/EvbHandshakeHelper.cpp
index ddefe24f6..6c6d77a67 100644
--- a/wangle/acceptor/EvbHandshakeHelper.cpp
+++ b/wangle/acceptor/EvbHandshakeHelper.cpp
@@ -84,7 +84,7 @@ void EvbHandshakeHelper::dropConnection(SSLErrorEnum reason) {
 }
 
 void EvbHandshakeHelper::connectionReady(
-    folly::AsyncTransportWrapper::UniquePtr transport,
+    folly::AsyncTransport::UniquePtr transport,
     std::string nextProtocol,
     SecureTransportType secureTransportType,
     folly::Optional<SSLErrorEnum> sslErr) noexcept {
@@ -136,7 +136,7 @@ void EvbHandshakeHelper::connectionReady(
 }
 
 void EvbHandshakeHelper::connectionError(
-    folly::AsyncTransportWrapper* transport,
+    folly::AsyncTransport* transport,
     folly::exception_wrapper ex,
     folly::Optional<SSLErrorEnum> sslErr) noexcept {
   DCHECK(transport->getEventBase() == handshakeEvb_);
diff --git a/wangle/acceptor/EvbHandshakeHelper.h b/wangle/acceptor/EvbHandshakeHelper.h
index 81dcca967..e0f39eb34 100644
--- a/wangle/acceptor/EvbHandshakeHelper.h
+++ b/wangle/acceptor/EvbHandshakeHelper.h
@@ -50,13 +50,13 @@ class EvbHandshakeHelper : public AcceptorHandshakeHelper,
 
   // Exposing these for tests, do not directly call these callbacks.
   virtual void connectionReady(
-      folly::AsyncTransportWrapper::UniquePtr transport,
+      folly::AsyncTransport::UniquePtr transport,
       std::string nextProtocol,
       SecureTransportType secureTransportType,
       folly::Optional<SSLErrorEnum> sslErr) noexcept override;
 
   virtual void connectionError(
-      folly::AsyncTransportWrapper* transport,
+      folly::AsyncTransport* transport,
       folly::exception_wrapper ex,
       folly::Optional<SSLErrorEnum> sslErr) noexcept override;
 
diff --git a/wangle/acceptor/SocketPeeker.h b/wangle/acceptor/SocketPeeker.h
index b579e0057..215ddec93 100644
--- a/wangle/acceptor/SocketPeeker.h
+++ b/wangle/acceptor/SocketPeeker.h
@@ -22,7 +22,7 @@
 
 namespace wangle {
 
-class SocketPeeker : public folly::AsyncTransportWrapper::ReadCallback,
+class SocketPeeker : public folly::AsyncTransport::ReadCallback,
                      public folly::DelayedDestruction {
  public:
   using UniquePtr =
diff --git a/wangle/acceptor/test/AcceptorHelperMocks.h b/wangle/acceptor/test/AcceptorHelperMocks.h
index 6092f42c3..019c64f7b 100644
--- a/wangle/acceptor/test/AcceptorHelperMocks.h
+++ b/wangle/acceptor/test/AcceptorHelperMocks.h
@@ -38,18 +38,18 @@ class MockHandshakeHelperCallback
   MOCK_METHOD3(
       connectionError_,
       void(
-          folly::AsyncTransportWrapper*,
+          folly::AsyncTransport*,
           folly::exception_wrapper,
           folly::Optional<wangle::SSLErrorEnum>));
   void connectionError(
-      folly::AsyncTransportWrapper* transport,
+      folly::AsyncTransport* transport,
       folly::exception_wrapper ex,
       folly::Optional<wangle::SSLErrorEnum> sslErr) noexcept override {
     connectionError_(transport, ex, sslErr);
   }
 
   void connectionReady(
-      folly::AsyncTransportWrapper::UniquePtr transport,
+      folly::AsyncTransport::UniquePtr transport,
       std::string nextProtocol,
       SecureTransportType secureTransportType,
       folly::Optional<wangle::SSLErrorEnum> sslErr) noexcept override {
@@ -113,13 +113,13 @@ struct UseSharedPtrPolicy<MockHandshakeHelperCallback<P>> {
   MOCK_METHOD4(
       connectionReadyInternal,
       void(
-          std::shared_ptr<folly::AsyncTransportWrapper>,
+          std::shared_ptr<folly::AsyncTransport>,
           std::string,
           SecureTransportType,
           folly::Optional<wangle::SSLErrorEnum>));
 
   void dispatchConnectionReady(
-      folly::AsyncTransportWrapper::UniquePtr transport,
+      folly::AsyncTransport::UniquePtr transport,
       std::string nextProtocol,
       SecureTransportType secureTransportType,
       folly::Optional<wangle::SSLErrorEnum> sslErr) {
@@ -136,13 +136,13 @@ struct UseOwnedRawPtrPolicy<MockHandshakeHelperCallback<P>> {
   MOCK_METHOD4(
       connectionReadyInternalRaw,
       void(
-          folly::AsyncTransportWrapper*,
+          folly::AsyncTransport*,
           std::string,
           SecureTransportType,
           folly::Optional<wangle::SSLErrorEnum>));
 
   void dispatchConnectionReady(
-      folly::AsyncTransportWrapper::UniquePtr transport,
+      folly::AsyncTransport::UniquePtr transport,
       std::string nextProtocol,
       SecureTransportType secureTransportType,
       folly::Optional<wangle::SSLErrorEnum> sslErr) {
diff --git a/wangle/acceptor/test/EvbHandshakeHelperTest.cpp b/wangle/acceptor/test/EvbHandshakeHelperTest.cpp
index 7fe1750c3..6385ff2bf 100644
--- a/wangle/acceptor/test/EvbHandshakeHelperTest.cpp
+++ b/wangle/acceptor/test/EvbHandshakeHelperTest.cpp
@@ -97,7 +97,7 @@ TEST_F(EvbHandshakeHelperTest, TestSuccessPath) {
 
         sock->getEventBase()->runInLoop([sock, cb] {
           cb->connectionReady(
-              AsyncTransportWrapper::UniquePtr(sock),
+              AsyncTransport::UniquePtr(sock),
               "h2",
               SecureTransportType::TLS,
               folly::none);
@@ -156,7 +156,7 @@ TEST_F(EvbHandshakeHelperTest, TestDropConnection) {
     barrier.post();
   }));
 
-  AsyncTransportWrapper* transport;
+  AsyncTransport* transport;
   EXPECT_CALL(mockCb_, connectionError_(_, _, _))
       .WillOnce(SaveArg<0>(&transport));
 
diff --git a/wangle/acceptor/test/PeekingAcceptorHandshakeHelperTest.cpp b/wangle/acceptor/test/PeekingAcceptorHandshakeHelperTest.cpp
index 66f6250ed..3db23ad4a 100644
--- a/wangle/acceptor/test/PeekingAcceptorHandshakeHelperTest.cpp
+++ b/wangle/acceptor/test/PeekingAcceptorHandshakeHelperTest.cpp
@@ -135,7 +135,7 @@ TEST_F(PeekingAcceptorHandshakeHelperTest, TestPeek2ndSuccess) {
 
 
 TEST_F(PeekingAcceptorHandshakeHelperTest, TestEOFDuringPeek) {
-  AsyncTransportWrapper::ReadCallback* rcb;
+  AsyncTransport::ReadCallback* rcb;
   EXPECT_CALL(*sslSock_, setReadCB(_))
     .WillOnce(SaveArg<0>(&rcb));
   EXPECT_CALL(*sslSock_, setReadCB(nullptr));
diff --git a/wangle/bootstrap/AcceptRoutingHandler-inl.h b/wangle/bootstrap/AcceptRoutingHandler-inl.h
index 806f8339d..bb3393ab7 100644
--- a/wangle/bootstrap/AcceptRoutingHandler-inl.h
+++ b/wangle/bootstrap/AcceptRoutingHandler-inl.h
@@ -29,7 +29,7 @@ void AcceptRoutingHandler<Pipeline, R>::read(
   populateAcceptors();
 
   const auto& connInfo = boost::get<ConnInfo&>(conn);
-  auto socket = std::shared_ptr<folly::AsyncTransportWrapper>(
+  auto socket = std::shared_ptr<folly::AsyncTransport>(
       connInfo.sock, folly::DelayedDestruction::Destructor());
 
   uint64_t connId = nextConnId_++;
@@ -87,7 +87,7 @@ void AcceptRoutingHandler<Pipeline, R>::onRoutingData(
 
   // Fetch the socket from the pipeline and pause reading from the
   // socket
-  auto socket = std::dynamic_pointer_cast<folly::AsyncTransportWrapper>(
+  auto socket = std::dynamic_pointer_cast<folly::AsyncTransport>(
       routingPipeline->getTransport());
   CHECK(socket);
   routingPipeline->transportInactive();
diff --git a/wangle/bootstrap/AcceptRoutingHandler.h b/wangle/bootstrap/AcceptRoutingHandler.h
index 98641aadd..b5ea988e9 100644
--- a/wangle/bootstrap/AcceptRoutingHandler.h
+++ b/wangle/bootstrap/AcceptRoutingHandler.h
@@ -117,7 +117,7 @@ class RoutingDataPipelineFactory {
   virtual ~RoutingDataPipelineFactory() {}
 
   virtual typename Pipeline::Ptr newPipeline(
-      std::shared_ptr<folly::AsyncTransportWrapper> socket,
+      std::shared_ptr<folly::AsyncTransport> socket,
       const R& routingData,
       RoutingDataHandler<R>* routingHandler,
       std::shared_ptr<TransportInfo> transportInfo) = 0;
diff --git a/wangle/bootstrap/BaseClientBootstrap.h b/wangle/bootstrap/BaseClientBootstrap.h
index 6416f7e4f..0dea6e1e8 100644
--- a/wangle/bootstrap/BaseClientBootstrap.h
+++ b/wangle/bootstrap/BaseClientBootstrap.h
@@ -117,7 +117,7 @@ class BaseClientBootstrap {
   }
 
   virtual void makePipeline(
-      std::shared_ptr<folly::AsyncTransportWrapper> socket) {
+      std::shared_ptr<folly::AsyncTransport> socket) {
     pipeline_ = pipelineFactory_->newPipeline(socket);
   }
 
diff --git a/wangle/bootstrap/ServerBootstrap-inl.h b/wangle/bootstrap/ServerBootstrap-inl.h
index f96a63cf8..f4fbafb2f 100644
--- a/wangle/bootstrap/ServerBootstrap-inl.h
+++ b/wangle/bootstrap/ServerBootstrap-inl.h
@@ -155,7 +155,7 @@ class ServerAcceptor : public Acceptor,
     }
 
     auto connInfo = boost::get<ConnInfo&>(conn);
-    folly::AsyncTransportWrapper::UniquePtr transport(connInfo.sock);
+    folly::AsyncTransport::UniquePtr transport(connInfo.sock);
 
     // Setup local and remote addresses
     auto tInfoPtr = std::make_shared<TransportInfo>(connInfo.tinfo);
@@ -168,7 +168,7 @@ class ServerAcceptor : public Acceptor,
         std::make_shared<std::string>(connInfo.nextProtoName);
 
     auto pipeline = childPipelineFactory_->newPipeline(
-        std::shared_ptr<folly::AsyncTransportWrapper>(
+        std::shared_ptr<folly::AsyncTransport>(
             transport.release(), folly::DelayedDestruction::Destructor()));
     pipeline->setTransportInfo(tInfoPtr);
     auto connection = new ServerConnection(std::move(pipeline));
@@ -183,7 +183,7 @@ class ServerAcceptor : public Acceptor,
 
   /* See Acceptor::onNewConnection for details */
   void onNewConnection(
-      folly::AsyncTransportWrapper::UniquePtr transport,
+      folly::AsyncTransport::UniquePtr transport,
       const folly::SocketAddress* clientAddr,
       const std::string& nextProtocolName,
       SecureTransportType secureTransportType,
diff --git a/wangle/bootstrap/test/AcceptRoutingHandlerTest.cpp b/wangle/bootstrap/test/AcceptRoutingHandlerTest.cpp
index 37aad7e02..943732079 100644
--- a/wangle/bootstrap/test/AcceptRoutingHandlerTest.cpp
+++ b/wangle/bootstrap/test/AcceptRoutingHandlerTest.cpp
@@ -26,7 +26,7 @@ using TestClient = ClientBootstrap<DefaultPipeline>;
 class TestClientPipelineFactory : public PipelineFactory<DefaultPipeline> {
  public:
   DefaultPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> socket) override {
+      std::shared_ptr<AsyncTransport> socket) override {
     // Socket should be connected already
     EXPECT_TRUE(socket->good());
 
diff --git a/wangle/bootstrap/test/BootstrapTest.cpp b/wangle/bootstrap/test/BootstrapTest.cpp
index 735282334..dc2fed3d9 100644
--- a/wangle/bootstrap/test/BootstrapTest.cpp
+++ b/wangle/bootstrap/test/BootstrapTest.cpp
@@ -35,7 +35,7 @@ typedef ClientBootstrap<BytesPipeline> TestClient;
 class TestClientPipelineFactory : public PipelineFactory<BytesPipeline> {
  public:
   BytesPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     // Socket should be connected already
     EXPECT_TRUE(sock->good());
 
@@ -54,7 +54,7 @@ class TestClientPipelineFactory : public PipelineFactory<BytesPipeline> {
 class TestPipelineFactory : public PipelineFactory<BytesPipeline> {
  public:
   BytesPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper>) override {
+      std::shared_ptr<AsyncTransport>) override {
     pipelines++;
     auto pipeline = BytesPipeline::create();
     pipeline->addBack(new BytesToBytesHandler());
@@ -70,7 +70,7 @@ EventBase base_;
   TestAcceptor() : Acceptor(ServerSocketConfig()) {
     Acceptor::init(nullptr, &base_);
   }
-  void onNewConnection(AsyncTransportWrapper::UniquePtr,
+  void onNewConnection(AsyncTransport::UniquePtr,
                        const folly::SocketAddress*,
                        const std::string& /* nextProtocolName */,
                        SecureTransportType,
diff --git a/wangle/bootstrap/test/Mocks.h b/wangle/bootstrap/test/Mocks.h
index 5971783ba..dadb7d5d7 100644
--- a/wangle/bootstrap/test/Mocks.h
+++ b/wangle/bootstrap/test/Mocks.h
@@ -111,7 +111,7 @@ class MockDownstreamPipelineFactory
       MockBytesToBytesHandler* downstreamHandler)
       : downstreamHandler_(downstreamHandler) {}
   DefaultPipeline::Ptr newPipeline(
-      std::shared_ptr<folly::AsyncTransportWrapper> socket,
+      std::shared_ptr<folly::AsyncTransport> socket,
       const char& /*routingData*/,
       RoutingDataHandler<char>* /*handler*/,
       std::shared_ptr<TransportInfo> /*transportInfo*/) override {
diff --git a/wangle/channel/AsyncSocketHandler.h b/wangle/channel/AsyncSocketHandler.h
index d10f227b2..3c3039732 100644
--- a/wangle/channel/AsyncSocketHandler.h
+++ b/wangle/channel/AsyncSocketHandler.h
@@ -28,10 +28,10 @@ namespace wangle {
 // This handler may only be used in a single Pipeline
 class AsyncSocketHandler
   : public wangle::BytesToBytesHandler,
-    public folly::AsyncTransportWrapper::ReadCallback {
+    public folly::AsyncTransport::ReadCallback {
  public:
   explicit AsyncSocketHandler(
-      std::shared_ptr<folly::AsyncTransportWrapper> socket)
+      std::shared_ptr<folly::AsyncTransport> socket)
     : socket_(std::move(socket)) {}
 
   AsyncSocketHandler(AsyncSocketHandler&&) = default;
@@ -188,7 +188,7 @@ class AsyncSocketHandler
     return folly::makeFuture();
   }
 
-  class WriteCallback : private folly::AsyncTransportWrapper::WriteCallback {
+  class WriteCallback : private folly::AsyncTransport::WriteCallback {
     void writeSuccess() noexcept override {
       promise_.setValue();
       delete this;
@@ -207,7 +207,7 @@ class AsyncSocketHandler
   };
 
   folly::IOBufQueue bufQueue_{folly::IOBufQueue::cacheChainLength()};
-  std::shared_ptr<folly::AsyncTransportWrapper> socket_{nullptr};
+  std::shared_ptr<folly::AsyncTransport> socket_{nullptr};
   bool firedInactive_{false};
   bool pipelineDeleted_{false};
 };
diff --git a/wangle/channel/broadcast/BroadcastHandler.h b/wangle/channel/broadcast/BroadcastHandler.h
index a4cce6c0b..8a5382979 100644
--- a/wangle/channel/broadcast/BroadcastHandler.h
+++ b/wangle/channel/broadcast/BroadcastHandler.h
@@ -105,7 +105,7 @@ class BroadcastPipelineFactory
     : public PipelineFactory<DefaultPipeline> {
  public:
   DefaultPipeline::Ptr newPipeline(
-      std::shared_ptr<folly::AsyncTransportWrapper> socket) override = 0;
+      std::shared_ptr<folly::AsyncTransport> socket) override = 0;
 
   virtual BroadcastHandler<T, R>* getBroadcastHandler(
       DefaultPipeline* pipeline) noexcept = 0;
diff --git a/wangle/channel/broadcast/ObservingHandler.h b/wangle/channel/broadcast/ObservingHandler.h
index 7a91231d5..4cb8935ae 100644
--- a/wangle/channel/broadcast/ObservingHandler.h
+++ b/wangle/channel/broadcast/ObservingHandler.h
@@ -82,7 +82,7 @@ class ObservingPipelineFactory
         broadcastPipelineFactory_(broadcastPipelineFactory) {}
 
   typename ObservingPipeline<T>::Ptr newPipeline(
-      std::shared_ptr<folly::AsyncTransportWrapper> socket,
+      std::shared_ptr<folly::AsyncTransport> socket,
       const R& routingData,
       RoutingDataHandler<R>*,
       std::shared_ptr<TransportInfo> transportInfo) override {
diff --git a/wangle/channel/broadcast/test/BroadcastPoolTest.cpp b/wangle/channel/broadcast/test/BroadcastPoolTest.cpp
index 3f83899a5..437db1f84 100644
--- a/wangle/channel/broadcast/test/BroadcastPoolTest.cpp
+++ b/wangle/channel/broadcast/test/BroadcastPoolTest.cpp
@@ -57,7 +57,7 @@ class BroadcastPoolTest : public Test {
   class ServerPipelineFactory : public PipelineFactory<DefaultPipeline> {
    public:
     DefaultPipeline::Ptr newPipeline(
-        std::shared_ptr<AsyncTransportWrapper>) override {
+        std::shared_ptr<AsyncTransport>) override {
       auto pipeline = DefaultPipeline::create();
       pipeline->addBack(new BytesToBytesHandler());
       pipeline->finalize();
diff --git a/wangle/channel/broadcast/test/Mocks.h b/wangle/channel/broadcast/test/Mocks.h
index a9f5b93f4..c45b94f10 100644
--- a/wangle/channel/broadcast/test/Mocks.h
+++ b/wangle/channel/broadcast/test/Mocks.h
@@ -127,7 +127,7 @@ class MockBroadcastPipelineFactory
     : public BroadcastPipelineFactory<int, std::string> {
  public:
   DefaultPipeline::Ptr newPipeline(
-      std::shared_ptr<folly::AsyncTransportWrapper> socket) override {
+      std::shared_ptr<folly::AsyncTransport> socket) override {
     auto pipeline = DefaultPipeline::create();
     pipeline->addBack(AsyncSocketHandler(socket));
     pipeline->addBack(std::make_shared<MockByteToMessageDecoder<int>>());
@@ -155,7 +155,7 @@ class MockObservingPipelineFactory
       : ObservingPipelineFactory(serverPool, broadcastPipelineFactory) {}
 
   ObservingPipeline<int>::Ptr newPipeline(
-      std::shared_ptr<folly::AsyncTransportWrapper>,
+      std::shared_ptr<folly::AsyncTransport>,
       const std::string& routingData,
       RoutingDataHandler<std::string>*,
       std::shared_ptr<TransportInfo>) override {
diff --git a/wangle/channel/broadcast/test/ObservingClientPipelineTest.cpp b/wangle/channel/broadcast/test/ObservingClientPipelineTest.cpp
index 7489febd1..d1ccd0aeb 100644
--- a/wangle/channel/broadcast/test/ObservingClientPipelineTest.cpp
+++ b/wangle/channel/broadcast/test/ObservingClientPipelineTest.cpp
@@ -44,7 +44,7 @@ struct TestRoutingData {
 class TestPipelineFactory : public PipelineFactory<BytesPipeline> {
  public:
   BytesPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> /* unused */) override {
+      std::shared_ptr<AsyncTransport> /* unused */) override {
     pipelines_++;
     auto pipeline = BytesPipeline::create();
     pipeline->addBack(new BytesToBytesHandler());
@@ -65,7 +65,7 @@ class CustomPipelineFactory
   }
 
   TestObsPipeline::Ptr newPipeline(
-      std::shared_ptr<folly::AsyncTransportWrapper> socket,
+      std::shared_ptr<folly::AsyncTransport> socket,
       const TestRoutingData& routingData,
       RoutingDataHandler<TestRoutingData>* /* unused */,
       std::shared_ptr<TransportInfo> /* unused */) override {
@@ -78,7 +78,7 @@ class CustomPipelineFactory
   }
 
   BytesPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     // Should not be called.
     ADD_FAILURE() << "Should not be called, "
                   << "this function is typically called from "
@@ -101,7 +101,7 @@ class CustomPipelineMakerTestClient : public TestClient {
   }
 
   void makePipeline(
-      std::shared_ptr<folly::AsyncTransportWrapper> socket) override {
+      std::shared_ptr<folly::AsyncTransport> socket) override {
     setPipeline(factory_->newPipeline(
       socket, routingData_, nullptr, nullptr));
   }
diff --git a/wangle/example/accept_steering/accept_steering_server.cpp b/wangle/example/accept_steering/accept_steering_server.cpp
index 22a02d6e5..eafeaf9b2 100644
--- a/wangle/example/accept_steering/accept_steering_server.cpp
+++ b/wangle/example/accept_steering/accept_steering_server.cpp
@@ -82,7 +82,7 @@ class ServerPipelineFactory
     : public RoutingDataPipelineFactory<DefaultPipeline, char> {
  public:
   DefaultPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock,
+      std::shared_ptr<AsyncTransport> sock,
       const char& routingData,
       RoutingDataHandler<char>*,
       std::shared_ptr<TransportInfo> transportInfo) override {
diff --git a/wangle/example/broadcast/BroadcastProxy.cpp b/wangle/example/broadcast/BroadcastProxy.cpp
index f0ae89acc..21b60c218 100644
--- a/wangle/example/broadcast/BroadcastProxy.cpp
+++ b/wangle/example/broadcast/BroadcastProxy.cpp
@@ -152,7 +152,7 @@ class SimpleBroadcastPipelineFactory
     : public BroadcastPipelineFactory<std::string, std::string> {
  public:
   DefaultPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> socket) override {
+      std::shared_ptr<AsyncTransport> socket) override {
     LOG(INFO) << "Creating a new BroadcastPipeline for upstream server";
 
     auto pipeline = DefaultPipeline::create();
@@ -191,7 +191,7 @@ class SimpleObservingPipelineFactory
             serverPool, broadcastPipelineFactory) {}
 
   SimpleObservingPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> socket,
+      std::shared_ptr<AsyncTransport> socket,
       const std::string& routingData,
       RoutingDataHandler<std::string>*,
       std::shared_ptr<TransportInfo> transportInfo) override {
diff --git a/wangle/example/echo/EchoClient.cpp b/wangle/example/echo/EchoClient.cpp
index 24314d23f..017d89597 100644
--- a/wangle/example/echo/EchoClient.cpp
+++ b/wangle/example/echo/EchoClient.cpp
@@ -53,7 +53,7 @@ class EchoHandler : public HandlerAdapter<std::string> {
 class EchoPipelineFactory : public PipelineFactory<EchoPipeline> {
  public:
   EchoPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = EchoPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(
diff --git a/wangle/example/echo/EchoServer.cpp b/wangle/example/echo/EchoServer.cpp
index b8f9bba0b..8b0ab7fd2 100644
--- a/wangle/example/echo/EchoServer.cpp
+++ b/wangle/example/echo/EchoServer.cpp
@@ -43,7 +43,7 @@ class EchoHandler : public HandlerAdapter<std::string> {
 class EchoPipelineFactory : public PipelineFactory<EchoPipeline> {
  public:
   EchoPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = EchoPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(LineBasedFrameDecoder(8192));
diff --git a/wangle/example/file/FileServer.cpp b/wangle/example/file/FileServer.cpp
index 5d3947b01..ae418a523 100644
--- a/wangle/example/file/FileServer.cpp
+++ b/wangle/example/file/FileServer.cpp
@@ -85,7 +85,7 @@ class FileServerHandler : public HandlerAdapter<std::string> {
 class FileServerPipelineFactory : public PipelineFactory<FileServerPipeline> {
  public:
   FileServerPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = FileServerPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(LineBasedFrameDecoder());
diff --git a/wangle/example/proxy/Proxy.cpp b/wangle/example/proxy/Proxy.cpp
index 95568170e..248423f69 100644
--- a/wangle/example/proxy/Proxy.cpp
+++ b/wangle/example/proxy/Proxy.cpp
@@ -57,7 +57,7 @@ class ProxyBackendPipelineFactory : public PipelineFactory<DefaultPipeline> {
       frontendPipeline_(frontendPipeline) {}
 
   DefaultPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = DefaultPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(ProxyBackendHandler(frontendPipeline_));
@@ -142,7 +142,7 @@ class ProxyFrontendPipelineFactory : public PipelineFactory<DefaultPipeline> {
       remoteAddress_(remoteAddress) {}
 
   DefaultPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = DefaultPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(std::make_shared<ProxyFrontendHandler>(remoteAddress_));
diff --git a/wangle/example/rpc/RpcClient.cpp b/wangle/example/rpc/RpcClient.cpp
index 48d554299..194a4bef4 100644
--- a/wangle/example/rpc/RpcClient.cpp
+++ b/wangle/example/rpc/RpcClient.cpp
@@ -42,7 +42,7 @@ DEFINE_string(host, "::1", "test server address");
 class RpcPipelineFactory : public PipelineFactory<SerializePipeline> {
  public:
   SerializePipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = SerializePipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     // ensure we can write from any thread
diff --git a/wangle/example/rpc/RpcServer.cpp b/wangle/example/rpc/RpcServer.cpp
index f0c98320b..f899454f6 100644
--- a/wangle/example/rpc/RpcServer.cpp
+++ b/wangle/example/rpc/RpcServer.cpp
@@ -64,7 +64,7 @@ class RpcService : public Service<Bonk, Xtruct> {
 class RpcPipelineFactory : public PipelineFactory<SerializePipeline> {
  public:
   SerializePipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = SerializePipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     // ensure we can write from any thread
diff --git a/wangle/example/ssl/Client.cpp b/wangle/example/ssl/Client.cpp
index ffa33de82..f7e6d8bd4 100644
--- a/wangle/example/ssl/Client.cpp
+++ b/wangle/example/ssl/Client.cpp
@@ -76,7 +76,7 @@ class EchoHandler : public HandlerAdapter<std::string> {
 class EchoPipelineFactory : public PipelineFactory<EchoPipeline> {
  public:
   EchoPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = EchoPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(
@@ -92,7 +92,7 @@ class EchoPipelineFactory : public PipelineFactory<EchoPipeline> {
 class EchoClientBootstrap : public ClientBootstrap<EchoPipeline> {
  public:
   void makePipeline(
-      std::shared_ptr<folly::AsyncTransportWrapper> socket) override {
+      std::shared_ptr<folly::AsyncTransport> socket) override {
     auto sslSock = socket->getUnderlyingTransport<AsyncSSLSocket>();
     if (sslSock) {
       sslSock->setSessionKey(SESSION_KEY);
diff --git a/wangle/example/ssl/Server.cpp b/wangle/example/ssl/Server.cpp
index ad2bdf9b8..9654c8ad8 100644
--- a/wangle/example/ssl/Server.cpp
+++ b/wangle/example/ssl/Server.cpp
@@ -60,7 +60,7 @@ class EchoHandler : public HandlerAdapter<std::string> {
 class EchoPipelineFactory : public PipelineFactory<EchoPipeline> {
  public:
   EchoPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = EchoPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(LineBasedFrameDecoder(8192));
diff --git a/wangle/example/telnet/TelnetClient.cpp b/wangle/example/telnet/TelnetClient.cpp
index 3c0241df1..be5b1af3d 100644
--- a/wangle/example/telnet/TelnetClient.cpp
+++ b/wangle/example/telnet/TelnetClient.cpp
@@ -51,7 +51,7 @@ class TelnetHandler : public HandlerAdapter<std::string> {
 class TelnetPipelineFactory : public PipelineFactory<TelnetPipeline> {
  public:
   TelnetPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = TelnetPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(EventBaseHandler()); // ensure we can write from any thread
diff --git a/wangle/example/telnet/TelnetServer.cpp b/wangle/example/telnet/TelnetServer.cpp
index 8090fab1b..fecb4d775 100644
--- a/wangle/example/telnet/TelnetServer.cpp
+++ b/wangle/example/telnet/TelnetServer.cpp
@@ -55,7 +55,7 @@ class TelnetHandler : public HandlerAdapter<std::string> {
 class TelnetPipelineFactory : public PipelineFactory<TelnetPipeline> {
  public:
   TelnetPipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> sock) override {
+      std::shared_ptr<AsyncTransport> sock) override {
     auto pipeline = TelnetPipeline::create();
     pipeline->addBack(AsyncSocketHandler(sock));
     pipeline->addBack(LineBasedFrameDecoder(8192));
diff --git a/wangle/service/test/ServiceTest.cpp b/wangle/service/test/ServiceTest.cpp
index 495630da7..40f6da8f9 100644
--- a/wangle/service/test/ServiceTest.cpp
+++ b/wangle/service/test/ServiceTest.cpp
@@ -59,7 +59,7 @@ class ServerPipelineFactory
  public:
 
   typename ServicePipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> socket) override {
+      std::shared_ptr<AsyncTransport> socket) override {
     auto pipeline = ServicePipeline::create();
     pipeline->addBack(AsyncSocketHandler(socket));
     pipeline->addBack(SimpleDecode());
@@ -78,7 +78,7 @@ class ClientPipelineFactory : public PipelineFactory<ServicePipeline> {
  public:
 
   typename ServicePipeline::Ptr newPipeline(
-      std::shared_ptr<AsyncTransportWrapper> socket) override {
+      std::shared_ptr<AsyncTransport> socket) override {
     auto pipeline = ServicePipeline::create();
     pipeline->addBack(AsyncSocketHandler(socket));
     pipeline->addBack(SimpleDecode());