diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go
index d4ddf42f637..ba898769578 100644
--- a/pkg/services/sqlstore/alert.go
+++ b/pkg/services/sqlstore/alert.go
@@ -190,7 +190,7 @@ func updateAlerts(existingAlerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *DBS
 				alert.Updated = timeNow()
 				alert.State = alertToUpdate.State
 				sess.MustCols("message")
-				_, err := sess.Id(alert.Id).Update(alert)
+				_, err := sess.ID(alert.Id).Update(alert)
 				if err != nil {
 					return err
 				}
@@ -249,7 +249,7 @@ func SetAlertState(cmd *m.SetAlertStateCommand) error {
 	return inTransaction(func(sess *DBSession) error {
 		alert := m.Alert{}
 
-		if has, err := sess.Id(cmd.AlertId).Get(&alert); err != nil {
+		if has, err := sess.ID(cmd.AlertId).Get(&alert); err != nil {
 			return err
 		} else if !has {
 			return fmt.Errorf("Could not find alert")
diff --git a/pkg/services/sqlstore/annotation.go b/pkg/services/sqlstore/annotation.go
index 68d6fefc8af..019f4787287 100644
--- a/pkg/services/sqlstore/annotation.go
+++ b/pkg/services/sqlstore/annotation.go
@@ -110,7 +110,7 @@ func (r *SqlAnnotationRepo) Update(item *annotations.Item) error {
 
 		existing.Tags = item.Tags
 
-		_, err = sess.Table("annotation").Id(existing.Id).Cols("epoch", "text", "region_id", "updated", "tags").Update(existing)
+		_, err = sess.Table("annotation").ID(existing.Id).Cols("epoch", "text", "region_id", "updated", "tags").Update(existing)
 		return err
 	})
 }
diff --git a/pkg/services/sqlstore/org.go b/pkg/services/sqlstore/org.go
index 8931f1cf0f5..e36a80322d8 100644
--- a/pkg/services/sqlstore/org.go
+++ b/pkg/services/sqlstore/org.go
@@ -133,7 +133,7 @@ func UpdateOrg(cmd *m.UpdateOrgCommand) error {
 			Updated: time.Now(),
 		}
 
-		affectedRows, err := sess.Id(cmd.OrgId).Update(&org)
+		affectedRows, err := sess.ID(cmd.OrgId).Update(&org)
 
 		if err != nil {
 			return err
@@ -166,7 +166,7 @@ func UpdateOrgAddress(cmd *m.UpdateOrgAddressCommand) error {
 			Updated: time.Now(),
 		}
 
-		if _, err := sess.Id(cmd.OrgId).Update(&org); err != nil {
+		if _, err := sess.ID(cmd.OrgId).Update(&org); err != nil {
 			return err
 		}
 
diff --git a/pkg/services/sqlstore/org_users.go b/pkg/services/sqlstore/org_users.go
index aad72cdacb4..14981cfde64 100644
--- a/pkg/services/sqlstore/org_users.go
+++ b/pkg/services/sqlstore/org_users.go
@@ -21,7 +21,7 @@ func AddOrgUser(cmd *m.AddOrgUserCommand) error {
 	return inTransaction(func(sess *DBSession) error {
 		// check if user exists
 		var user m.User
-		if exists, err := sess.Id(cmd.UserId).Get(&user); err != nil {
+		if exists, err := sess.ID(cmd.UserId).Get(&user); err != nil {
 			return err
 		} else if !exists {
 			return m.ErrUserNotFound
@@ -85,7 +85,7 @@ func UpdateOrgUser(cmd *m.UpdateOrgUserCommand) error {
 
 		orgUser.Role = cmd.Role
 		orgUser.Updated = time.Now()
-		_, err = sess.Id(orgUser.Id).Update(&orgUser)
+		_, err = sess.ID(orgUser.Id).Update(&orgUser)
 		if err != nil {
 			return err
 		}
@@ -138,7 +138,7 @@ func RemoveOrgUser(cmd *m.RemoveOrgUserCommand) error {
 	return inTransaction(func(sess *DBSession) error {
 		// check if user exists
 		var user m.User
-		if exists, err := sess.Id(cmd.UserId).Get(&user); err != nil {
+		if exists, err := sess.ID(cmd.UserId).Get(&user); err != nil {
 			return err
 		} else if !exists {
 			return m.ErrUserNotFound
diff --git a/pkg/services/sqlstore/plugin_setting.go b/pkg/services/sqlstore/plugin_setting.go
index 973e83eab19..8fbf1b6be1c 100644
--- a/pkg/services/sqlstore/plugin_setting.go
+++ b/pkg/services/sqlstore/plugin_setting.go
@@ -100,7 +100,7 @@ func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error {
 		pluginSetting.Pinned = cmd.Pinned
 		pluginSetting.PluginVersion = cmd.PluginVersion
 
-		_, err = sess.Id(pluginSetting.Id).Update(&pluginSetting)
+		_, err = sess.ID(pluginSetting.Id).Update(&pluginSetting)
 		return err
 	})
 }
diff --git a/pkg/services/sqlstore/preferences.go b/pkg/services/sqlstore/preferences.go
index 885837764fc..04e787971d9 100644
--- a/pkg/services/sqlstore/preferences.go
+++ b/pkg/services/sqlstore/preferences.go
@@ -94,7 +94,7 @@ func SavePreferences(cmd *m.SavePreferencesCommand) error {
 		prefs.Theme = cmd.Theme
 		prefs.Updated = time.Now()
 		prefs.Version += 1
-		_, err = sess.Id(prefs.Id).AllCols().Update(&prefs)
+		_, err = sess.ID(prefs.Id).AllCols().Update(&prefs)
 		return err
 	})
 }
diff --git a/pkg/services/sqlstore/quota.go b/pkg/services/sqlstore/quota.go
index 7b3a17b5661..7005b341268 100644
--- a/pkg/services/sqlstore/quota.go
+++ b/pkg/services/sqlstore/quota.go
@@ -116,7 +116,7 @@ func UpdateOrgQuota(cmd *m.UpdateOrgQuotaCmd) error {
 			}
 		} else {
 			//update existing quota entry in the DB.
-			if _, err := sess.Id(quota.Id).Update(&quota); err != nil {
+			if _, err := sess.ID(quota.Id).Update(&quota); err != nil {
 				return err
 			}
 		}
@@ -218,7 +218,7 @@ func UpdateUserQuota(cmd *m.UpdateUserQuotaCmd) error {
 			}
 		} else {
 			//update existing quota entry in the DB.
-			if _, err := sess.Id(quota.Id).Update(&quota); err != nil {
+			if _, err := sess.ID(quota.Id).Update(&quota); err != nil {
 				return err
 			}
 		}
diff --git a/pkg/services/sqlstore/team.go b/pkg/services/sqlstore/team.go
index d949ade0174..68811cd72f5 100644
--- a/pkg/services/sqlstore/team.go
+++ b/pkg/services/sqlstore/team.go
@@ -74,7 +74,7 @@ func UpdateTeam(cmd *m.UpdateTeamCommand) error {
 
 		sess.MustCols("email")
 
-		affectedRows, err := sess.Id(cmd.Id).Update(&team)
+		affectedRows, err := sess.ID(cmd.Id).Update(&team)
 
 		if err != nil {
 			return err
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index f7bcdbb90c9..6bd30be1869 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -240,7 +240,7 @@ func UpdateUser(cmd *m.UpdateUserCommand) error {
 			Updated: time.Now(),
 		}
 
-		if _, err := sess.Id(cmd.UserId).Update(&user); err != nil {
+		if _, err := sess.ID(cmd.UserId).Update(&user); err != nil {
 			return err
 		}
 
@@ -264,7 +264,7 @@ func ChangeUserPassword(cmd *m.ChangeUserPasswordCommand) error {
 			Updated:  time.Now(),
 		}
 
-		_, err := sess.Id(cmd.UserId).Update(&user)
+		_, err := sess.ID(cmd.UserId).Update(&user)
 		return err
 	})
 }
@@ -279,7 +279,7 @@ func UpdateUserLastSeenAt(cmd *m.UpdateUserLastSeenAtCommand) error {
 			LastSeenAt: time.Now(),
 		}
 
-		_, err := sess.Id(cmd.UserId).Update(&user)
+		_, err := sess.ID(cmd.UserId).Update(&user)
 		return err
 	})
 }
@@ -310,7 +310,7 @@ func setUsingOrgInTransaction(sess *DBSession, userID int64, orgID int64) error
 		OrgId: orgID,
 	}
 
-	_, err := sess.Id(userID).Update(&user)
+	_, err := sess.ID(userID).Update(&user)
 	return err
 }
 
@@ -472,11 +472,11 @@ func DeleteUser(cmd *m.DeleteUserCommand) error {
 func UpdateUserPermissions(cmd *m.UpdateUserPermissionsCommand) error {
 	return inTransaction(func(sess *DBSession) error {
 		user := m.User{}
-		sess.Id(cmd.UserId).Get(&user)
+		sess.ID(cmd.UserId).Get(&user)
 
 		user.IsAdmin = cmd.IsGrafanaAdmin
 		sess.UseBool("is_admin")
-		_, err := sess.Id(user.Id).Update(&user)
+		_, err := sess.ID(user.Id).Update(&user)
 		return err
 	})
 }
@@ -490,7 +490,7 @@ func SetUserHelpFlag(cmd *m.SetUserHelpFlagCommand) error {
 			Updated:    time.Now(),
 		}
 
-		_, err := sess.Id(cmd.UserId).Cols("help_flags1").Update(&user)
+		_, err := sess.ID(cmd.UserId).Cols("help_flags1").Update(&user)
 		return err
 	})
 }