diff --git a/servant-client-core/src/Servant/Client/Core/HasClient.hs b/servant-client-core/src/Servant/Client/Core/HasClient.hs
index 676dc6870..69b97541c 100644
--- a/servant-client-core/src/Servant/Client/Core/HasClient.hs
+++ b/servant-client-core/src/Servant/Client/Core/HasClient.hs
@@ -87,7 +87,7 @@ import           Servant.Client.Core.BasicAuth
 import           Servant.Client.Core.ClientError
 import           Servant.Client.Core.Request
 import           Servant.Client.Core.Response
-import           Servant.Client.Core.ResponseUnrender
+import           Servant.Client.Core.MultiVerb.ResponseUnrender
 import qualified Servant.Client.Core.Response as Response
 import           Servant.Client.Core.RunClient
 import           Servant.API.MultiVerb
diff --git a/servant-client-core/src/Servant/Client/Core/MultiVerb/ResponseUnrender.hs b/servant-client-core/src/Servant/Client/Core/MultiVerb/ResponseUnrender.hs
index b740dec57..1dcc9c933 100644
--- a/servant-client-core/src/Servant/Client/Core/MultiVerb/ResponseUnrender.hs
+++ b/servant-client-core/src/Servant/Client/Core/MultiVerb/ResponseUnrender.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE ApplicativeDo #-}
-module Servant.Client.Core.ResponseUnrender where
+module Servant.Client.Core.MultiVerb.ResponseUnrender where
 
 import Control.Applicative
 import Control.Monad
diff --git a/servant-client-core/src/Servant/Client/Core/Response.hs b/servant-client-core/src/Servant/Client/Core/Response.hs
index 643ae1cfc..8a0196050 100644
--- a/servant-client-core/src/Servant/Client/Core/Response.hs
+++ b/servant-client-core/src/Servant/Client/Core/Response.hs
@@ -31,7 +31,7 @@ import           Network.HTTP.Types
 
 import           Servant.API.Stream
                  (SourceIO)
-import           Servant.Types.ResponseList
+import           Servant.Types.Internal.ResponseList
 
 data ResponseF a = Response
   { responseStatusCode  :: Status
diff --git a/servant-server/src/Servant/Server/Internal/ResponseRender.hs b/servant-server/src/Servant/Server/Internal/ResponseRender.hs
index 086f16d8e..2d428e2eb 100644
--- a/servant-server/src/Servant/Server/Internal/ResponseRender.hs
+++ b/servant-server/src/Servant/Server/Internal/ResponseRender.hs
@@ -19,7 +19,7 @@ import Servant.API.MultiVerb
 import Servant.API.Status
 import Servant.API.Stream (SourceIO)
 import Servant.API.UVerb.Union
-import Servant.Types.ResponseList
+import Servant.Types.Internal.ResponseList
 import qualified Network.HTTP.Media as M
 import Data.Foldable (toList)
 import Data.Sequence ((<|))
diff --git a/servant/servant.cabal b/servant/servant.cabal
index fc7a709ba..e2300a56e 100644
--- a/servant/servant.cabal
+++ b/servant/servant.cabal
@@ -116,7 +116,7 @@ library
   -- Types
   exposed-modules:
     Servant.Types.SourceT
-    Servant.Types.ResponseList
+    Servant.Types.Internal.ResponseList
 
   -- Test stuff
   exposed-modules: Servant.Test.ComprehensiveAPI
diff --git a/servant/src/Servant/Types/ResponseList.hs b/servant/src/Servant/Types/Internal/ResponseList.hs
similarity index 91%
rename from servant/src/Servant/Types/ResponseList.hs
rename to servant/src/Servant/Types/Internal/ResponseList.hs
index 0009b2dee..ddc990e4c 100644
--- a/servant/src/Servant/Types/ResponseList.hs
+++ b/servant/src/Servant/Types/Internal/ResponseList.hs
@@ -3,7 +3,7 @@
 -- | This module offers other servant libraries a minimalistic HTTP response type.
 --
 -- It is purely an internal API and SHOULD NOT be used by end-users of Servant.
-module Servant.Types.ResponseList where
+module Servant.Types.Internal.ResponseList where
 
 import Network.HTTP.Types (Status, Header)
 import Data.Sequence (Seq)