diff --git a/models/issue.go b/models/issue.go
index b93989435a..f052730059 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -174,15 +174,15 @@ func NewIssueUserPairs(rid, iid, oid, uid, aid int64) (err error) {
 		}
 
 		// In case owner is not watching.
-		ws = append(ws, &Watch{Uid: id})
+		ws = append(ws, &Watch{UserId: id})
 	}
 
 	for _, w := range ws {
-		if w.Uid == 0 {
+		if w.UserId == 0 {
 			continue
 		}
 
-		iu.Uid = w.Uid
+		iu.Uid = w.UserId
 		iu.IsPoster = iu.Uid == uid
 		iu.IsAssigned = iu.Uid == aid
 		if _, err = orm.Insert(iu); err != nil {
diff --git a/models/repo.go b/models/repo.go
index d187349921..1867b99038 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -725,14 +725,14 @@ func GetCollaborators(repoName string) ([]string, error) {
 // Watch is connection request for receiving repository notifycation.
 type Watch struct {
 	Id     int64
-	Uid    int64 `xorm:"UNIQUE(watch)"`
+	UserId int64 `xorm:"UNIQUE(watch)"`
 	RepoId int64 `xorm:"UNIQUE(watch)"`
 }
 
 // Watch or unwatch repository.
 func WatchRepo(uid, rid int64, watch bool) (err error) {
 	if watch {
-		if _, err = orm.Insert(&Watch{RepoId: rid, Uid: uid}); err != nil {
+		if _, err = orm.Insert(&Watch{RepoId: rid, UserId: uid}); err != nil {
 			return err
 		}
 
@@ -770,12 +770,12 @@ func NotifyWatchers(act *Action) error {
 	}
 
 	for i := range watches {
-		if act.ActUserId == watches[i].Uid {
+		if act.ActUserId == watches[i].UserId {
 			continue
 		}
 
 		act.Id = 0
-		act.UserId = watches[i].Uid
+		act.UserId = watches[i].UserId
 		if _, err = orm.InsertOne(act); err != nil {
 			return errors.New("repo.NotifyWatchers(create action): " + err.Error())
 		}
diff --git a/models/user.go b/models/user.go
index 9ffdf8e6ae..b2b16f1136 100644
--- a/models/user.go
+++ b/models/user.go
@@ -304,7 +304,7 @@ func DeleteUser(user *User) error {
 	}
 
 	// Delete all watches.
-	if _, err = orm.Delete(&Watch{Uid: user.Id}); err != nil {
+	if _, err = orm.Delete(&Watch{UserId: user.Id}); err != nil {
 		return err
 	}
 
diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go
index 93ec1153f0..2537c66b5d 100644
--- a/modules/mailer/mail.go
+++ b/modules/mailer/mail.go
@@ -121,7 +121,7 @@ func SendIssueNotifyMail(user, owner *models.User, repo *models.Repository, issu
 
 	tos := make([]string, 0, len(ws))
 	for i := range ws {
-		uid := ws[i].Uid
+		uid := ws[i].UserId
 		if user.Id == uid {
 			continue
 		}