doh't use "def" for command definitions, it conflicts with Data.Default.def

86 files changed, 267 insertions, 267 deletions

diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs
index d27866030..5f5d4a151 100644
--- a/CmdLine/GitAnnex.hs
+++ b/CmdLine/GitAnnex.hs
@@ -107,91 +107,91 @@ import System.Remote.Monitoring
 
 cmds :: [Command]
 cmds = concat
-	[ Command.Add.def
-	, Command.Get.def
-	, Command.Drop.def
-	, Command.Move.def
-	, Command.Copy.def
-	, Command.Unlock.def
-	, Command.Lock.def
-	, Command.Sync.def
-	, Command.Mirror.def
-	, Command.AddUrl.def
+	[ Command.Add.cmd
+	, Command.Get.cmd
+	, Command.Drop.cmd
+	, Command.Move.cmd
+	, Command.Copy.cmd
+	, Command.Unlock.cmd
+	, Command.Lock.cmd
+	, Command.Sync.cmd
+	, Command.Mirror.cmd
+	, Command.AddUrl.cmd
 #ifdef WITH_FEED
-	, Command.ImportFeed.def
+	, Command.ImportFeed.cmd
 #endif
-	, Command.RmUrl.def
-	, Command.Import.def
-	, Command.Init.def
-	, Command.Describe.def
-	, Command.InitRemote.def
-	, Command.EnableRemote.def
-	, Command.Reinject.def
-	, Command.Unannex.def
-	, Command.Uninit.def
-	, Command.Reinit.def
-	, Command.PreCommit.def
-	, Command.NumCopies.def
-	, Command.Trust.def
-	, Command.Untrust.def
-	, Command.Semitrust.def
-	, Command.Dead.def
-	, Command.Group.def
-	, Command.Wanted.def
-	, Command.Schedule.def
-	, Command.Ungroup.def
-	, Command.Vicfg.def
-	, Command.LookupKey.def
-	, Command.ExamineKey.def
-	, Command.FromKey.def
-	, Command.DropKey.def
-	, Command.TransferKey.def
-	, Command.TransferKeys.def
-	, Command.ReKey.def
-	, Command.MetaData.def
-	, Command.View.def
-	, Command.VAdd.def
-	, Command.VFilter.def
-	, Command.VPop.def
-	, Command.VCycle.def
-	, Command.Fix.def
-	, Command.Fsck.def
-	, Command.Repair.def
-	, Command.Unused.def
-	, Command.DropUnused.def
-	, Command.AddUnused.def
-	, Command.Find.def
-	, Command.FindRef.def
-	, Command.Whereis.def
-	, Command.List.def
-	, Command.Log.def
-	, Command.Merge.def
-	, Command.ResolveMerge.def
-	, Command.Info.def
-	, Command.Status.def
-	, Command.Migrate.def
-	, Command.Map.def
-	, Command.Direct.def
-	, Command.Indirect.def
-	, Command.Upgrade.def
-	, Command.Forget.def
-	, Command.Version.def
-	, Command.Help.def
+	, Command.RmUrl.cmd
+	, Command.Import.cmd
+	, Command.Init.cmd
+	, Command.Describe.cmd
+	, Command.InitRemote.cmd
+	, Command.EnableRemote.cmd
+	, Command.Reinject.cmd
+	, Command.Unannex.cmd
+	, Command.Uninit.cmd
+	, Command.Reinit.cmd
+	, Command.PreCommit.cmd
+	, Command.NumCopies.cmd
+	, Command.Trust.cmd
+	, Command.Untrust.cmd
+	, Command.Semitrust.cmd
+	, Command.Dead.cmd
+	, Command.Group.cmd
+	, Command.Wanted.cmd
+	, Command.Schedule.cmd
+	, Command.Ungroup.cmd
+	, Command.Vicfg.cmd
+	, Command.LookupKey.cmd
+	, Command.ExamineKey.cmd
+	, Command.FromKey.cmd
+	, Command.DropKey.cmd
+	, Command.TransferKey.cmd
+	, Command.TransferKeys.cmd
+	, Command.ReKey.cmd
+	, Command.MetaData.cmd
+	, Command.View.cmd
+	, Command.VAdd.cmd
+	, Command.VFilter.cmd
+	, Command.VPop.cmd
+	, Command.VCycle.cmd
+	, Command.Fix.cmd
+	, Command.Fsck.cmd
+	, Command.Repair.cmd
+	, Command.Unused.cmd
+	, Command.DropUnused.cmd
+	, Command.AddUnused.cmd
+	, Command.Find.cmd
+	, Command.FindRef.cmd
+	, Command.Whereis.cmd
+	, Command.List.cmd
+	, Command.Log.cmd
+	, Command.Merge.cmd
+	, Command.ResolveMerge.cmd
+	, Command.Info.cmd
+	, Command.Status.cmd
+	, Command.Migrate.cmd
+	, Command.Map.cmd
+	, Command.Direct.cmd
+	, Command.Indirect.cmd
+	, Command.Upgrade.cmd
+	, Command.Forget.cmd
+	, Command.Version.cmd
+	, Command.Help.cmd
 #ifdef WITH_ASSISTANT
-	, Command.Watch.def
-	, Command.Assistant.def
+	, Command.Watch.cmd
+	, Command.Assistant.cmd
 #ifdef WITH_WEBAPP
-	, Command.WebApp.def
+	, Command.WebApp.cmd
 #endif
 #ifdef WITH_XMPP
-	, Command.XMPPGit.def
+	, Command.XMPPGit.cmd
 #endif
-	, Command.RemoteDaemon.def
+	, Command.RemoteDaemon.cmd
 #endif
-	, Command.Test.def
+	, Command.Test.cmd
 #ifdef WITH_TESTSUITE
-	, Command.FuzzTest.def
-	, Command.TestRemote.def
+	, Command.FuzzTest.cmd
+	, Command.TestRemote.cmd
 #endif
 	]
 
diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs
index 91cfd3ede..21284f400 100644
--- a/CmdLine/GitAnnexShell.hs
+++ b/CmdLine/GitAnnexShell.hs
@@ -34,19 +34,19 @@ import qualified Command.GCryptSetup
 
 cmds_readonly :: [Command]
 cmds_readonly = concat
-	[ gitAnnexShellCheck Command.ConfigList.def
-	, gitAnnexShellCheck Command.InAnnex.def
-	, gitAnnexShellCheck Command.SendKey.def
-	, gitAnnexShellCheck Command.TransferInfo.def
-	, gitAnnexShellCheck Command.NotifyChanges.def
+	[ gitAnnexShellCheck Command.ConfigList.cmd
+	, gitAnnexShellCheck Command.InAnnex.cmd
+	, gitAnnexShellCheck Command.SendKey.cmd
+	, gitAnnexShellCheck Command.TransferInfo.cmd
+	, gitAnnexShellCheck Command.NotifyChanges.cmd
 	]
 
 cmds_notreadonly :: [Command]
 cmds_notreadonly = concat
-	[ gitAnnexShellCheck Command.RecvKey.def
-	, gitAnnexShellCheck Command.DropKey.def
-	, gitAnnexShellCheck Command.Commit.def
-	, Command.GCryptSetup.def
+	[ gitAnnexShellCheck Command.RecvKey.cmd
+	, gitAnnexShellCheck Command.DropKey.cmd
+	, gitAnnexShellCheck Command.Commit.cmd
+	, Command.GCryptSetup.cmd
 	]
 
 cmds :: [Command]
diff --git a/Command/Add.hs b/Command/Add.hs
index 286324c42..519dad6e4 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -34,8 +34,8 @@ import Utility.Tmp
 
 import Control.Exception (IOException)
 
-def :: [Command]
-def = [notBareRepo $ withOptions [includeDotFilesOption] $
+cmd :: [Command]
+cmd = [notBareRepo $ withOptions [includeDotFilesOption] $
 	command "add" paramPaths seek SectionCommon
 		"add files to annex"]
 
diff --git a/Command/AddUnused.hs b/Command/AddUnused.hs
index 91427e819..69dbefc17 100644
--- a/Command/AddUnused.hs
+++ b/Command/AddUnused.hs
@@ -14,8 +14,8 @@ import qualified Command.Add
 import Command.Unused (withUnusedMaps, UnusedMaps(..), startUnused)
 import Types.Key
 
-def :: [Command]
-def = [notDirect $ command "addunused" (paramRepeating paramNumRange)
+cmd :: [Command]
+cmd = [notDirect $ command "addunused" (paramRepeating paramNumRange)
 	seek SectionMaintenance "add back unused files"]
 
 seek :: CommandSeek
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index 87711663c..81da67639 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -32,8 +32,8 @@ import Annex.Quvi
 import qualified Utility.Quvi as Quvi
 #endif
 
-def :: [Command]
-def = [notBareRepo $ withOptions [fileOption, pathdepthOption, relaxedOption] $
+cmd :: [Command]
+cmd = [notBareRepo $ withOptions [fileOption, pathdepthOption, relaxedOption] $
 	command "addurl" (paramRepeating paramUrl) seek
 		SectionCommon "add urls to annex"]
 
diff --git a/Command/Assistant.hs b/Command/Assistant.hs
index 8316a9948..8341a5694 100644
--- a/Command/Assistant.hs
+++ b/Command/Assistant.hs
@@ -18,8 +18,8 @@ import Assistant.Install
 
 import System.Environment
 
-def :: [Command]
-def = [noRepo checkAutoStart $ dontCheck repoExists $ withOptions options $
+cmd :: [Command]
+cmd = [noRepo checkAutoStart $ dontCheck repoExists $ withOptions options $
 	notBareRepo $ command "assistant" paramNothing seek SectionCommon
 		"automatically handle changes"]
 
diff --git a/Command/Commit.hs b/Command/Commit.hs
index f5f13d248..1f2478ee5 100644
--- a/Command/Commit.hs
+++ b/Command/Commit.hs
@@ -12,8 +12,8 @@ import Command
 import qualified Annex.Branch
 import qualified Git
 
-def :: [Command]
-def = [command "commit" paramNothing seek
+cmd :: [Command]
+cmd = [command "commit" paramNothing seek
 	SectionPlumbing "commits any staged changes to the git-annex branch"]
 
 seek :: CommandSeek
diff --git a/Command/ConfigList.hs b/Command/ConfigList.hs
index 2aea29b22..7d8f1ea70 100644
--- a/Command/ConfigList.hs
+++ b/Command/ConfigList.hs
@@ -15,8 +15,8 @@ import qualified Annex.Branch
 import qualified Git.Config
 import Remote.GCrypt (coreGCryptId)
 
-def :: [Command]
-def = [noCommit $ command "configlist" paramNothing seek
+cmd :: [Command]
+cmd = [noCommit $ command "configlist" paramNothing seek
 	SectionPlumbing "outputs relevant git configuration"]
 
 seek :: CommandSeek
diff --git a/Command/Copy.hs b/Command/Copy.hs
index 5acb722de..23fa83a35 100644
--- a/Command/Copy.hs
+++ b/Command/Copy.hs
@@ -14,8 +14,8 @@ import qualified Remote
 import Annex.Wanted
 import Config.NumCopies
 
-def :: [Command]
-def = [withOptions Command.Move.moveOptions $ command "copy" paramPaths seek
+cmd :: [Command]
+cmd = [withOptions Command.Move.moveOptions $ command "copy" paramPaths seek
 	SectionCommon "copy content of files to/from another repository"]
 
 seek :: CommandSeek
diff --git a/Command/Dead.hs b/Command/Dead.hs
index f9e5c2e27..c19812b73 100644
--- a/Command/Dead.hs
+++ b/Command/Dead.hs
@@ -11,8 +11,8 @@ import Command
 import Types.TrustLevel
 import Command.Trust (trustCommand)
 
-def :: [Command]
-def = [command "dead" (paramRepeating paramRemote) seek
+cmd :: [Command]
+cmd = [command "dead" (paramRepeating paramRemote) seek
 	SectionSetup "hide a lost repository"]
 
 seek :: CommandSeek
diff --git a/Command/Describe.hs b/Command/Describe.hs
index 601b3fcc9..39a762c06 100644
--- a/Command/Describe.hs
+++ b/Command/Describe.hs
@@ -12,8 +12,8 @@ import Command
 import qualified Remote
 import Logs.UUID
 
-def :: [Command]
-def = [command "describe" (paramPair paramRemote paramDesc) seek
+cmd :: [Command]
+cmd = [command "describe" (paramPair paramRemote paramDesc) seek
 	SectionSetup "change description of a repository"]
 
 seek :: CommandSeek
diff --git a/Command/Direct.hs b/Command/Direct.hs
index c64ef6e56..3493e103d 100644
--- a/Command/Direct.hs
+++ b/Command/Direct.hs
@@ -15,8 +15,8 @@ import qualified Git.Branch
 import Config
 import Annex.Direct
 
-def :: [Command]
-def = [notBareRepo $ noDaemonRunning $
+cmd :: [Command]
+cmd = [notBareRepo $ noDaemonRunning $
 	command "direct" paramNothing seek
 		SectionSetup "switch repository to direct mode"]
 
diff --git a/Command/Drop.hs b/Command/Drop.hs
index cf63d2bc7..9460c47b4 100644
--- a/Command/Drop.hs
+++ b/Command/Drop.hs
@@ -22,8 +22,8 @@ import Annex.Notification
 
 import qualified Data.Set as S
 
-def :: [Command]
-def = [withOptions [dropFromOption] $ command "drop" paramPaths seek
+cmd :: [Command]
+cmd = [withOptions [dropFromOption] $ command "drop" paramPaths seek
 	SectionCommon "indicate content of files not currently wanted"]
 
 dropFromOption :: Option
diff --git a/Command/DropKey.hs b/Command/DropKey.hs
index 8ca41bdb6..ca20a1a64 100644
--- a/Command/DropKey.hs
+++ b/Command/DropKey.hs
@@ -13,8 +13,8 @@ import qualified Annex
 import Logs.Location
 import Annex.Content
 
-def :: [Command]
-def = [noCommit $ command "dropkey" (paramRepeating paramKey) seek
+cmd :: [Command]
+cmd = [noCommit $ command "dropkey" (paramRepeating paramKey) seek
 	SectionPlumbing "drops annexed content for specified keys"] 
 
 seek :: CommandSeek
diff --git a/Command/DropUnused.hs b/Command/DropUnused.hs
index ce49795c9..b9bc2bef6 100644
--- a/Command/DropUnused.hs
+++ b/Command/DropUnused.hs
@@ -16,8 +16,8 @@ import qualified Git
 import Command.Unused (withUnusedMaps, UnusedMaps(..), startUnused)
 import Config.NumCopies
 
-def :: [Command]
-def = [withOptions [Command.Drop.dropFromOption] $
+cmd :: [Command]
+cmd = [withOptions [Command.Drop.dropFromOption] $
 	command "dropunused" (paramRepeating paramNumRange)
 		seek SectionMaintenance "drop unused file content"]
 
diff --git a/Command/EnableRemote.hs b/Command/EnableRemote.hs
index 5e21a9dbd..909f1ea2f 100644
--- a/Command/EnableRemote.hs
+++ b/Command/EnableRemote.hs
@@ -15,8 +15,8 @@ import qualified Command.InitRemote as InitRemote
 
 import qualified Data.Map as M
 
-def :: [Command]
-def = [command "enableremote"
+cmd :: [Command]
+cmd = [command "enableremote"
 	(paramPair paramName $ paramOptional $ paramRepeating paramKeyValue)
 	seek SectionSetup "enables use of an existing special remote"]
 
diff --git a/Command/ExamineKey.hs b/Command/ExamineKey.hs
index dd2bec507..94f84c5b5 100644
--- a/Command/ExamineKey.hs
+++ b/Command/ExamineKey.hs
@@ -13,8 +13,8 @@ import qualified Utility.Format
 import Command.Find (formatOption, getFormat, showFormatted, keyVars)
 import Types.Key
 
-def :: [Command]
-def = [noCommit $ noMessages $ withOptions [formatOption, jsonOption] $
+cmd :: [Command]
+cmd = [noCommit $ noMessages $ withOptions [formatOption, jsonOption] $
 	command "examinekey" (paramRepeating paramKey) seek
 	SectionPlumbing "prints information from a key"]
 
diff --git a/Command/Find.hs b/Command/Find.hs
index c800933f9..5ca2191db 100644
--- a/Command/Find.hs
+++ b/Command/Find.hs
@@ -18,8 +18,8 @@ import qualified Utility.Format
 import Utility.DataUnits
 import Types.Key
 
-def :: [Command]
-def = [mkCommand $ command "find" paramPaths seek SectionQuery "lists available files"]
+cmd :: [Command]
+cmd = [mkCommand $ command "find" paramPaths seek SectionQuery "lists available files"]
 
 mkCommand :: Command -> Command
 mkCommand = noCommit . noMessages . withOptions [formatOption, print0Option, jsonOption]
diff --git a/Command/FindRef.hs b/Command/FindRef.hs
index 26007f7c0..a552e64e4 100644
--- a/Command/FindRef.hs
+++ b/Command/FindRef.hs
@@ -10,8 +10,8 @@ module Command.FindRef where
 import Command
 import qualified Command.Find as Find
 
-def :: [Command]
-def = [Find.mkCommand $ command "findref" paramRef seek SectionPlumbing
+cmd :: [Command]
+cmd = [Find.mkCommand $ command "findref" paramRef seek SectionPlumbing
 	"lists files in a git ref"]
 
 seek :: CommandSeek
diff --git a/Command/Fix.hs b/Command/Fix.hs
index 0c2bf5942..774ef8583 100644
--- a/Command/Fix.hs
+++ b/Command/Fix.hs
@@ -18,8 +18,8 @@ import Utility.Touch
 #endif
 #endif
 
-def :: [Command]
-def = [notDirect $ noCommit $ command "fix" paramPaths seek
+cmd :: [Command]
+cmd = [notDirect $ noCommit $ command "fix" paramPaths seek
 	SectionMaintenance "fix up symlinks to point to annexed content"]
 
 seek :: CommandSeek
diff --git a/Command/Forget.hs b/Command/Forget.hs
index dbcce6cc3..3ea64d5c9 100644
--- a/Command/Forget.hs
+++ b/Command/Forget.hs
@@ -15,8 +15,8 @@ import qualified Annex
 
 import Data.Time.Clock.POSIX
 
-def :: [Command]
-def = [withOptions forgetOptions $ command "forget" paramNothing seek
+cmd :: [Command]
+cmd = [withOptions forgetOptions $ command "forget" paramNothing seek
 		SectionMaintenance "prune git-annex branch history"]
 
 forgetOptions :: [Option]
diff --git a/Command/FromKey.hs b/Command/FromKey.hs
index 7eb62fa4e..3b20749fe 100644
--- a/Command/FromKey.hs
+++ b/Command/FromKey.hs
@@ -13,8 +13,8 @@ import qualified Annex.Queue
 import Annex.Content
 import Types.Key
 
-def :: [Command]
-def = [notDirect $ notBareRepo $
+cmd :: [Command]
+cmd = [notDirect $ notBareRepo $
 	command "fromkey" (paramPair paramKey paramPath) seek
 		SectionPlumbing "adds a file using a specific key"]
 
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 1a10a15b4..46c1620f1 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -39,8 +39,8 @@ import Data.Time
 import System.Posix.Types (EpochTime)
 import System.Locale
 
-def :: [Command]
-def = [withOptions fsckOptions $ command "fsck" paramPaths seek
+cmd :: [Command]
+cmd = [withOptions fsckOptions $ command "fsck" paramPaths seek
 	SectionMaintenance "check for problems"]
 
 fsckFromOption :: Option
diff --git a/Command/FuzzTest.hs b/Command/FuzzTest.hs
index 31f31be32..87bee963f 100644
--- a/Command/FuzzTest.hs
+++ b/Command/FuzzTest.hs
@@ -20,8 +20,8 @@ import System.Random (getStdRandom, random, randomR)
 import Test.QuickCheck
 import Control.Concurrent
 
-def :: [Command]
-def = [ notBareRepo $ command "fuzztest" paramNothing seek SectionTesting
+cmd :: [Command]
+cmd = [ notBareRepo $ command "fuzztest" paramNothing seek SectionTesting
 	"generates fuzz test files"]
 
 seek :: CommandSeek
diff --git a/Command/GCryptSetup.hs b/Command/GCryptSetup.hs
index ae3dd29bd..77aadb22d 100644
--- a/Command/GCryptSetup.hs
+++ b/Command/GCryptSetup.hs
@@ -13,8 +13,8 @@ import Annex.UUID
 import qualified Remote.GCrypt
 import qualified Git
 
-def :: [Command]
-def = [dontCheck repoExists $ noCommit $
+cmd :: [Command]
+cmd = [dontCheck repoExists $ noCommit $
 	command "gcryptsetup" paramValue seek
 		SectionPlumbing "sets up gcrypt repository"]
 
diff --git a/Command/Get.hs b/Command/Get.hs
index a1db1f515..a49c7c409 100644
--- a/Command/Get.hs
+++ b/Command/Get.hs
@@ -16,8 +16,8 @@ import Config.NumCopies
 import Annex.Wanted
 import qualified Command.Move
 
-def :: [Command]
-def = [withOptions getOptions $ command "get" paramPaths seek
+cmd :: [Command]
+cmd = [withOptions getOptions $ command "get" paramPaths seek
 	SectionCommon "make content of annexed files available"]
 
 getOptions :: [Option]
diff --git a/Command/Group.hs b/Command/Group.hs
index 2b5cd2ec4..e1420be88 100644
--- a/Command/Group.hs
+++ b/Command/Group.hs
@@ -15,8 +15,8 @@ import Types.Group
 
 import qualified Data.Set as S
 
-def :: [Command]
-def = [command "group" (paramPair paramRemote paramDesc) seek
+cmd :: [Command]
+cmd = [command "group" (paramPair paramRemote paramDesc) seek
 	SectionSetup "add a repository to a group"]
 
 seek :: CommandSeek
diff --git a/Command/Help.hs b/Command/Help.hs
index 7998ed796..fc1206e03 100644
--- a/Command/Help.hs
+++ b/Command/Help.hs
@@ -21,8 +21,8 @@ import qualified Command.Fsck
 
 import System.Console.GetOpt
 
-def :: [Command]
-def = [noCommit $ noRepo startNoRepo $ dontCheck repoExists $
+cmd :: [Command]
+cmd = [noCommit $ noRepo startNoRepo $ dontCheck repoExists $
 	command "help" paramNothing seek SectionQuery "display help"]
 
 seek :: CommandSeek
@@ -47,15 +47,15 @@ showGeneralHelp :: IO ()
 showGeneralHelp = putStrLn $ unlines
 	[ "The most frequently used git-annex commands are:"
 	, unlines $ map cmdline $ concat
-		[ Command.Init.def
-		, Command.Add.def
-		, Command.Drop.def
-		, Command.Get.def
-		, Command.Move.def
-		, Command.Copy.def
-		, Command.Sync.def
-		, Command.Whereis.def
-		, Command.Fsck.def
+		[ Command.Init.cmd
+		, Command.Add.cmd
+		, Command.Drop.cmd
+		, Command.Get.cmd
+		, Command.Move.cmd
+		, Command.Copy.cmd
+		, Command.Sync.cmd
+		, Command.Whereis.cmd
+		, Command.Fsck.cmd
 		]
 	, "Run 'git-annex' for a complete command list."
 	, "Run 'git-annex command --help' for help on a specific command."
diff --git a/Command/Import.hs b/Command/Import.hs
index c8acbee04..b20e63853 100644
--- a/Command/Import.hs
+++ b/Command/Import.hs
@@ -16,8 +16,8 @@ import Backend
 import Remote
 import Types.KeySource
 
-def :: [Command]
-def = [withOptions opts $ notBareRepo $ command "import" paramPaths seek
+cmd :: [Command]
+cmd = [withOptions opts $ notBareRepo $ command "import" paramPaths seek
 	SectionCommon "move and add files from outside git working copy"]
 
 opts :: [Option]
diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs
index d11227cdf..ecfee1db8 100644
--- a/Command/ImportFeed.hs
+++ b/Command/ImportFeed.hs
@@ -37,8 +37,8 @@ import Types.MetaData
 import Logs.MetaData
 import Annex.MetaData
 
-def :: [Command]
-def = [notBareRepo $ withOptions [templateOption, relaxedOption] $
+cmd :: [Command]
+cmd = [notBareRepo $ withOptions [templateOption, relaxedOption] $
 	command "importfeed" (paramRepeating paramUrl) seek
 		SectionCommon "import files from podcast feeds"]
 
diff --git a/Command/InAnnex.hs b/Command/InAnnex.hs
index 11cbdb73d..db48a1422 100644
--- a/Command/InAnnex.hs
+++ b/Command/InAnnex.hs
@@ -11,8 +11,8 @@ import Common.Annex
 import Command
 import Annex.Content
 
-def :: [Command]
-def = [noCommit $ command "inannex" (paramRepeating paramKey) seek
+cmd :: [Command]
+cmd = [noCommit $ command "inannex" (paramRepeating paramKey) seek
 	SectionPlumbing "checks if keys are present in the annex"]
 
 seek :: CommandSeek
diff --git a/Command/Indirect.hs b/Command/Indirect.hs
index 97e6f5951..a363981be 100644
--- a/Command/Indirect.hs
+++ b/Command/Indirect.hs
@@ -22,8 +22,8 @@ import Annex.CatFile
 import Annex.Init
 import qualified Command.Add
 
-def :: [Command]
-def = [notBareRepo $ noDaemonRunning $
+cmd :: [Command]
+cmd = [notBareRepo $ noDaemonRunning $
 	command "indirect" paramNothing seek
 		SectionSetup "switch repository to indirect mode"]
 
diff --git a/Command/Info.hs b/Command/Info.hs
index 5d3c86ce6..68ac607d9 100644
--- a/Command/Info.hs
+++ b/Command/Info.hs
@@ -69,8 +69,8 @@ data StatInfo = StatInfo
 -- a state monad for running Stats in
 type StatState = StateT StatInfo Annex
 
-def :: [Command]
-def = [noCommit $ dontCheck repoExists $ withOptions [jsonOption] $
+cmd :: [Command]
+cmd = [noCommit $ dontCheck repoExists $ withOptions [jsonOption] $
 	command "info" paramPaths seek SectionQuery
 	"shows general information about the annex"]
 
diff --git a/Command/Init.hs b/Command/Init.hs
index e8d9af167..b921c0657 100644
--- a/Command/Init.hs
+++ b/Command/Init.hs
@@ -11,8 +11,8 @@ import Common.Annex
 import Command
 import Annex.Init
 	
-def :: [Command]
-def = [dontCheck repoExists $
+cmd :: [Command]
+cmd = [dontCheck repoExists $
 	command "init" paramDesc seek SectionSetup "initialize git-annex"]
 
 seek :: CommandSeek
diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs
index 2112c52f9..e2fc4146d 100644
--- a/Command/InitRemote.hs
+++ b/Command/InitRemote.hs
@@ -19,8 +19,8 @@ import Logs.Trust
 
 import Data.Ord
 
-def :: [Command]
-def = [command "initremote"
+cmd :: [Command]
+cmd = [command "initremote"
 	(paramPair paramName $ paramOptional $ paramRepeating paramKeyValue)
 	seek SectionSetup "creates a special (non-git) remote"]
 
diff --git a/Command/List.hs b/Command/List.hs
index e4d911d97..98cb82311 100644
--- a/Command/List.hs
+++ b/Command/List.hs
@@ -23,8 +23,8 @@ import Annex.UUID
 import qualified Annex
 import Git.Types (RemoteName)
 
-def :: [Command]
-def = [noCommit $ withOptions [allrepos] $ command "list" paramPaths seek
+cmd :: [Command]
+cmd = [noCommit $ withOptions [allrepos] $ command "list" paramPaths seek
 	SectionQuery "show which remotes contain files"]
 
 allrepos :: Option
diff --git a/Command/Lock.hs b/Command/Lock.hs
index e6733dcb1..f227ab380 100644
--- a/Command/Lock.hs
+++ b/Command/Lock.hs
@@ -12,8 +12,8 @@ import Command
 import qualified Annex.Queue
 import qualified Annex
 	
-def :: [Command]
-def = [notDirect $ command "lock" paramPaths seek SectionCommon
+cmd :: [Command]
+cmd = [notDirect $ command "lock" paramPaths seek SectionCommon
 	"undo unlock command"]
 
 seek :: CommandSeek
diff --git a/Command/Log.hs b/Command/Log.hs
index b0109f117..11fd51eb8 100644
--- a/Command/Log.hs
+++ b/Command/Log.hs
@@ -34,8 +34,8 @@ data RefChange = RefChange
 
 type Outputter = Bool -> POSIXTime -> [UUID] -> Annex ()
 
-def :: [Command]
-def = [withOptions options $
+cmd :: [Command]
+cmd = [withOptions options $
 	command "log" paramPaths seek SectionQuery "shows location log"]
 
 options :: [Option]
diff --git a/Command/LookupKey.hs b/Command/LookupKey.hs
index 814c5d2d7..202233233 100644
--- a/Command/LookupKey.hs
+++ b/Command/LookupKey.hs
@@ -12,8 +12,8 @@ import Command
 import Annex.CatFile
 import Types.Key
 
-def :: [Command]
-def = [notBareRepo $ noCommit $ noMessages $
+cmd :: [Command]
+cmd = [notBareRepo $ noCommit $ noMessages $
 	command "lookupkey" (paramRepeating paramFile) seek
 		SectionPlumbing "looks up key used for file"]
 
diff --git a/Command/Map.hs b/Command/Map.hs
index 2428d1362..940a0796f 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -25,8 +25,8 @@ import qualified Utility.Dot as Dot
 -- a link from the first repository to the second (its remote)
 data Link = Link Git.Repo Git.Repo
 
-def :: [Command]
-def = [dontCheck repoExists $
+cmd :: [Command]
+cmd = [dontCheck repoExists $
 	command "map" paramNothing seek SectionQuery
 		"generate map of repositories"]
 
diff --git a/Command/Merge.hs b/Command/Merge.hs
index 51a8b9c52..eeb151c27 100644
--- a/Command/Merge.hs
+++ b/Command/Merge.hs
@@ -13,8 +13,8 @@ import qualified Annex.Branch
 import qualified Git.Branch
 import Command.Sync (prepMerge, mergeLocal)
 
-def :: [Command]
-def = [command "merge" paramNothing seek SectionMaintenance
+cmd :: [Command]
+cmd = [command "merge" paramNothing seek SectionMaintenance
 	"automatically merge changes from remotes"]
 
 seek :: CommandSeek
diff --git a/Command/MetaData.hs b/Command/MetaData.hs
index 38f9b8522..50b9b1f9a 100644
--- a/Command/MetaData.hs
+++ b/Command/MetaData.hs
@@ -16,8 +16,8 @@ import Logs.MetaData
 import qualified Data.Set as S
 import Data.Time.Clock.POSIX
 
-def :: [Command]
-def = [withOptions metaDataOptions $
+cmd :: [Command]
+cmd = [withOptions metaDataOptions $
 	command "metadata" paramPaths seek
 	SectionMetaData "sets metadata of a file"]
 
diff --git a/Command/Migrate.hs b/Command/Migrate.hs
index cab807d05..19fd89c7a 100644
--- a/Command/Migrate.hs
+++ b/Command/Migrate.hs
@@ -17,8 +17,8 @@ import Annex.Content
 import qualified Command.ReKey
 import qualified Command.Fsck
 
-def :: [Command]
-def = [notDirect $ 
+cmd :: [Command]
+cmd = [notDirect $ 
 	command "migrate" paramPaths seek
 		SectionUtility "switch data to different backend"]
 
diff --git a/Command/Mirror.hs b/Command/Mirror.hs
index a3bd85975..ec9ef92c3 100644
--- a/Command/Mirror.hs
+++ b/Command/Mirror.hs
@@ -17,8 +17,8 @@ import Annex.Content
 import qualified Annex
 import Config.NumCopies
 
-def :: [Command]
-def = [withOptions (fromToOptions ++ keyOptions) $
+cmd :: [Command]
+cmd = [withOptions (fromToOptions ++ keyOptions) $
 	command "mirror" paramPaths seek
 		SectionCommon "mirror content of files to/from another repository"]
 
diff --git a/Command/Move.hs b/Command/Move.hs
index 118f3b3a7..edb7ede7b 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -17,8 +17,8 @@ import Annex.UUID
 import Annex.Transfer
 import Logs.Presence
 
-def :: [Command]
-def = [withOptions moveOptions $ command "move" paramPaths seek
+cmd :: [Command]
+cmd = [withOptions moveOptions $ command "move" paramPaths seek
 	SectionCommon "move content of files to/from another repository"]
 
 moveOptions :: [Option]
diff --git a/Command/NotifyChanges.hs b/Command/NotifyChanges.hs
index 8ec988832..36997666d 100644
--- a/Command/NotifyChanges.hs
+++ b/Command/NotifyChanges.hs
@@ -19,8 +19,8 @@ import Control.Concurrent
 import Control.Concurrent.Async
 import Control.Concurrent.STM
 
-def :: [Command]
-def = [noCommit $ command "notifychanges" paramNothing seek SectionPlumbing
+cmd :: [Command]
+cmd = [noCommit $ command "notifychanges" paramNothing seek SectionPlumbing
 	"sends notification when git refs are changed"]
 
 seek :: CommandSeek
diff --git a/Command/NumCopies.hs b/Command/NumCopies.hs
index 52eb9dcc6..773e10b6a 100644
--- a/Command/NumCopies.hs
+++ b/Command/NumCopies.hs
@@ -13,8 +13,8 @@ import Command
 import Config.NumCopies
 import Types.Messages
 
-def :: [Command]
-def = [command "numcopies" paramNumber seek
+cmd :: [Command]
+cmd = [command "numcopies" paramNumber seek
 	SectionSetup "configure desired number of copies"]
 
 seek :: CommandSeek
diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs
index 9a07115cf..aaaa51fbd 100644
--- a/Command/PreCommit.hs
+++ b/Command/PreCommit.hs
@@ -26,8 +26,8 @@ import Types.MetaData
 
 import qualified Data.Set as S
 
-def :: [Command]
-def = [command "pre-commit" paramPaths seek SectionPlumbing
+cmd :: [Command]
+cmd = [command "pre-commit" paramPaths seek SectionPlumbing
 	"run by git pre-commit hook"]
 
 seek :: CommandSeek
diff --git a/Command/ReKey.hs b/Command/ReKey.hs
index 2919a09e9..a203ab8d5 100644
--- a/Command/ReKey.hs
+++ b/Command/ReKey.hs
@@ -17,8 +17,8 @@ import Logs.Web
 import Logs.Location
 import Utility.CopyFile
 
-def :: [Command]
-def = [notDirect $ command "rekey"
+cmd :: [Command]
+cmd = [notDirect $ command "rekey"
 	(paramOptional $ paramRepeating $ paramPair paramPath paramKey)
 	seek SectionPlumbing "change keys used for files"]
 
diff --git a/Command/RecvKey.hs b/Command/RecvKey.hs
index 2ea03b055..8a806875b 100644
--- a/Command/RecvKey.hs
+++ b/Command/RecvKey.hs
@@ -20,8 +20,8 @@ import qualified Types.Key
 import qualified Types.Backend
 import qualified Backend
 
-def :: [Command]
-def = [noCommit $ command "recvkey" paramKey seek
+cmd :: [Command]
+cmd = [noCommit $ command "recvkey" paramKey seek
 	SectionPlumbing "runs rsync in server mode to receive content"]
 
 seek :: CommandSeek
diff --git a/Command/Reinit.hs b/Command/Reinit.hs
index 0fc1e8314..6de7b9932 100644
--- a/Command/Reinit.hs
+++ b/Command/Reinit.hs
@@ -14,8 +14,8 @@ import Annex.UUID
 import Types.UUID
 import qualified Remote
 	
-def :: [Command]
-def = [dontCheck repoExists $
+cmd :: [Command]
+cmd = [dontCheck repoExists $
 	command "reinit" (paramUUID ++ " or " ++ paramDesc) seek SectionUtility ""]
 
 seek :: CommandSeek
diff --git a/Command/Reinject.hs b/Command/Reinject.hs
index a516fe93c..a968f6f56 100644
--- a/Command/Reinject.hs
+++ b/Command/Reinject.hs
@@ -14,8 +14,8 @@ import Annex.Content
 import qualified Command.Fsck
 import qualified Backend
 
-def :: [Command]
-def = [command "reinject" (paramPair "SRC" "DEST") seek
+cmd :: [Command]
+cmd = [command "reinject" (paramPair "SRC" "DEST") seek
 	SectionUtility "sets content of annexed file"]
 
 seek :: CommandSeek
diff --git a/Command/RemoteDaemon.hs b/Command/RemoteDaemon.hs
index 61c3a7d84..9f4cc884d 100644
--- a/Command/RemoteDaemon.hs
+++ b/Command/RemoteDaemon.hs
@@ -11,8 +11,8 @@ import Common.Annex
 import Command
 import RemoteDaemon.Core
 
-def :: [Command]
-def = [noCommit $ command "remotedaemon" paramNothing seek SectionPlumbing
+cmd :: [Command]
+cmd = [noCommit $ command "remotedaemon" paramNothing seek SectionPlumbing
 	"detects when remotes have changed, and fetches from them"]
 
 seek :: CommandSeek
diff --git a/Command/Repair.hs b/Command/Repair.hs
index 3d70ca9cb..8eb937ce5 100644
--- a/Command/Repair.hs
+++ b/Command/Repair.hs
@@ -16,8 +16,8 @@ import qualified Git.Ref
 import Git.Types
 import Annex.Version
 
-def :: [Command]
-def = [noCommit $ dontCheck repoExists $
+cmd :: [Command]
+cmd = [noCommit $ dontCheck repoExists $
 	command "repair" paramNothing seek SectionMaintenance "recover broken git repository"]
 
 seek :: CommandSeek
diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs
index 4425ffe46..145db37df 100644
--- a/Command/ResolveMerge.hs
+++ b/Command/ResolveMerge.hs
@@ -14,8 +14,8 @@ import Git.Sha
 import qualified Git.Branch
 import Annex.AutoMerge
 
-def :: [Command]
-def = [command "resolvemerge" paramNothing seek SectionPlumbing
+cmd :: [Command]
+cmd = [command "resolvemerge" paramNothing seek SectionPlumbing
 	"resolve merge conflicts"]
 
 seek :: CommandSeek
diff --git a/Command/RmUrl.hs b/Command/RmUrl.hs
index e961575a3..1582d0f3f 100644
--- a/Command/RmUrl.hs
+++ b/Command/RmUrl.hs
@@ -11,8 +11,8 @@ import Common.Annex
 import Command
 import Logs.Web
 
-def :: [Command]
-def = [notBareRepo $
+cmd :: [Command]
+cmd = [notBareRepo $
 	command "rmurl" (paramPair paramFile paramUrl) seek
 		SectionCommon "record file is not available at url"]
 
diff --git a/Command/Schedule.hs b/Command/Schedule.hs
index 7b72990a7..ce8b67da0 100644
--- a/Command/Schedule.hs
+++ b/Command/Schedule.hs
@@ -17,8 +17,8 @@ import Types.Messages
 
 import qualified Data.Set as S
 
-def :: [Command]
-def = [command "schedule" (paramPair paramRemote (paramOptional paramExpression)) seek
+cmd :: [Command]
+cmd = [command "schedule" (paramPair paramRemote (paramOptional paramExpression)) seek
 	SectionSetup "get or set scheduled jobs"]
 
 seek :: CommandSeek
diff --git a/Command/Semitrust.hs b/Command/Semitrust.hs
index edba27346..146ec2192 100644
--- a/Command/Semitrust.hs
+++ b/Command/Semitrust.hs
@@ -11,8 +11,8 @@ import Command
 import Types.TrustLevel
 import Command.Trust (trustCommand)
 
-def :: [Command]
-def = [command "semitrust" (paramRepeating paramRemote) seek
+cmd :: [Command]
+cmd = [command "semitrust" (paramRepeating paramRemote) seek
 	SectionSetup "return repository to default trust level"]
 
 seek :: CommandSeek
diff --git a/Command/SendKey.hs b/Command/SendKey.hs
index 13e585fc6..90eca20bb 100644
--- a/Command/SendKey.hs
+++ b/Command/SendKey.hs
@@ -16,8 +16,8 @@ import Annex.Transfer
 import qualified CmdLine.GitAnnexShell.Fields as Fields
 import Utility.Metered
 
-def :: [Command]
-def = [noCommit $ command "sendkey" paramKey seek
+cmd :: [Command]
+cmd = [noCommit $ command "sendkey" paramKey seek
 	SectionPlumbing "runs rsync in server mode to send content"]
 
 seek :: CommandSeek
diff --git a/Command/Status.hs b/Command/Status.hs
index 9d184c33b..0d3efa840 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -16,8 +16,8 @@ import qualified Git.LsFiles as LsFiles
 import qualified Git.Ref
 import qualified Git
 
-def :: [Command]
-def = [notBareRepo $ noCommit $ noMessages $ withOptions [jsonOption] $
+cmd :: [Command]
+cmd = [notBareRepo $ noCommit $ noMessages $ withOptions [jsonOption] $
 	command "status" paramPaths seek SectionCommon
 		"show the working tree status"]
 
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 6819d25a0..a89737647 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -35,8 +35,8 @@ import Annex.Ssh
 
 import Control.Concurrent.MVar
 
-def :: [Command]
-def = [withOptions syncOptions $
+cmd :: [Command]
+cmd = [withOptions syncOptions $
 	command "sync" (paramOptional (paramRepeating paramRemote))
 	seek SectionCommon "synchronize local repository with remotes"]
 
diff --git a/Command/Test.hs b/Command/Test.hs
index 08e9d1b6e..4d481369d 100644
--- a/Command/Test.hs
+++ b/Command/Test.hs
@@ -11,8 +11,8 @@ import Common
 import Command
 import Messages
 
-def :: [Command]
-def = [ noRepo startIO $ dontCheck repoExists $
+cmd :: [Command]
+cmd = [ noRepo startIO $ dontCheck repoExists $
 	command "test" paramNothing seek SectionTesting
 		"run built-in test suite"]
 
diff --git a/Command/TestRemote.hs b/Command/TestRemote.hs
index 247a243e4..f0735e087 100644
--- a/Command/TestRemote.hs
+++ b/Command/TestRemote.hs
@@ -36,8 +36,8 @@ import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as L
 import qualified Data.Map as M
 
-def :: [Command]
-def = [ withOptions [sizeOption] $
+cmd :: [Command]
+cmd = [ withOptions [sizeOption] $
 		command "testremote" paramRemote seek SectionTesting
 			"test transfers to/from a remote"]
 
diff --git a/Command/TransferInfo.hs b/Command/TransferInfo.hs
index 8ab577a81..ae7fbf033 100644
--- a/Command/TransferInfo.hs
+++ b/Command/TransferInfo.hs
@@ -15,8 +15,8 @@ import Types.Key
 import qualified CmdLine.GitAnnexShell.Fields as Fields
 import Utility.Metered
 
-def :: [Command]
-def = [noCommit $ command "transferinfo" paramKey seek SectionPlumbing
+cmd :: [Command]
+cmd = [noCommit $ command "transferinfo" paramKey seek SectionPlumbing
 	"updates sender on number of bytes of content received"]
 
 seek :: CommandSeek
diff --git a/Command/TransferKey.hs b/Command/TransferKey.hs
index 13bfd825e..469e01322 100644
--- a/Command/TransferKey.hs
+++ b/Command/TransferKey.hs
@@ -15,8 +15,8 @@ import Annex.Transfer
 import qualified Remote
 import Types.Remote
 
-def :: [Command]
-def = [withOptions transferKeyOptions $
+cmd :: [Command]
+cmd = [withOptions transferKeyOptions $
 	noCommit $ command "transferkey" paramKey seek SectionPlumbing
 		"transfers a key from or to a remote"]
 
diff --git a/Command/TransferKeys.hs b/Command/TransferKeys.hs
index b9a8bf3be..346e413e6 100644
--- a/Command/TransferKeys.hs
+++ b/Command/TransferKeys.hs
@@ -21,8 +21,8 @@ import Git.Types (RemoteName)
 
 data TransferRequest = TransferRequest Direction Remote Key AssociatedFile
 
-def :: [Command]
-def = [command "transferkeys" paramNothing seek
+cmd :: [Command]
+cmd = [command "transferkeys" paramNothing seek
 	SectionPlumbing "transfers keys"]
 
 seek :: CommandSeek
diff --git a/Command/Trust.hs b/Command/Trust.hs
index c0f013699..638fc50e4 100644
--- a/Command/Trust.hs
+++ b/Command/Trust.hs
@@ -16,8 +16,8 @@ import Logs.Group
 
 import qualified Data.Set as S
 
-def :: [Command]
-def = [command "trust" (paramRepeating paramRemote) seek
+cmd :: [Command]
+cmd = [command "trust" (paramRepeating paramRemote) seek
 	SectionSetup "trust a repository"]
 
 seek :: CommandSeek
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index c105eb9ce..e8cf70f51 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -22,8 +22,8 @@ import qualified Git.DiffTree as DiffTree
 import Utility.CopyFile
 import Command.PreCommit (lockPreCommitHook)
 
-def :: [Command]
-def = [command "unannex" paramPaths seek SectionUtility
+cmd :: [Command]
+cmd = [command "unannex" paramPaths seek SectionUtility
 		"undo accidential add command"]
 
 seek :: CommandSeek
diff --git a/Command/Ungroup.hs b/Command/Ungroup.hs
index a88e3f7c8..a26bd34a9 100644
--- a/Command/Ungroup.hs
+++ b/Command/Ungroup.hs
@@ -15,8 +15,8 @@ import Types.Group
 
 import qualified Data.Set as S
 
-def :: [Command]
-def = [command "ungroup" (paramPair paramRemote paramDesc) seek
+cmd :: [Command]
+cmd = [command "ungroup" (paramPair paramRemote paramDesc) seek
 	SectionSetup "remove a repository from a group"]
 
 seek :: CommandSeek
diff --git a/Command/Uninit.hs b/Command/Uninit.hs
index 89ccc2102..ea4a3a9f6 100644
--- a/Command/Uninit.hs
+++ b/Command/Uninit.hs
@@ -21,8 +21,8 @@ import Utility.FileMode
 import System.IO.HVFS
 import System.IO.HVFS.Utils
 
-def :: [Command]
-def = [addCheck check $ command "uninit" paramPaths seek 
+cmd :: [Command]
+cmd = [addCheck check $ command "uninit" paramPaths seek 
 	SectionUtility "de-initialize git-annex and clean out repository"]
 
 check :: Annex ()
diff --git a/Command/Unlock.hs b/Command/Unlock.hs
index 02704e805..bed618104 100644
--- a/Command/Unlock.hs
+++ b/Command/Unlock.hs
@@ -12,8 +12,8 @@ import Command
 import Annex.Content
 import Utility.CopyFile
 
-def :: [Command]
-def =
+cmd :: [Command]
+cmd =
 	[ c "unlock" "unlock files for modification"
 	, c "edit" "same as unlock"
 	]
diff --git a/Command/Untrust.hs b/Command/Untrust.hs
index 4c1035dcd..ecd0ae4cf 100644
--- a/Command/Untrust.hs
+++ b/Command/Untrust.hs
@@ -11,8 +11,8 @@ import Command
 import Types.TrustLevel
 import Command.Trust (trustCommand)
 
-def :: [Command]
-def = [command "untrust" (paramRepeating paramRemote) seek
+cmd :: [Command]
+cmd = [command "untrust" (paramRepeating paramRemote) seek
 	SectionSetup "do not trust a repository"]
 
 seek :: CommandSeek
diff --git a/Command/Unused.hs b/Command/Unused.hs
index c2179447d..1859856af 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -35,8 +35,8 @@ import Git.FilePath
 import Logs.View (is_branchView)
 import Utility.Bloom
 
-def :: [Command]
-def = [withOptions [unusedFromOption] $ command "unused" paramNothing seek
+cmd :: [Command]
+cmd = [withOptions [unusedFromOption] $ command "unused" paramNothing seek
 	SectionMaintenance "look for unused file content"]
 
 unusedFromOption :: Option
diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs
index 80876290a..7e03ec3ee 100644
--- a/Command/Upgrade.hs
+++ b/Command/Upgrade.hs
@@ -11,8 +11,8 @@ import Common.Annex
 import Command
 import Upgrade
 
-def :: [Command]
-def = [dontCheck repoExists $ -- because an old version may not seem to exist
+cmd :: [Command]
+cmd = [dontCheck repoExists $ -- because an old version may not seem to exist
 	command "upgrade" paramNothing seek
 		SectionMaintenance "upgrade repository layout"]
 
diff --git a/Command/VAdd.hs b/Command/VAdd.hs
index e3726a051..33614ae59 100644
--- a/Command/VAdd.hs
+++ b/Command/VAdd.hs
@@ -12,8 +12,8 @@ import Command
 import Annex.View
 import Command.View (checkoutViewBranch)
 
-def :: [Command]
-def = [notBareRepo $ notDirect $ command "vadd" (paramRepeating "FIELD=GLOB")
+cmd :: [Command]
+cmd = [notBareRepo $ notDirect $ command "vadd" (paramRepeating "FIELD=GLOB")
 	seek SectionMetaData "add subdirs to current view"]
 
 seek :: CommandSeek
diff --git a/Command/VCycle.hs b/Command/VCycle.hs
index f7da47fa2..eead9e022 100644
--- a/Command/VCycle.hs
+++ b/Command/VCycle.hs
@@ -14,8 +14,8 @@ import Types.View
 import Logs.View
 import Command.View (checkoutViewBranch)
 
-def :: [Command]
-def = [notBareRepo $ notDirect $
+cmd :: [Command]
+cmd = [notBareRepo $ notDirect $
 	command "vcycle" paramNothing seek SectionUtility
 	"switch view to next layout"]
 
diff --git a/Command/VFilter.hs b/Command/VFilter.hs
index bd17aca45..320f28568 100644
--- a/Command/VFilter.hs
+++ b/Command/VFilter.hs
@@ -12,8 +12,8 @@ import Command
 import Annex.View
 import Command.View (paramView, checkoutViewBranch)
 
-def :: [Command]
-def = [notBareRepo $ notDirect $
+cmd :: [Command]
+cmd = [notBareRepo $ notDirect $
 	command "vfilter" paramView seek SectionMetaData "filter current view"]
 
 seek :: CommandSeek
diff --git a/Command/VPop.hs b/Command/VPop.hs
index 706a522f8..5046b54b5 100644
--- a/Command/VPop.hs
+++ b/Command/VPop.hs
@@ -16,8 +16,8 @@ import Types.View
 import Logs.View
 import Command.View (checkoutViewBranch)
 
-def :: [Command]
-def = [notBareRepo $ notDirect $
+cmd :: [Command]
+cmd = [notBareRepo $ notDirect $
 	command "vpop" (paramOptional paramNumber) seek SectionMetaData
 	"switch back to previous view"]
 
diff --git a/Command/Version.hs b/Command/Version.hs
index 526b752f0..255fd8188 100644
--- a/Command/Version.hs
+++ b/Command/Version.hs
@@ -17,8 +17,8 @@ import qualified Types.Remote as R
 import qualified Remote
 import qualified Backend
 
-def :: [Command]
-def = [noCommit $ noRepo startNoRepo $ dontCheck repoExists $
+cmd :: [Command]
+cmd = [noCommit $ noRepo startNoRepo $ dontCheck repoExists $
 	command "version" paramNothing seek SectionQuery "show version info"]
 
 seek :: CommandSeek
diff --git a/Command/Vicfg.hs b/Command/Vicfg.hs
index 834fde4e1..faa2d3f05 100644
--- a/Command/Vicfg.hs
+++ b/Command/Vicfg.hs
@@ -29,8 +29,8 @@ import Types.StandardGroups
 import Types.ScheduledActivity
 import Remote
 
-def :: [Command]
-def = [command "vicfg" paramNothing seek
+cmd :: [Command]
+cmd = [command "vicfg" paramNothing seek
 	SectionSetup "edit git-annex's configuration"]
 
 seek :: CommandSeek
@@ -101,7 +101,7 @@ defCfg curcfg = Cfg
 	}
   where
 	mapdef :: forall k v. Default v => M.Map k v -> M.Map k v
-	mapdef = M.map (const Data.Default.def)
+	mapdef = M.map (const def)
 
 diffCfg :: Cfg -> Cfg -> Cfg
 diffCfg curcfg newcfg = Cfg
@@ -142,7 +142,7 @@ genCfg cfg descs = unlines $ intercalate [""]
 		, com "(Valid trust levels: " ++ trustlevels ++ ")"
 		]
 		(\(t, u) -> line "trust" u $ showTrustLevel t)
-		(\u -> lcom $ line "trust" u $ showTrustLevel Data.Default.def)
+		(\u -> lcom $ line "trust" u $ showTrustLevel def)
 	  where
 		trustlevels = unwords $ map showTrustLevel [Trusted .. DeadTrusted]
 
diff --git a/Command/View.hs b/Command/View.hs
index 93b045c39..e8d360946 100644
--- a/Command/View.hs
+++ b/Command/View.hs
@@ -17,8 +17,8 @@ import Types.View
 import Annex.View
 import Logs.View
 
-def :: [Command]
-def = [notBareRepo $ notDirect $
+cmd :: [Command]
+cmd = [notBareRepo $ notDirect $
 	command "view" paramView seek SectionMetaData "enter a view branch"]
 
 seek :: CommandSeek
diff --git a/Command/Wanted.hs b/Command/Wanted.hs
index 9c3b0ff98..3f721e368 100644
--- a/Command/Wanted.hs
+++ b/Command/Wanted.hs
@@ -16,8 +16,8 @@ import Types.Messages
 
 import qualified Data.Map as M
 
-def :: [Command]
-def = [command "wanted" (paramPair paramRemote (paramOptional paramExpression)) seek
+cmd :: [Command]
+cmd = [command "wanted" (paramPair paramRemote (paramOptional paramExpression)) seek
 	SectionSetup "get or set preferred content expression"]
 
 seek :: CommandSeek
diff --git a/Command/Watch.hs b/Command/Watch.hs
index 79079337c..2d25b54c3 100644
--- a/Command/Watch.hs
+++ b/Command/Watch.hs
@@ -12,8 +12,8 @@ import Assistant
 import Command
 import Utility.HumanTime
 
-def :: [Command]
-def = [notBareRepo $ withOptions [foregroundOption, stopOption] $ 
+cmd :: [Command]
+cmd = [notBareRepo $ withOptions [foregroundOption, stopOption] $ 
 	command "watch" paramNothing seek SectionCommon "watch for changes"]
 
 seek :: CommandSeek
diff --git a/Command/WebApp.hs b/Command/WebApp.hs
index e329582e3..ede1ad9ba 100644
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -37,8 +37,8 @@ import Control.Concurrent.STM
 import Network.Socket (HostName)
 import System.Environment (getArgs)
 
-def :: [Command]
-def = [ withOptions [listenOption] $
+cmd :: [Command]
+cmd = [ withOptions [listenOption] $
 	noCommit $ noRepo startNoRepo $ dontCheck repoExists $ notBareRepo $
 	command "webapp" paramNothing seek SectionCommon "launch webapp"]
 
diff --git a/Command/Whereis.hs b/Command/Whereis.hs
index d2c27eb9b..582aaffc2 100644
--- a/Command/Whereis.hs
+++ b/Command/Whereis.hs
@@ -14,8 +14,8 @@ import Command
 import Remote
 import Logs.Trust
 
-def :: [Command]
-def = [noCommit $ withOptions (jsonOption : keyOptions) $
+cmd :: [Command]
+cmd = [noCommit $ withOptions (jsonOption : keyOptions) $
 	command "whereis" paramPaths seek SectionQuery
 		"lists repositories that have file content"]
 
diff --git a/Command/XMPPGit.hs b/Command/XMPPGit.hs
index 47c2d7ff2..ab238c85e 100644
--- a/Command/XMPPGit.hs
+++ b/Command/XMPPGit.hs
@@ -11,8 +11,8 @@ import Common.Annex
 import Command
 import Assistant.XMPP.Git
 
-def :: [Command]
-def = [noCommit $ noRepo startNoRepo $ dontCheck repoExists $
+cmd :: [Command]
+cmd = [noCommit $ noRepo startNoRepo $ dontCheck repoExists $
 	command "xmppgit" paramNothing seek
 		SectionPlumbing "git to XMPP relay"]
 
@@ -37,9 +37,9 @@ gitRemoteHelper = do
 	respond []
   where
 	expect s = do
-		cmd <- getLine
-		unless (cmd == s) $
-			error $ "git-remote-helpers protocol error: expected: " ++ s ++ ", but got: " ++ cmd
+		gitcmd <- getLine
+		unless (gitcmd == s) $
+			error $ "git-remote-helpers protocol error: expected: " ++ s ++ ", but got: " ++ gitcmd
 	respond l = do
 		mapM_ putStrLn l
 		putStrLn ""