From 74512814eca6b66f74edbeac8a28dc96fd555371 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 28 Aug 2015 12:33:33 -0700
Subject: [PATCH] cli/ui/web: rename X.Options modules to X.XOptions

Make these modules' names more like the heavily-used types they
define (CliOpts, UIOpts, WebOpts). This is consistent with
RawOptions and ReportOptions, and helps with code navigation.
---
 extra/hledger-chart/Hledger/Chart.hs                  | 6 +++---
 extra/hledger-chart/Hledger/Chart/Main.hs             | 2 +-
 extra/hledger-chart/Hledger/Chart/Options.hs          | 2 +-
 hledger-lib/Hledger/Utils/Debug.hs                    | 2 +-
 hledger-ui/Hledger/UI.hs                              | 6 +++---
 hledger-ui/Hledger/UI/AccountsScreen.hs               | 4 ++--
 hledger-ui/Hledger/UI/Main.hs                         | 2 +-
 hledger-ui/Hledger/UI/RegisterScreen.hs               | 2 +-
 hledger-ui/Hledger/UI/{Options.hs => UIOptions.hs}    | 2 +-
 hledger-ui/Hledger/UI/UITypes.hs                      | 2 +-
 hledger-ui/hledger-ui.cabal                           | 2 +-
 hledger-web/Application.hs                            | 4 ++--
 hledger-web/Foundation.hs                             | 2 +-
 hledger-web/Handler/Common.hs                         | 4 ++--
 hledger-web/Handler/JournalR.hs                       | 4 ++--
 hledger-web/Handler/RegisterR.hs                      | 4 ++--
 hledger-web/Hledger/Web.hs                            | 6 +++---
 hledger-web/Hledger/Web/Main.hs                       | 2 +-
 hledger-web/Hledger/Web/{Options.hs => WebOptions.hs} | 2 +-
 hledger-web/hledger-web.cabal                         | 2 +-
 hledger-web/package.yaml                              | 2 +-
 hledger/Hledger/Cli.hs                                | 6 +++---
 hledger/Hledger/Cli/Accounts.hs                       | 2 +-
 hledger/Hledger/Cli/Add.hs                            | 2 +-
 hledger/Hledger/Cli/Balance.hs                        | 2 +-
 hledger/Hledger/Cli/Balancesheet.hs                   | 2 +-
 hledger/Hledger/Cli/Cashflow.hs                       | 2 +-
 hledger/Hledger/Cli/{Options.hs => CliOptions.hs}     | 8 ++++----
 hledger/Hledger/Cli/Histogram.hs                      | 2 +-
 hledger/Hledger/Cli/Incomestatement.hs                | 2 +-
 hledger/Hledger/Cli/Main.hs                           | 4 ++--
 hledger/Hledger/Cli/Print.hs                          | 2 +-
 hledger/Hledger/Cli/Register.hs                       | 2 +-
 hledger/Hledger/Cli/Stats.hs                          | 2 +-
 hledger/Hledger/Cli/Utils.hs                          | 2 +-
 hledger/hledger.cabal                                 | 2 +-
 hledger/package.yaml                                  | 2 +-
 37 files changed, 54 insertions(+), 54 deletions(-)
 rename hledger-ui/Hledger/UI/{Options.hs => UIOptions.hs} (99%)
 rename hledger-web/Hledger/Web/{Options.hs => WebOptions.hs} (99%)
 rename hledger/Hledger/Cli/{Options.hs => CliOptions.hs} (99%)

diff --git a/extra/hledger-chart/Hledger/Chart.hs b/extra/hledger-chart/Hledger/Chart.hs
index e0b2f7110..a732fae4f 100644
--- a/extra/hledger-chart/Hledger/Chart.hs
+++ b/extra/hledger-chart/Hledger/Chart.hs
@@ -4,18 +4,18 @@ Re-export the modules of the hledger-chart program.
 
 module Hledger.Chart (
                      module Hledger.Chart.Main,
-                     module Hledger.Chart.Options,
+                     module Hledger.Chart.ChartOptions,
                      tests_Hledger_Chart
               )
 where
 import Test.HUnit
 
 import Hledger.Chart.Main
-import Hledger.Chart.Options
+import Hledger.Chart.ChartOptions
 
 tests_Hledger_Chart :: Test
 tests_Hledger_Chart = TestList
  [
  --  tests_Hledger_Chart_Main
- --  tests_Hledger_Chart_Options
+ --  tests_Hledger_Chart_ChartOptions
  ]
diff --git a/extra/hledger-chart/Hledger/Chart/Main.hs b/extra/hledger-chart/Hledger/Chart/Main.hs
index 2516133b1..4300a10a6 100644
--- a/extra/hledger-chart/Hledger/Chart/Main.hs
+++ b/extra/hledger-chart/Hledger/Chart/Main.hs
@@ -23,7 +23,7 @@ import Text.Printf
 import Hledger
 import Hledger.Cli hiding (progname,progversion)
 
-import Hledger.Chart.Options
+import Hledger.Chart.ChartOptions
 
 main :: IO ()
 main = do
diff --git a/extra/hledger-chart/Hledger/Chart/Options.hs b/extra/hledger-chart/Hledger/Chart/Options.hs
index a3ffd8ee0..d0e8d8ead 100644
--- a/extra/hledger-chart/Hledger/Chart/Options.hs
+++ b/extra/hledger-chart/Hledger/Chart/Options.hs
@@ -3,7 +3,7 @@
 
 -}
 
-module Hledger.Chart.Options
+module Hledger.Chart.ChartOptions
 where
 import Data.Maybe
 import System.Console.CmdArgs
diff --git a/hledger-lib/Hledger/Utils/Debug.hs b/hledger-lib/Hledger/Utils/Debug.hs
index 82b3d9435..ab8324afd 100644
--- a/hledger-lib/Hledger/Utils/Debug.hs
+++ b/hledger-lib/Hledger/Utils/Debug.hs
@@ -71,7 +71,7 @@ ptrace msg = do
 -- a higher value (note: not @--debug N@ for some reason).  This uses
 -- unsafePerformIO and can be accessed from anywhere and before normal
 -- command-line processing. After command-line processing, it is also
--- available as the @debug_@ field of 'Hledger.Cli.Options.CliOpts'.
+-- available as the @debug_@ field of 'Hledger.Cli.CliOptions.CliOpts'.
 -- {-# OPTIONS_GHC -fno-cse #-} 
 -- {-# NOINLINE debugLevel #-}
 debugLevel :: Int
diff --git a/hledger-ui/Hledger/UI.hs b/hledger-ui/Hledger/UI.hs
index a2b167617..9e03528a9 100644
--- a/hledger-ui/Hledger/UI.hs
+++ b/hledger-ui/Hledger/UI.hs
@@ -4,7 +4,7 @@ Re-export the modules of the hledger-ui program.
 
 module Hledger.UI (
                      module Hledger.UI.Main,
-                     module Hledger.UI.Options,
+                     module Hledger.UI.UIOptions,
                      module Hledger.UI.Theme,
                      tests_Hledger_UI
               )
@@ -12,12 +12,12 @@ where
 import Test.HUnit
 
 import Hledger.UI.Main
-import Hledger.UI.Options
+import Hledger.UI.UIOptions
 import Hledger.UI.Theme
 
 tests_Hledger_UI :: Test
 tests_Hledger_UI = TestList
  [
  --  tests_Hledger_UI_Main
- --  tests_Hledger_UI_Options
+ --  tests_Hledger_UI_UIOptions
  ]
diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs
index 6972781b8..a3792b3a4 100644
--- a/hledger-ui/Hledger/UI/AccountsScreen.hs
+++ b/hledger-ui/Hledger/UI/AccountsScreen.hs
@@ -25,8 +25,8 @@ import Brick.Widgets.List
 
 import Hledger
 import Hledger.Cli hiding (progname,prognameandversion,green)
--- import Hledger.Cli.Options (defaultBalanceLineFormat)
-import Hledger.UI.Options
+-- import Hledger.Cli.CliOptions (defaultBalanceLineFormat)
+import Hledger.UI.UIOptions
 -- import Hledger.UI.Theme
 import Hledger.UI.UITypes
 import Hledger.UI.UIUtils
diff --git a/hledger-ui/Hledger/UI/Main.hs b/hledger-ui/Hledger/UI/Main.hs
index 3e3557df5..6af2bad34 100644
--- a/hledger-ui/Hledger/UI/Main.hs
+++ b/hledger-ui/Hledger/UI/Main.hs
@@ -26,7 +26,7 @@ import Brick
 
 import Hledger
 import Hledger.Cli hiding (progname,prognameandversion,green)
-import Hledger.UI.Options
+import Hledger.UI.UIOptions
 import Hledger.UI.UITypes
 -- import Hledger.UI.UIUtils
 import Hledger.UI.Theme
diff --git a/hledger-ui/Hledger/UI/RegisterScreen.hs b/hledger-ui/Hledger/UI/RegisterScreen.hs
index a90bf1272..1eab57e8a 100644
--- a/hledger-ui/Hledger/UI/RegisterScreen.hs
+++ b/hledger-ui/Hledger/UI/RegisterScreen.hs
@@ -24,7 +24,7 @@ import Brick.Widgets.List
 
 import Hledger
 import Hledger.Cli hiding (progname,prognameandversion,green)
-import Hledger.UI.Options
+import Hledger.UI.UIOptions
 -- import Hledger.UI.Theme
 import Hledger.UI.UITypes
 import Hledger.UI.UIUtils
diff --git a/hledger-ui/Hledger/UI/Options.hs b/hledger-ui/Hledger/UI/UIOptions.hs
similarity index 99%
rename from hledger-ui/Hledger/UI/Options.hs
rename to hledger-ui/Hledger/UI/UIOptions.hs
index 48dc4274e..af00c5f01 100644
--- a/hledger-ui/Hledger/UI/Options.hs
+++ b/hledger-ui/Hledger/UI/UIOptions.hs
@@ -3,7 +3,7 @@
 
 -}
 
-module Hledger.UI.Options
+module Hledger.UI.UIOptions
 where
 #if !MIN_VERSION_base(4,8,0)
 import Data.Functor.Compat ((<$>))
diff --git a/hledger-ui/Hledger/UI/UITypes.hs b/hledger-ui/Hledger/UI/UITypes.hs
index 5466a10c7..5c195b2f1 100644
--- a/hledger-ui/Hledger/UI/UITypes.hs
+++ b/hledger-ui/Hledger/UI/UITypes.hs
@@ -6,7 +6,7 @@ import Brick
 import Brick.Widgets.List (List)
 
 import Hledger
-import Hledger.UI.Options
+import Hledger.UI.UIOptions
 
 ----------------------------------------------------------------------
 
diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal
index 3913ce758..7d394de8b 100644
--- a/hledger-ui/hledger-ui.cabal
+++ b/hledger-ui/hledger-ui.cabal
@@ -76,7 +76,7 @@ executable hledger-ui
   other-modules:
       Hledger.UI
       Hledger.UI.Main
-      Hledger.UI.Options
+      Hledger.UI.UIOptions
       Hledger.UI.Theme
       Hledger.UI.UITypes
       Hledger.UI.UIUtils
diff --git a/hledger-web/Application.hs b/hledger-web/Application.hs
index 42c767770..99b43b958 100644
--- a/hledger-web/Application.hs
+++ b/hledger-web/Application.hs
@@ -36,11 +36,11 @@ import Handler.JournalR
 import Handler.RegisterR
 import Handler.SidebarR
 
-import Hledger.Web.Options (WebOpts(..), defwebopts)
+import Hledger.Web.WebOptions (WebOpts(..), defwebopts)
 import Hledger.Data (Journal, nulljournal)
 import Hledger.Read (readJournalFile)
 import Hledger.Utils (error')
-import Hledger.Cli.Options (defcliopts, journalFilePathFromOpts)
+import Hledger.Cli.CliOptions (defcliopts, journalFilePathFromOpts)
 
 -- This line actually creates our YesodDispatch instance. It is the second half
 -- of the call to mkYesodData which occurs in Foundation.hs. Please see the
diff --git a/hledger-web/Foundation.hs b/hledger-web/Foundation.hs
index 91232551b..1bfe9a083 100644
--- a/hledger-web/Foundation.hs
+++ b/hledger-web/Foundation.hs
@@ -30,7 +30,7 @@ import Text.Jasmine (minifym)
 import Text.Blaze.Html.Renderer.String (renderHtml)
 import Text.Hamlet (hamletFile)
 
-import Hledger.Web.Options
+import Hledger.Web.WebOptions
 import Hledger.Data.Types
 -- import Hledger.Web.Settings
 -- import Hledger.Web.Settings.StaticFiles
diff --git a/hledger-web/Handler/Common.hs b/hledger-web/Handler/Common.hs
index 6d1172efc..0c1f5d6fb 100644
--- a/hledger-web/Handler/Common.hs
+++ b/hledger-web/Handler/Common.hs
@@ -21,8 +21,8 @@ import Hledger.Utils
 import Hledger.Data
 import Hledger.Query
 import Hledger.Reports
-import Hledger.Cli.Options
-import Hledger.Web.Options
+import Hledger.Cli.CliOptions
+import Hledger.Web.WebOptions
 
 -------------------------------------------------------------------------------
 -- Common page layout
diff --git a/hledger-web/Handler/JournalR.hs b/hledger-web/Handler/JournalR.hs
index 8d28db6d3..e426c55b8 100644
--- a/hledger-web/Handler/JournalR.hs
+++ b/hledger-web/Handler/JournalR.hs
@@ -12,8 +12,8 @@ import Hledger.Data
 import Hledger.Query
 import Hledger.Reports
 import Hledger.Utils
-import Hledger.Cli.Options
-import Hledger.Web.Options
+import Hledger.Cli.CliOptions
+import Hledger.Web.WebOptions
 
 -- | The formatted journal view, with sidebar.
 getJournalR :: Handler Html
diff --git a/hledger-web/Handler/RegisterR.hs b/hledger-web/Handler/RegisterR.hs
index 8fa081cd6..6996ee726 100644
--- a/hledger-web/Handler/RegisterR.hs
+++ b/hledger-web/Handler/RegisterR.hs
@@ -17,8 +17,8 @@ import Hledger.Data
 import Hledger.Query
 import Hledger.Reports
 import Hledger.Utils
-import Hledger.Cli.Options
-import Hledger.Web.Options
+import Hledger.Cli.CliOptions
+import Hledger.Web.WebOptions
 
 -- | The main journal/account register view, with accounts sidebar.
 getRegisterR :: Handler Html
diff --git a/hledger-web/Hledger/Web.hs b/hledger-web/Hledger/Web.hs
index 761a2e7a1..783229801 100644
--- a/hledger-web/Hledger/Web.hs
+++ b/hledger-web/Hledger/Web.hs
@@ -3,19 +3,19 @@ Re-export the modules of the hledger-web program.
 -}
 
 module Hledger.Web (
-                     module Hledger.Web.Options,
+                     module Hledger.Web.WebOptions,
                      module Hledger.Web.Main,
                      tests_Hledger_Web
               )
 where
 import Test.HUnit
 
-import Hledger.Web.Options
+import Hledger.Web.WebOptions
 import Hledger.Web.Main
 
 tests_Hledger_Web :: Test
 tests_Hledger_Web = TestList
  [
- --  tests_Hledger_Web_Options
+ --  tests_Hledger_Web_WebOptions
  -- ,tests_Hledger_Web_Main
  ]
diff --git a/hledger-web/Hledger/Web/Main.hs b/hledger-web/Hledger/Web/Main.hs
index a78e26a74..1970a78a7 100644
--- a/hledger-web/Hledger/Web/Main.hs
+++ b/hledger-web/Hledger/Web/Main.hs
@@ -32,7 +32,7 @@ import Prelude hiding (putStrLn)
 import Hledger
 import Hledger.Utils.UTF8IOCompat (putStrLn)
 import Hledger.Cli hiding (progname,prognameandversion)
-import Hledger.Web.Options
+import Hledger.Web.WebOptions
 
 
 main :: IO ()
diff --git a/hledger-web/Hledger/Web/Options.hs b/hledger-web/Hledger/Web/WebOptions.hs
similarity index 99%
rename from hledger-web/Hledger/Web/Options.hs
rename to hledger-web/Hledger/Web/WebOptions.hs
index 70139851d..efd2c2c08 100644
--- a/hledger-web/Hledger/Web/Options.hs
+++ b/hledger-web/Hledger/Web/WebOptions.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP #-}
-module Hledger.Web.Options
+module Hledger.Web.WebOptions
 where
 import Prelude
 #if !MIN_VERSION_base(4,8,0)
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index e41412be8..1e1ed68a8 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -176,7 +176,7 @@ library
           Handler.Utils
           Hledger.Web
           Hledger.Web.Main
-          Hledger.Web.Options
+          Hledger.Web.WebOptions
           Import
           Settings
           Settings.Development
diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml
index 4d84cff6e..b32df81ab 100644
--- a/hledger-web/package.yaml
+++ b/hledger-web/package.yaml
@@ -208,7 +208,7 @@ library:
     - Handler.Utils
     - Hledger.Web
     - Hledger.Web.Main
-    - Hledger.Web.Options
+    - Hledger.Web.WebOptions
     - Import
     - Settings
     - Settings.Development
diff --git a/hledger/Hledger/Cli.hs b/hledger/Hledger/Cli.hs
index 8cb1f195f..3abaeee06 100644
--- a/hledger/Hledger/Cli.hs
+++ b/hledger/Hledger/Cli.hs
@@ -18,7 +18,7 @@ module Hledger.Cli (
                      module Hledger.Cli.Print,
                      module Hledger.Cli.Register,
                      module Hledger.Cli.Stats,
-                     module Hledger.Cli.Options,
+                     module Hledger.Cli.CliOptions,
                      module Hledger.Cli.Utils,
                      module Hledger.Cli.Version,
                      tests_Hledger_Cli,
@@ -41,7 +41,7 @@ import Hledger.Cli.Incomestatement
 import Hledger.Cli.Print
 import Hledger.Cli.Register
 import Hledger.Cli.Stats
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Hledger.Cli.Utils
 import Hledger.Cli.Version
 
@@ -56,7 +56,7 @@ tests_Hledger_Cli = TestList
    ,tests_Hledger_Cli_Cashflow
    -- ,tests_Hledger_Cli_Histogram
    ,tests_Hledger_Cli_Incomestatement
-   ,tests_Hledger_Cli_Options
+   ,tests_Hledger_Cli_CliOptions
    -- ,tests_Hledger_Cli_Print
    ,tests_Hledger_Cli_Register
    -- ,tests_Hledger_Cli_Stats
diff --git a/hledger/Hledger/Cli/Accounts.hs b/hledger/Hledger/Cli/Accounts.hs
index f19a638e9..cdef488b6 100644
--- a/hledger/Hledger/Cli/Accounts.hs
+++ b/hledger/Hledger/Cli/Accounts.hs
@@ -23,7 +23,7 @@ import Test.HUnit
 import Hledger
 import Prelude hiding (putStrLn)
 import Hledger.Utils.UTF8IOCompat (putStrLn)
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 
 
 -- | Command line options for this command.
diff --git a/hledger/Hledger/Cli/Add.hs b/hledger/Hledger/Cli/Add.hs
index 89ebac6f7..cd01284c6 100644
--- a/hledger/Hledger/Cli/Add.hs
+++ b/hledger/Hledger/Cli/Add.hs
@@ -29,7 +29,7 @@ import Text.Parsec
 import Text.Printf
 
 import Hledger
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Hledger.Cli.Register (postingsReportAsText)
 
 
diff --git a/hledger/Hledger/Cli/Balance.hs b/hledger/Hledger/Cli/Balance.hs
index 06479bdef..a67b3c81a 100644
--- a/hledger/Hledger/Cli/Balance.hs
+++ b/hledger/Hledger/Cli/Balance.hs
@@ -253,7 +253,7 @@ import Text.Tabular as T
 import Text.Tabular.AsciiArt
 
 import Hledger
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Hledger.Cli.Utils
 
 
diff --git a/hledger/Hledger/Cli/Balancesheet.hs b/hledger/Hledger/Cli/Balancesheet.hs
index ad5137115..05d5e7340 100644
--- a/hledger/Hledger/Cli/Balancesheet.hs
+++ b/hledger/Hledger/Cli/Balancesheet.hs
@@ -17,7 +17,7 @@ import Test.HUnit
 import Text.Shakespeare.Text
 
 import Hledger
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Hledger.Cli.Balance
 
 
diff --git a/hledger/Hledger/Cli/Cashflow.hs b/hledger/Hledger/Cli/Cashflow.hs
index eaf5b6bd9..288ec178d 100644
--- a/hledger/Hledger/Cli/Cashflow.hs
+++ b/hledger/Hledger/Cli/Cashflow.hs
@@ -20,7 +20,7 @@ import Test.HUnit
 import Text.Shakespeare.Text
 
 import Hledger
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Hledger.Cli.Balance
 
 
diff --git a/hledger/Hledger/Cli/Options.hs b/hledger/Hledger/Cli/CliOptions.hs
similarity index 99%
rename from hledger/Hledger/Cli/Options.hs
rename to hledger/Hledger/Cli/CliOptions.hs
index 1af5778aa..8e2043518 100644
--- a/hledger/Hledger/Cli/Options.hs
+++ b/hledger/Hledger/Cli/CliOptions.hs
@@ -6,7 +6,7 @@ related utilities used by hledger commands.
 
 -}
 
-module Hledger.Cli.Options (
+module Hledger.Cli.CliOptions (
 
   -- * cmdargs flags & modes
   helpflags,
@@ -55,7 +55,7 @@ module Hledger.Cli.Options (
   hledgerAddons,
 
   -- * Tests
-  tests_Hledger_Cli_Options
+  tests_Hledger_Cli_CliOptions
 
 )
 where
@@ -584,7 +584,7 @@ getDirectoryContentsSafe d =
 
 -- tests
 
-tests_Hledger_Cli_Options :: Test
-tests_Hledger_Cli_Options = TestList
+tests_Hledger_Cli_CliOptions :: Test
+tests_Hledger_Cli_CliOptions = TestList
  [
  ]
diff --git a/hledger/Hledger/Cli/Histogram.hs b/hledger/Hledger/Cli/Histogram.hs
index 44aaaf65e..1eb42d223 100644
--- a/hledger/Hledger/Cli/Histogram.hs
+++ b/hledger/Hledger/Cli/Histogram.hs
@@ -14,7 +14,7 @@ import System.Console.CmdArgs.Explicit
 import Text.Printf
 
 import Hledger
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Prelude hiding (putStr)
 import Hledger.Utils.UTF8IOCompat (putStr)
 
diff --git a/hledger/Hledger/Cli/Incomestatement.hs b/hledger/Hledger/Cli/Incomestatement.hs
index 26bcd4f9c..b36cec3ab 100644
--- a/hledger/Hledger/Cli/Incomestatement.hs
+++ b/hledger/Hledger/Cli/Incomestatement.hs
@@ -17,7 +17,7 @@ import Test.HUnit
 import Text.Shakespeare.Text
 
 import Hledger
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Hledger.Cli.Balance
 
 
diff --git a/hledger/Hledger/Cli/Main.hs b/hledger/Hledger/Cli/Main.hs
index aa0ca42a5..2c3d82384 100644
--- a/hledger/Hledger/Cli/Main.hs
+++ b/hledger/Hledger/Cli/Main.hs
@@ -60,7 +60,7 @@ import Hledger.Cli.Incomestatement
 import Hledger.Cli.Print
 import Hledger.Cli.Register
 import Hledger.Cli.Stats
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Hledger.Cli.Tests
 import Hledger.Cli.Utils
 import Hledger.Cli.Version
@@ -186,7 +186,7 @@ main = do
   -- on the raw command-line arguments, cmdarg's interpretation of
   -- same, and hledger-* executables in the user's PATH. A somewhat
   -- complex mishmash of cmdargs and custom processing, hence all the
-  -- debugging support and tests. See also Hledger.Cli.Options and
+  -- debugging support and tests. See also Hledger.Cli.CliOptions and
   -- command-line.test.
 
   -- some preliminary (imperfect) argument parsing to supplement cmdargs
diff --git a/hledger/Hledger/Cli/Print.hs b/hledger/Hledger/Cli/Print.hs
index e14c5f6b5..4dd22fbcc 100644
--- a/hledger/Hledger/Cli/Print.hs
+++ b/hledger/Hledger/Cli/Print.hs
@@ -18,7 +18,7 @@ import Test.HUnit
 import Text.CSV
 
 import Hledger
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Hledger.Cli.Utils
 
 
diff --git a/hledger/Hledger/Cli/Register.hs b/hledger/Hledger/Cli/Register.hs
index 127de831a..411d48e19 100644
--- a/hledger/Hledger/Cli/Register.hs
+++ b/hledger/Hledger/Cli/Register.hs
@@ -22,7 +22,7 @@ import Test.HUnit
 import Text.Printf
 
 import Hledger
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Hledger.Cli.Utils
 
 
diff --git a/hledger/Hledger/Cli/Stats.hs b/hledger/Hledger/Cli/Stats.hs
index b48b901d4..43a178777 100644
--- a/hledger/Hledger/Cli/Stats.hs
+++ b/hledger/Hledger/Cli/Stats.hs
@@ -21,7 +21,7 @@ import Text.Printf
 import qualified Data.Map as Map
 
 import Hledger
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Prelude hiding (putStr)
 import Hledger.Cli.Utils (writeOutput)
 
diff --git a/hledger/Hledger/Cli/Utils.hs b/hledger/Hledger/Cli/Utils.hs
index 7f4bd27bd..74468029d 100644
--- a/hledger/Hledger/Cli/Utils.hs
+++ b/hledger/Hledger/Cli/Utils.hs
@@ -53,7 +53,7 @@ import System.Time (ClockTime(TOD))
 import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds)
 #endif
 
-import Hledger.Cli.Options
+import Hledger.Cli.CliOptions
 import Hledger.Data
 import Hledger.Read
 import Hledger.Utils
diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal
index 6a42bab96..72b84960d 100644
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@@ -100,7 +100,7 @@ library
   exposed-modules:
       Hledger.Cli
       Hledger.Cli.Main
-      Hledger.Cli.Options
+      Hledger.Cli.CliOptions
       Hledger.Cli.Tests
       Hledger.Cli.Utils
       Hledger.Cli.Version
diff --git a/hledger/package.yaml b/hledger/package.yaml
index 3d670f664..d0a3cfff0 100644
--- a/hledger/package.yaml
+++ b/hledger/package.yaml
@@ -118,7 +118,7 @@ library:
   exposed-modules:
     - Hledger.Cli
     - Hledger.Cli.Main
-    - Hledger.Cli.Options
+    - Hledger.Cli.CliOptions
     - Hledger.Cli.Tests
     - Hledger.Cli.Utils
     - Hledger.Cli.Version