diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,3 +3,7 @@
 ## 0.1.0.0  -- YYYY-mm-dd
 
 * First version. Released on an unsuspecting world.
+
+## 0.1.0.3 -- 2016-10-25
+
+* Clean up type names
diff --git a/http-pony-transformer-http.cabal b/http-pony-transformer-http.cabal
--- a/http-pony-transformer-http.cabal
+++ b/http-pony-transformer-http.cabal
@@ -1,5 +1,5 @@
 name:                http-pony-transformer-http
-version:             0.1.0.2
+version:             0.1.0.3
 synopsis:            Transform raw TCP stream to a basic HTTP type
 license:             BSD3
 license-file:        LICENSE
diff --git a/src/Network/HTTP/Pony/Transformer/HTTP.hs b/src/Network/HTTP/Pony/Transformer/HTTP.hs
--- a/src/Network/HTTP/Pony/Transformer/HTTP.hs
+++ b/src/Network/HTTP/Pony/Transformer/HTTP.hs
@@ -7,13 +7,13 @@
 
 import qualified Network.HTTP.Pony.Transformer.HTTP.Builder as Builder
 import qualified Network.HTTP.Pony.Transformer.HTTP.Parser as Parser
-import           Network.HTTP.Pony.Transformer.HTTP.Type (Middleware, Request', Response')
+import           Network.HTTP.Pony.Transformer.HTTP.Type (Middleware, HttpRequest, HttpResponse)
 
 http :: (Monad m) => Middleware m
                                 (Producer ByteString m a)
                                 (Producer ByteString m ())
-                                (Request' ByteString m a)
-                                (Response' ByteString m b)
+                                (HttpRequest ByteString m a)
+                                (HttpResponse ByteString m b)
 http app pull = do
   maybeRequest <- Parser.parseMessage pull (pure ())
 
diff --git a/src/Network/HTTP/Pony/Transformer/HTTP/Builder.hs b/src/Network/HTTP/Pony/Transformer/HTTP/Builder.hs
--- a/src/Network/HTTP/Pony/Transformer/HTTP/Builder.hs
+++ b/src/Network/HTTP/Pony/Transformer/HTTP/Builder.hs
@@ -7,7 +7,7 @@
 import Data.ByteString (ByteString)
 import Pipes (yield, (~>), each, Producer)
 
-import Network.HTTP.Pony.Transformer.HTTP.Type (Header, Request')
+import Network.HTTP.Pony.Transformer.HTTP.Type (Header, HttpRequest)
 
 header :: Monad m => Header -> Producer ByteString m ()
 header (key, value) = do
@@ -17,7 +17,7 @@
   yield "\r\n"
 
 
-message :: Monad m => Request' ByteString m r -> Producer ByteString m r
+message :: Monad m => HttpRequest ByteString m r -> Producer ByteString m r
 message ((startLine, headers), body) = do
   yield startLine
   yield "\n"
diff --git a/src/Network/HTTP/Pony/Transformer/HTTP/Parser.hs b/src/Network/HTTP/Pony/Transformer/HTTP/Parser.hs
--- a/src/Network/HTTP/Pony/Transformer/HTTP/Parser.hs
+++ b/src/Network/HTTP/Pony/Transformer/HTTP/Parser.hs
@@ -49,7 +49,7 @@
 
 parseMessage :: (Monad m) => Producer ByteString m r
                           -> m a
-                          -> m (Maybe (Either ParsingError (Message' ByteString m r)))
+                          -> m (Maybe (Either ParsingError (HttpMessage ByteString m r)))
 parseMessage p errHandler = do
   (r, body) <- runStateT (PA.parse message) p
 
diff --git a/src/Network/HTTP/Pony/Transformer/HTTP/Type.hs b/src/Network/HTTP/Pony/Transformer/HTTP/Type.hs
--- a/src/Network/HTTP/Pony/Transformer/HTTP/Type.hs
+++ b/src/Network/HTTP/Pony/Transformer/HTTP/Type.hs
@@ -9,11 +9,11 @@
 type HttpType = (StartLine, [Header])
 
 type Message t a m r = (t, Producer a m r)
-type Message' a m r = (HttpType, Producer a m r)
+type HttpMessage a m r = Message HttpType a m r
 
 type Request t a m r = Message t a m r
-type Request' a m r = Message' a m r
+type HttpRequest a m r = HttpMessage a m r
 type Response t a m r = Message t a m r
-type Response' a m r = Message' a m r
+type HttpResponse a m r = HttpMessage a m r
 
 type Middleware f s t a b = (a -> f b) -> s -> f t