diff --git a/src/Network/Wai/Middleware/ContentType.hs b/src/Network/Wai/Middleware/ContentType.hs
--- a/src/Network/Wai/Middleware/ContentType.hs
+++ b/src/Network/Wai/Middleware/ContentType.hs
@@ -42,8 +42,6 @@
 import Network.Wai.Middleware.ContentType.Text
 import Network.Wai.Middleware.ContentType.Pandoc
 
-import qualified Network.Wai.Middleware.ContentType.Types as CT
-
 import qualified Data.HashMap.Lazy as HM
 import Data.Monoid
 import Control.Monad
diff --git a/src/Network/Wai/Middleware/ContentType/Blaze.hs b/src/Network/Wai/Middleware/ContentType/Blaze.hs
--- a/src/Network/Wai/Middleware/ContentType/Blaze.hs
+++ b/src/Network/Wai/Middleware/ContentType/Blaze.hs
@@ -3,7 +3,6 @@
 import           Network.Wai.Middleware.ContentType.Types
 import           Network.HTTP.Types                      (status200)
 import           Network.Wai                             (Response, responseBuilder)
-import           Network.Wai.HTTP2                       (Body, streamBuilder)
 
 import qualified Text.Blaze.Html                         as H
 import qualified Text.Blaze.Html.Renderer.Utf8           as H
@@ -12,26 +11,16 @@
 
 -- * Lifted Combinators
 
-blazeResponse :: Monad m =>
-                 H.Html
-              -> FileExtListenerT Response m ()
-blazeResponse i =
-  tell' $ HM.singleton Html (blazeOnlyResponse i)
-
-{-# INLINEABLE blazeResponse #-}
-
-blazeBody :: Monad m =>
-             H.Html
-          -> FileExtListenerT Body m ()
-blazeBody i =
-  tell' $ HM.singleton Html (blazeOnlyBody i)
+blaze :: Monad m =>
+         H.Html
+      -> FileExtListenerT Response m ()
+blaze i =
+  tell' $ HM.singleton Html (blazeOnly i)
 
-{-# INLINEABLE blazeBody #-}
+{-# INLINEABLE blaze #-}
 
 -- * Data Only
 
-blazeOnlyResponse :: H.Html -> Response
-blazeOnlyResponse = responseBuilder status200 [] . H.renderHtmlBuilder
+blazeOnly :: H.Html -> Response
+blazeOnly = responseBuilder status200 [] . H.renderHtmlBuilder
 
-blazeOnlyBody :: H.Html -> Body
-blazeOnlyBody = streamBuilder . H.renderHtmlBuilder
diff --git a/src/Network/Wai/Middleware/ContentType/ByteString.hs b/src/Network/Wai/Middleware/ContentType/ByteString.hs
--- a/src/Network/Wai/Middleware/ContentType/ByteString.hs
+++ b/src/Network/Wai/Middleware/ContentType/ByteString.hs
@@ -3,7 +3,6 @@
 import           Network.Wai.Middleware.ContentType.Types
 import           Network.HTTP.Types                      (status200)
 import           Network.Wai                             (Response, responseLBS)
-import           Network.Wai.HTTP2                       (Body, streamBuilder)
 
 import qualified Data.ByteString.Lazy                    as LBS
 import qualified Blaze.ByteString.Builder.ByteString     as BU
@@ -12,30 +11,18 @@
 
 -- * Lifted Combinators
 
-bytestringResponse :: Monad m =>
-                      FileExt
-                   -> LBS.ByteString
-                   -> FileExtListenerT Response m ()
-bytestringResponse fe i =
-  tell' $ HM.singleton fe (bytestringOnlyResponse i)
-
-{-# INLINEABLE bytestringResponse #-}
-
-bytestringBody :: Monad m =>
-                  FileExt
-               -> LBS.ByteString
-               -> FileExtListenerT Body m ()
-bytestringBody fe i =
-  tell' $ HM.singleton fe (bytestringOnlyBody i)
+bytestring :: Monad m =>
+              FileExt
+           -> LBS.ByteString
+           -> FileExtListenerT Response m ()
+bytestring fe i =
+  tell' $ HM.singleton fe (bytestringOnly i)
 
-{-# INLINEABLE bytestringBody #-}
+{-# INLINEABLE bytestring #-}
 
 
 -- * Data Only
 
 -- | The exact same thing as @Network.Wai.responseLBS@.
-bytestringOnlyResponse :: LBS.ByteString -> Response
-bytestringOnlyResponse = responseLBS status200 []
-
-bytestringOnlyBody :: LBS.ByteString -> Body
-bytestringOnlyBody = streamBuilder . BU.fromLazyByteString
+bytestringOnly :: LBS.ByteString -> Response
+bytestringOnly = responseLBS status200 []
diff --git a/src/Network/Wai/Middleware/ContentType/Cassius.hs b/src/Network/Wai/Middleware/ContentType/Cassius.hs
--- a/src/Network/Wai/Middleware/ContentType/Cassius.hs
+++ b/src/Network/Wai/Middleware/ContentType/Cassius.hs
@@ -3,7 +3,6 @@
 import           Network.Wai.Middleware.ContentType.Types as CT
 import           Network.Wai.Middleware.ContentType.Text
 import           Network.Wai                              (Response)
-import           Network.Wai.HTTP2                        (Body)
 
 import           Text.Cassius
 import qualified Data.Text.Lazy.Encoding                  as LT
@@ -12,29 +11,17 @@
 
 -- * Lifted Combinators
 
-cassiusResponse :: Monad m =>
-                   Css
-                -> FileExtListenerT Response m ()
-cassiusResponse i =
-  tell' $ HM.singleton CT.Css (cassiusOnlyResponse i)
-
-{-# INLINEABLE cassiusResponse #-}
-
-cassiusBody :: Monad m =>
-               Css
-            -> FileExtListenerT Body m ()
-cassiusBody i =
-  tell' $ HM.singleton CT.Css (cassiusOnlyBody i)
+cassius :: Monad m =>
+           Css
+        -> FileExtListenerT Response m ()
+cassius i =
+  tell' $ HM.singleton CT.Css (cassiusOnly i)
 
-{-# INLINEABLE cassiusBody #-}
+{-# INLINEABLE cassius #-}
 
 
 -- * Data Only
 
-cassiusOnlyResponse :: Css -> Response
-cassiusOnlyResponse =
-  textOnlyResponse . renderCss
-
-cassiusOnlyBody :: Css -> Body
-cassiusOnlyBody =
-  textOnlyBody . renderCss
+cassiusOnly :: Css -> Response
+cassiusOnly =
+  textOnly . renderCss
diff --git a/src/Network/Wai/Middleware/ContentType/Clay.hs b/src/Network/Wai/Middleware/ContentType/Clay.hs
--- a/src/Network/Wai/Middleware/ContentType/Clay.hs
+++ b/src/Network/Wai/Middleware/ContentType/Clay.hs
@@ -3,7 +3,6 @@
 import           Network.Wai.Middleware.ContentType.Types as CT
 import           Network.Wai.Middleware.ContentType.Text
 import           Network.Wai                              (Response)
-import           Network.Wai.HTTP2                        (Body)
 
 import           Clay.Render
 import           Clay.Stylesheet
@@ -12,29 +11,17 @@
 
 -- * Lifted Combinators
 
-clayResponse :: Monad m =>
-                Config -> [App] -> Css
-             -> FileExtListenerT Response m ()
-clayResponse c as i =
-  tell' $ HM.singleton CT.Css (clayOnlyResponse c as i)
-
-{-# INLINEABLE clayResponse #-}
-
-clayBody :: Monad m =>
-            Config -> [App] -> Css
-         -> FileExtListenerT Body m ()
-clayBody c as i =
-  tell' $ HM.singleton CT.Css (clayOnlyBody c as i)
+clay :: Monad m =>
+        Config -> [App] -> Css
+     -> FileExtListenerT Response m ()
+clay c as i =
+  tell' $ HM.singleton CT.Css (clayOnly c as i)
 
-{-# INLINEABLE clayBody #-}
+{-# INLINEABLE clay #-}
 
 
 -- * Data Only
 
-clayOnlyResponse :: Config -> [App] -> Css -> Response
-clayOnlyResponse c as =
-  textOnlyResponse . renderWith c as
-
-clayOnlyBody :: Config -> [App] -> Css -> Body
-clayOnlyBody c as =
-  textOnlyBody . renderWith c as
+clayOnly :: Config -> [App] -> Css -> Response
+clayOnly c as =
+  textOnly . renderWith c as
diff --git a/src/Network/Wai/Middleware/ContentType/Json.hs b/src/Network/Wai/Middleware/ContentType/Json.hs
--- a/src/Network/Wai/Middleware/ContentType/Json.hs
+++ b/src/Network/Wai/Middleware/ContentType/Json.hs
@@ -3,7 +3,6 @@
 import           Network.Wai.Middleware.ContentType.Types
 import           Network.Wai.Middleware.ContentType.ByteString
 import           Network.Wai                             (Response)
-import           Network.Wai.HTTP2                       (Body)
 
 import qualified Data.Aeson                              as A
 
@@ -11,35 +10,19 @@
 
 -- * Lifted Combinators
 
-jsonResponse :: ( A.ToJSON j
-                , Monad m
-                ) => j
-                  -> FileExtListenerT Response m ()
-jsonResponse =
-  bytestringResponse Json . A.encode
-
-{-# INLINEABLE jsonResponse #-}
-
-jsonBody :: ( A.ToJSON j
-            , Monad m
-            ) => j
-              -> FileExtListenerT Body m ()
-jsonBody =
-  bytestringBody Json . A.encode
-
-{-# INLINEABLE jsonBody #-}
+json :: ( A.ToJSON j
+        , Monad m
+        ) => j
+          -> FileExtListenerT Response m ()
+json =
+  bytestring Json . A.encode
 
+{-# INLINEABLE json #-}
 
 -- * Data Only
 
-jsonOnlyResponse :: A.ToJSON j => j -> Response
-jsonOnlyResponse =
-  bytestringOnlyResponse . A.encode
-
-{-# INLINEABLE jsonOnlyResponse #-}
-
-jsonOnlyBody :: A.ToJSON j => j -> Body
-jsonOnlyBody =
-  bytestringOnlyBody . A.encode
+jsonOnly :: A.ToJSON j => j -> Response
+jsonOnly =
+  bytestringOnly . A.encode
 
-{-# INLINEABLE jsonOnlyBody #-}
+{-# INLINEABLE jsonOnly #-}
diff --git a/src/Network/Wai/Middleware/ContentType/Julius.hs b/src/Network/Wai/Middleware/ContentType/Julius.hs
--- a/src/Network/Wai/Middleware/ContentType/Julius.hs
+++ b/src/Network/Wai/Middleware/ContentType/Julius.hs
@@ -3,7 +3,6 @@
 import           Network.Wai.Middleware.ContentType.Types as CT
 import           Network.Wai.Middleware.ContentType.Text
 import           Network.Wai                              (Response)
-import           Network.Wai.HTTP2                        (Body)
 
 import           Text.Julius
 import qualified Data.HashMap.Lazy                        as HM
@@ -11,29 +10,17 @@
 
 -- * Lifted Combinators
 
-juliusResponse :: Monad m =>
-                  Javascript
-               -> FileExtListenerT Response m ()
-juliusResponse i =
-  tell' $ HM.singleton CT.JavaScript (juliusOnlyResponse i)
-
-{-# INLINEABLE juliusResponse #-}
-
-juliusBody :: Monad m =>
-              Javascript
-           -> FileExtListenerT Body m ()
-juliusBody i =
-  tell' $ HM.singleton CT.JavaScript (juliusOnlyBody i)
+julius :: Monad m =>
+          Javascript
+       -> FileExtListenerT Response m ()
+julius i =
+  tell' $ HM.singleton CT.JavaScript (juliusOnly i)
 
-{-# INLINEABLE juliusBody #-}
+{-# INLINEABLE julius #-}
 
 
 -- * Data Only
 
-juliusOnlyResponse :: Javascript -> Response
-juliusOnlyResponse =
-  textOnlyResponse . renderJavascript
-
-juliusOnlyBody :: Javascript -> Body
-juliusOnlyBody =
-  textOnlyBody . renderJavascript
+juliusOnly :: Javascript -> Response
+juliusOnly =
+  textOnly . renderJavascript
diff --git a/src/Network/Wai/Middleware/ContentType/Lucid.hs b/src/Network/Wai/Middleware/ContentType/Lucid.hs
--- a/src/Network/Wai/Middleware/ContentType/Lucid.hs
+++ b/src/Network/Wai/Middleware/ContentType/Lucid.hs
@@ -3,7 +3,6 @@
 import           Network.Wai.Middleware.ContentType.Types
 import           Network.HTTP.Types                      (status200)
 import           Network.Wai                             (Response, responseBuilder)
-import           Network.Wai.HTTP2                       (Body, streamBuilder)
 
 import qualified Lucid.Base                              as L
 import           Control.Monad.Trans
@@ -12,36 +11,20 @@
 
 -- * Lifted Combinators
 
-lucidResponse :: Monad m =>
-                 L.HtmlT m ()
-              -> FileExtListenerT Response m ()
-lucidResponse i = do
-  i' <- lift $ lucidOnlyResponse i
-  tell' $ HM.singleton Html i'
-
-{-# INLINEABLE lucidResponse #-}
-
-lucidBody :: Monad m =>
-             L.HtmlT m ()
-          -> FileExtListenerT Body m ()
-lucidBody i = do
-  i' <- lift $ lucidOnlyBody i
-  tell' $ HM.singleton Html i'
-
-{-# INLINEABLE lucidBody #-}
+lucid :: Monad m =>
+         L.HtmlT m ()
+      -> FileExtListenerT Response m ()
+lucid i = do
+  i' <- lift (lucidOnly i)
+  tell' (HM.singleton Html i')
 
+{-# INLINEABLE lucid #-}
 
 
 -- * Data Only
 
-lucidOnlyResponse :: Monad m => L.HtmlT m () -> m Response
-lucidOnlyResponse i =
+lucidOnly :: Monad m => L.HtmlT m () -> m Response
+lucidOnly i =
   responseBuilder status200 [] <$> L.execHtmlT i
 
-{-# INLINEABLE lucidOnlyResponse #-}
-
-lucidOnlyBody :: Monad m => L.HtmlT m () -> m Body
-lucidOnlyBody i =
-  streamBuilder <$> L.execHtmlT i
-
-{-# INLINEABLE lucidOnlyBody #-}
+{-# INLINEABLE lucidOnly #-}
diff --git a/src/Network/Wai/Middleware/ContentType/Lucius.hs b/src/Network/Wai/Middleware/ContentType/Lucius.hs
--- a/src/Network/Wai/Middleware/ContentType/Lucius.hs
+++ b/src/Network/Wai/Middleware/ContentType/Lucius.hs
@@ -3,7 +3,6 @@
 import           Network.Wai.Middleware.ContentType.Types as CT
 import           Network.Wai.Middleware.ContentType.Text
 import           Network.Wai                              (Response)
-import           Network.Wai.HTTP2                        (Body)
 
 import           Text.Lucius
 import qualified Data.HashMap.Lazy                        as HM
@@ -11,27 +10,15 @@
 
 -- * Lifted Combinators
 
-luciusResponse :: Monad m => Css -> FileExtListenerT Response m ()
-luciusResponse i =
-  tell' $ HM.singleton CT.Css (luciusOnlyResponse i)
-
-{-# INLINEABLE luciusResponse #-}
-
-luciusBody :: Monad m => Css -> FileExtListenerT Body m ()
-luciusBody i =
-  tell' $ HM.singleton CT.Css (luciusOnlyBody i)
+lucius :: Monad m => Css -> FileExtListenerT Response m ()
+lucius i =
+  tell' $ HM.singleton CT.Css (luciusOnly i)
 
-{-# INLINEABLE luciusBody #-}
+{-# INLINEABLE lucius #-}
 
 
 -- * Data Only
 
-luciusOnlyResponse :: Css -> Response
-luciusOnlyResponse =
-  textOnlyResponse . renderCss
-
-luciusOnlyBody :: Css -> Body
-luciusOnlyBody =
-  textOnlyBody . renderCss
-
-
+luciusOnly :: Css -> Response
+luciusOnly =
+  textOnly . renderCss
diff --git a/src/Network/Wai/Middleware/ContentType/Pandoc.hs b/src/Network/Wai/Middleware/ContentType/Pandoc.hs
--- a/src/Network/Wai/Middleware/ContentType/Pandoc.hs
+++ b/src/Network/Wai/Middleware/ContentType/Pandoc.hs
@@ -3,7 +3,6 @@
 import           Network.Wai.Middleware.ContentType.Types
 import           Network.Wai.Middleware.ContentType.Text
 import           Network.Wai                              (Response)
-import           Network.Wai.HTTP2                        (Body)
 
 import qualified Data.Text.Lazy                           as LT
 import qualified Text.Pandoc                              as P
@@ -12,26 +11,15 @@
 
 -- * Lifted Combinators
 
-markdownResponse :: Monad m => P.Pandoc -> FileExtListenerT Response m ()
-markdownResponse i =
-  tell' $ HM.singleton Markdown (markdownOnlyResponse i)
-
-{-# INLINEABLE markdownResponse #-}
-
-markdownBody :: Monad m => P.Pandoc -> FileExtListenerT Body m ()
-markdownBody i =
-  tell' $ HM.singleton Markdown (markdownOnlyBody i)
+markdown :: Monad m => P.Pandoc -> FileExtListenerT Response m ()
+markdown i =
+  tell' $ HM.singleton Markdown (markdownOnly i)
 
-{-# INLINEABLE markdownBody #-}
+{-# INLINEABLE markdown #-}
 
 
 -- * Data Only
 
-markdownOnlyResponse :: P.Pandoc -> Response
-markdownOnlyResponse =
-  textOnlyResponse . LT.pack . P.writeMarkdown P.def
-
-markdownOnlyBody :: P.Pandoc -> Body
-markdownOnlyBody =
-  textOnlyBody . LT.pack . P.writeMarkdown P.def
-
+markdownOnly :: P.Pandoc -> Response
+markdownOnly =
+  textOnly . LT.pack . P.writeMarkdown P.def
diff --git a/src/Network/Wai/Middleware/ContentType/Text.hs b/src/Network/Wai/Middleware/ContentType/Text.hs
--- a/src/Network/Wai/Middleware/ContentType/Text.hs
+++ b/src/Network/Wai/Middleware/ContentType/Text.hs
@@ -3,7 +3,6 @@
 import           Network.Wai.Middleware.ContentType.Types
 import           Network.HTTP.Types                       (status200)
 import           Network.Wai                              (Response, responseBuilder)
-import           Network.Wai.HTTP2                        (Body, streamBuilder)
 
 import qualified Data.Text.Lazy                           as LT
 import qualified Data.Text.Lazy.Encoding                  as LT
@@ -12,26 +11,16 @@
 
 -- * Lifted Combinators
 
-textResponse :: Monad m => LT.Text -> FileExtListenerT Response m ()
-textResponse i =
-  tell' $ HM.singleton Text (textOnlyResponse i)
-
-{-# INLINEABLE textResponse #-}
-
-textBody :: Monad m => LT.Text -> FileExtListenerT Body m ()
-textBody i =
-  tell' $ HM.singleton Text (textOnlyBody i)
+text :: Monad m => LT.Text -> FileExtListenerT Response m ()
+text i =
+  tell' $ HM.singleton Text (textOnly i)
 
-{-# INLINEABLE textBody #-}
+{-# INLINEABLE text #-}
 
 
 -- * Data Only
 
-textOnlyResponse :: LT.Text -> Response
-textOnlyResponse =
+textOnly :: LT.Text -> Response
+textOnly =
   responseBuilder status200 [] . LT.encodeUtf8Builder
-
-textOnlyBody :: LT.Text -> Body
-textOnlyBody =
-  streamBuilder . LT.encodeUtf8Builder
 
diff --git a/test/Network/Wai/Middleware/ContentTypeSpec.hs b/test/Network/Wai/Middleware/ContentTypeSpec.hs
--- a/test/Network/Wai/Middleware/ContentTypeSpec.hs
+++ b/test/Network/Wai/Middleware/ContentTypeSpec.hs
@@ -164,18 +164,18 @@
       mFileExt      = getFileExt (pathInfo req)
   respond $
     case lookupFileExt mAcceptHeader mFileExt xs of
-      Nothing -> let (ResponseBuilder s h r) = textOnlyResponse "Something went wrong"
+      Nothing -> let (ResponseBuilder s h r) = textOnly "Something went wrong"
                  in (ResponseBuilder status406 [] r)
       Just r  -> r
 
 allExamples :: FileExtListenerT Response IO ()
 allExamples = do
-  textResponse "Text!"
-  jsonResponse ("Json!" :: T.Text)
-  lucidResponse (L.toHtmlRaw ("Html!" :: T.Text))
-  cassiusResponse ([SL.lucius|body {background: #fff;}|] undefined)
-  juliusResponse  ([SJ.julius|function foo () {return;}|] undefined)
-  markdownResponse $
+  text "Text!"
+  json ("Json!" :: T.Text)
+  lucid (L.toHtmlRaw ("Html!" :: T.Text))
+  cassius ([SL.lucius|body {background: #fff;}|] undefined)
+  julius  ([SJ.julius|function foo () {return;}|] undefined)
+  markdown $
     case P.readMarkdown P.def "*Pandoc*!" of
       Left e -> error $ show e
       Right p -> p
diff --git a/wai-middleware-content-type.cabal b/wai-middleware-content-type.cabal
--- a/wai-middleware-content-type.cabal
+++ b/wai-middleware-content-type.cabal
@@ -1,5 +1,5 @@
 Name:                   wai-middleware-content-type
-Version:                0.2.0
+Version:                0.2.1
 Author:                 Athan Clark <athan.clark@gmail.com>
 Maintainer:             Athan Clark <athan.clark@gmail.com>
 License:                BSD3
@@ -55,7 +55,7 @@
                       , transformers-base
                       , unordered-containers
                       , urlpath >= 5.0.0.1
-                      , wai
+                      , wai >= 3.2
 
 Test-Suite test
   Type:                 exitcode-stdio-1.0