diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs
index e5b541bb4d..6fc1e6aa4c 100644
--- a/Remote/Glacier.hs
+++ b/Remote/Glacier.hs
@@ -126,8 +126,8 @@ glacierSetup' ss u mcreds c gc = do
 	remotename = fromJust (lookupName c)
 	defvault = remotename ++ "-" ++ fromUUID u
 	defaults = M.fromList
-		[ (Proposed "datacenter", Proposed $ T.unpack $ AWS.defaultRegion AWS.Glacier)
-		, (Proposed "vault", Proposed defvault)
+		[ (datacenterField, Proposed $ T.unpack $ AWS.defaultRegion AWS.Glacier)
+		, (vaultField, Proposed defvault)
 		]
 
 prepareStore :: Remote -> Preparer Storer
diff --git a/Remote/S3.hs b/Remote/S3.hs
index b8b2969bfc..2c3369f03c 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -215,10 +215,10 @@ s3Setup' ss u mcreds c gc
 	defbucket = remotename ++ "-" ++ fromUUID u
 	defaults = M.fromList
 		[ (datacenterField, Proposed $ T.unpack $ AWS.defaultRegion AWS.S3)
-		, (Proposed "storageclass", Proposed "STANDARD")
-		, (hostField, Proposed  AWS.s3DefaultHost)
-		, (Proposed "port", Proposed "80")
-		, (Proposed "bucket", Proposed defbucket)
+		, (storageclassField, Proposed "STANDARD")
+		, (hostField, Proposed AWS.s3DefaultHost)
+		, (portField, Proposed "80")
+		, (bucketField, Proposed defbucket)
 		]
 
 	use fullconfig pc info = do
@@ -251,10 +251,10 @@ s3Setup' ss u mcreds c gc
 			M.mapKeys (Proposed . replace "x-archive-" "x-amz-" . fromProposedAccepted) $
 			-- encryption does not make sense here
 			M.insert encryptionField (Proposed "none") $
-			M.insert (Accepted "bucket") (Proposed validbucket) $
+			M.insert bucketField (Proposed validbucket) $
 			M.union c' $
 			-- special constraints on key names
-			M.insert (Proposed "mungekeys") (Proposed "ia") defaults
+			M.insert mungekeysField (Proposed "ia") defaults
 		pc <- either giveup return . parseRemoteConfig archiveconfig =<< configParser remote
 		info <- extractS3Info pc
 		checkexportimportsafe pc info