diff --git a/Command/Remotes.hs b/Command/List.hs
similarity index 95%
rename from Command/Remotes.hs
rename to Command/List.hs
index f9ae9b3cd4..61f77f7f34 100644
--- a/Command/Remotes.hs
+++ b/Command/List.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module Command.Remotes where
+module Command.List where
 
 import qualified Data.Set as S
 
@@ -16,7 +16,7 @@ import Logs.Trust
 import Annex.UUID
 
 def :: [Command]
-def = [noCommit $ command "remotes" paramPaths seek
+def = [noCommit $ command "list" paramPaths seek
 	SectionQuery "show which remotes contain files"]
 
 seek :: [CommandSeek]
diff --git a/GitAnnex.hs b/GitAnnex.hs
index ab1e8c3d0d..ad04d9fdc8 100644
--- a/GitAnnex.hs
+++ b/GitAnnex.hs
@@ -42,7 +42,7 @@ import qualified Command.Lock
 import qualified Command.PreCommit
 import qualified Command.Find
 import qualified Command.Whereis
-import qualified Command.Remotes
+import qualified Command.List
 import qualified Command.Log
 import qualified Command.Merge
 import qualified Command.Status
@@ -133,7 +133,7 @@ cmds = concat
 	, Command.AddUnused.def
 	, Command.Find.def
 	, Command.Whereis.def
-	, Command.Remotes.def
+	, Command.List.def
 	, Command.Log.def
 	, Command.Merge.def
 	, Command.Status.def
diff --git a/debian/changelog b/debian/changelog
index 4329cef844..1fd1375189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ git-annex (4.20130912) UNRELEASED; urgency=low
   * Recommend using my patched gcrypt, which fixes some bugs:
     https://github.com/joeyh/git-remote-gcrypt
   * Support hot-swapping of removable drives containing gcrypt repositories.
-  * remotes: New command, displays a compact table of remotes that
+  * list: New command, displays a compact table of remotes that
     contain files.
     (Thanks, anarcat for display code and mastensg for inspiration.)
   * fsck: Fix detection and fixing of present direct mode files that are
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 8eb633f75d..0f81e8b746 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -552,7 +552,7 @@ subdirectories).
   Displays a list of repositories known to contain the contents of the
   specified file or files.
 
-* `remotes [path ...]`
+* `list [path ...]`
 
   Displays a table of remotes that contain the contents of the specified
   files. Unlike whereis, this only shows configured remotes, not other