rename

Command/Map.hs

@@ -16,7 +16,7 @@ import Data.List.Utils
 import Command
 import qualified Annex
 import qualified GitRepo as Git
-import qualified Remote.GitRemote
+import qualified Remote.Git
 import Messages
 import Types
 import Utility
@@ -203,7 +203,7 @@ tryScan r
 				Git.hConfigRead r
 
 		configlist =
-			Remote.GitRemote.onRemote r (pipedconfig, Nothing) "configlist" []
+			Remote.Git.onRemote r (pipedconfig, Nothing) "configlist" []
 		manualconfiglist = do
 			let sshcmd =
 				"cd " ++ shellEscape(Git.workTree r) ++ " && " ++

Remote.hs

@@ -27,7 +27,8 @@ import Control.Monad (when, liftM)
 import Data.List
 
 import RemoteClass
-import qualified Remote.GitRemote
+import qualified Remote.Git
+import qualified Remote.S3
 import Types
 import UUID
 import qualified Annex
@@ -36,7 +37,7 @@ import LocationLog
 
 {- add generators for new Remotes here -}
 generators :: [Annex [Remote Annex]]
-generators = [Remote.GitRemote.generate]
+generators = [Remote.Git.generate]
 
 {- Builds a list of all available Remotes.
  - Since doing so can be expensive, the list is cached in the Annex. -}