diff --git a/src/adminserver/systemcfg/store/database/driver_db.go b/src/adminserver/systemcfg/store/database/driver_db.go
index d434bef16..3a922eceb 100644
--- a/src/adminserver/systemcfg/store/database/driver_db.go
+++ b/src/adminserver/systemcfg/store/database/driver_db.go
@@ -74,9 +74,9 @@ func NewCfgStore() (store.Driver, error) {
 
 // Read configuration from database
 func (c *cfgStore) Read() (map[string]interface{}, error) {
-	configEntries, error := dao.GetConfigEntries()
-	if error != nil {
-		return nil, error
+	configEntries, err := dao.GetConfigEntries()
+	if err != nil {
+		return nil, err
 	}
 	return WrapperConfig(configEntries)
 }
diff --git a/src/common/dao/config.go b/src/common/dao/config.go
index a11a551fe..edf9db639 100644
--- a/src/common/dao/config.go
+++ b/src/common/dao/config.go
@@ -54,9 +54,9 @@ func SaveConfigEntries(entries []models.ConfigEntry) error {
 		tempEntry := models.ConfigEntry{}
 		tempEntry.Key = entry.Key
 		tempEntry.Value = entry.Value
-		created, _, error := o.ReadOrCreate(&tempEntry, "k")
-		if error != nil {
-			return error
+		created, _, err := o.ReadOrCreate(&tempEntry, "k")
+		if err != nil {
+			return err
 		}
 		if !created {
 			entry.ID = tempEntry.ID