diff --git a/system/t02_config/CreateConfigTest_gold b/system/t02_config/CreateConfigTest_gold
index 350f89ba..996ac73d 100644
--- a/system/t02_config/CreateConfigTest_gold
+++ b/system/t02_config/CreateConfigTest_gold
@@ -1,5 +1,5 @@
 {
-  "rootDir": "${HOME}/.aptly",
+  "rootDir": "/Users/smira/.aptly",
   "downloadConcurrency": 4,
   "downloadSpeedLimit": 0,
   "architectures": [],
@@ -12,5 +12,5 @@
   "downloadSourcePackages": false,
   "ppaDistributorID": "ubuntu",
   "ppaCodename": "",
-  "S3PublishRoots": {}
+  "S3PublishEndpoints": {}
 }
\ No newline at end of file
diff --git a/utils/config.go b/utils/config.go
index f7a5bb8e..d613d9ab 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -21,7 +21,7 @@ type ConfigStructure struct {
 	DownloadSourcePackages bool                     `json:"downloadSourcePackages"`
 	PpaDistributorID       string                   `json:"ppaDistributorID"`
 	PpaCodename            string                   `json:"ppaCodename"`
-	S3PublishRoots         map[string]S3PublishRoot `json:"S3PublishRoots"`
+	S3PublishRoots         map[string]S3PublishRoot `json:"S3PublishEndpoints"`
 }
 
 // S3PublishRoot describes single S3 publishing entry point
diff --git a/utils/config_test.go b/utils/config_test.go
index 8621c8d1..c335bb3b 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -58,7 +58,7 @@ func (s *ConfigSuite) TestSaveConfig(c *C) {
 		"  \"downloadSourcePackages\": false,\n"+
 		"  \"ppaDistributorID\": \"\",\n"+
 		"  \"ppaCodename\": \"\",\n"+
-		"  \"S3PublishRoots\": {\n"+
+		"  \"S3PublishEndpoints\": {\n"+
 		"    \"test\": {\n"+
 		"      \"region\": \"us-east-1\",\n"+
 		"      \"bucket\": \"repo\",\n"+