diff --git a/cabal-install/src/Distribution/Client/Errors.hs b/cabal-install/src/Distribution/Client/Errors.hs
index 1b690ec3ef4fd203329e8385f7a718801c8d28d9..5db31ba5d3baa4cc3bd8d86dbad53c475992b7f5 100644
--- a/cabal-install/src/Distribution/Client/Errors.hs
+++ b/cabal-install/src/Distribution/Client/Errors.hs
@@ -145,7 +145,7 @@ data CabalInstallException
   | FailedExtractingScriptBlock String
   | FreezeAction [String]
   | TryFindPackageDescErr String
-  | DieIfNotHaddockFailure String
+  | DieIfNotHaddockFailureException String
   | ConfigureInstallInternalError
   | CmdErrorMessages [String]
   | ReportTargetSelectorProblems [String]
@@ -293,7 +293,7 @@ exceptionCodeCabalInstall e = case e of
   FailedExtractingScriptBlock{} -> 7121
   FreezeAction{} -> 7122
   TryFindPackageDescErr{} -> 7124
-  DieIfNotHaddockFailure{} -> 7125
+  DieIfNotHaddockFailureException{} -> 7125
   ConfigureInstallInternalError{} -> 7126
   CmdErrorMessages{} -> 7127
   ReportTargetSelectorProblems{} -> 7128
@@ -630,7 +630,7 @@ exceptionMessageCabalInstall e = case e of
     "'freeze' doesn't take any extra arguments: "
       ++ unwords extraArgs
   TryFindPackageDescErr err -> err
-  DieIfNotHaddockFailure errorStr -> errorStr
+  DieIfNotHaddockFailureException errorStr -> errorStr
   ConfigureInstallInternalError ->
     "internal error: configure install plan should have exactly "
       ++ "one local ready package."
diff --git a/cabal-install/src/Distribution/Client/ProjectOrchestration.hs b/cabal-install/src/Distribution/Client/ProjectOrchestration.hs
index fdf01b90708b0514c17ccc6185adbaf13522b8c8..18ea8cf826c6a2a54bb2cafc0aab5db682862c0c 100644
--- a/cabal-install/src/Distribution/Client/ProjectOrchestration.hs
+++ b/cabal-install/src/Distribution/Client/ProjectOrchestration.hs
@@ -170,6 +170,11 @@ import Distribution.Types.UnqualComponentName
 
 import Distribution.Solver.Types.OptionalStanza
 
+import Control.Exception (assert)
+import qualified Data.List.NonEmpty as NE
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+import Distribution.Client.Errors
 import Distribution.Package
 import Distribution.Simple.Command (commandShowOptions)
 import Distribution.Simple.Compiler
@@ -214,14 +219,9 @@ import Distribution.Verbosity
 import Distribution.Version
   ( mkVersion
   )
-
-import Control.Exception (assert)
-import qualified Data.List.NonEmpty as NE
-import qualified Data.Map as Map
-import qualified Data.Set as Set
 #ifdef MIN_VERSION_unix
 import           System.Posix.Signals (sigKILL, sigSEGV)
-import Distribution.Client.Errors
+
 #endif
 
 -- | Tracks what command is being executed, because we need to hide this somewhere
@@ -1221,9 +1221,9 @@ dieOnBuildFailures verbosity currentCommand plan buildOutcomes
 
     dieIfNotHaddockFailure :: Verbosity -> String -> IO ()
     dieIfNotHaddockFailure verb str
-      | currentCommand == HaddockCommand = dieWithException verb $ DieIfNotHaddockFailure str
+      | currentCommand == HaddockCommand = dieWithException verb $ DieIfNotHaddockFailureException str
       | all isHaddockFailure failuresClassification = warn verb str
-      | otherwise = dieWithException verb $ DieIfNotHaddockFailure str
+      | otherwise = dieWithException verb $ DieIfNotHaddockFailureException str
       where
         isHaddockFailure
           (_, ShowBuildSummaryOnly (HaddocksFailed _)) = True