diff --git a/Makefile.am b/Makefile.am
index d3103abe5ebbe22e3e7b3b050d2395f734fc8355..d6bf864b9932bbca385d817258d84e1870f46274 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -422,8 +422,8 @@ HS_LIB_SRCS = \
 	htools/Ganeti/BasicTypes.hs \
 	htools/Ganeti/Common.hs \
 	htools/Ganeti/Compat.hs \
-	htools/Ganeti/Confd.hs \
 	htools/Ganeti/Confd/Server.hs \
+	htools/Ganeti/Confd/Types.hs \
 	htools/Ganeti/Confd/Utils.hs \
 	htools/Ganeti/Config.hs \
 	htools/Ganeti/Daemon.hs \
diff --git a/htest/Test/Ganeti/Confd/Utils.hs b/htest/Test/Ganeti/Confd/Utils.hs
index f596ae3cf7cfa39a82bc4224a6e9721dab48bd84..e279e2d2284e83fd6f82fefe856b03c7ed264558 100644
--- a/htest/Test/Ganeti/Confd/Utils.hs
+++ b/htest/Test/Ganeti/Confd/Utils.hs
@@ -36,7 +36,7 @@ import Test.Ganeti.TestHelper
 import Test.Ganeti.TestCommon
 
 import qualified Ganeti.BasicTypes as BasicTypes
-import qualified Ganeti.Confd as Confd
+import qualified Ganeti.Confd.Types as Confd
 import qualified Ganeti.Confd.Utils as Confd.Utils
 import qualified Ganeti.Constants as C
 import qualified Ganeti.Hash as Hash
diff --git a/htools/Ganeti/Confd/Server.hs b/htools/Ganeti/Confd/Server.hs
index 2e9b4db7076e2df32bbf3bab0bc4d98a2bb2b761..35aab41b858a87688f63e539a676f00e34ee8da6 100644
--- a/htools/Ganeti/Confd/Server.hs
+++ b/htools/Ganeti/Confd/Server.hs
@@ -50,7 +50,7 @@ import Ganeti.Errors
 import Ganeti.Daemon
 import Ganeti.JSON
 import Ganeti.Objects
-import Ganeti.Confd
+import Ganeti.Confd.Types
 import Ganeti.Confd.Utils
 import Ganeti.Config
 import Ganeti.Hash
diff --git a/htools/Ganeti/Confd.hs b/htools/Ganeti/Confd/Types.hs
similarity index 99%
rename from htools/Ganeti/Confd.hs
rename to htools/Ganeti/Confd/Types.hs
index 6746f869073b914062ad8e6b6f6e3852b46de7c4..4ac4eaeade2659272a52e169baf9d51269ae2c05 100644
--- a/htools/Ganeti/Confd.hs
+++ b/htools/Ganeti/Confd/Types.hs
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 -}
 
-module Ganeti.Confd
+module Ganeti.Confd.Types
   ( C.confdProtocolVersion
   , C.confdMaxClockSkew
   , C.confdConfigReloadTimeout
diff --git a/htools/Ganeti/Confd/Utils.hs b/htools/Ganeti/Confd/Utils.hs
index 01c7ee714999ebb04fff7b48ebf7e35bdd132145..f79e6e8b6d871ca0ec66b5ada7b925d2e921e2ab 100644
--- a/htools/Ganeti/Confd/Utils.hs
+++ b/htools/Ganeti/Confd/Utils.hs
@@ -37,7 +37,7 @@ import qualified Data.ByteString as B
 import qualified Text.JSON as J
 
 import Ganeti.BasicTypes
-import Ganeti.Confd
+import Ganeti.Confd.Types
 import Ganeti.Hash
 import qualified Ganeti.Constants as C
 import qualified Ganeti.Path as Path