diff --git a/models/issues/comment_list.go b/models/issues/comment_list.go
index 7285e347b4..9b502d1c91 100644
--- a/models/issues/comment_list.go
+++ b/models/issues/comment_list.go
@@ -101,7 +101,7 @@ func (comments CommentList) loadMilestones(ctx context.Context) error {
 		return nil
 	}
 
-	milestoneMaps := make(map[int64]*Milestone, len(milestoneIDs))
+	milestones := make(map[int64]*Milestone, len(milestoneIDs))
 	left := len(milestoneIDs)
 	for left > 0 {
 		limit := db.DefaultMaxInSize
@@ -110,7 +110,7 @@ func (comments CommentList) loadMilestones(ctx context.Context) error {
 		}
 		err := db.GetEngine(ctx).
 			In("id", milestoneIDs[:limit]).
-			Find(&milestoneMaps)
+			Find(&milestones)
 		if err != nil {
 			return err
 		}
@@ -118,8 +118,8 @@ func (comments CommentList) loadMilestones(ctx context.Context) error {
 		milestoneIDs = milestoneIDs[limit:]
 	}
 
-	for _, issue := range comments {
-		issue.Milestone = milestoneMaps[issue.MilestoneID]
+	for _, comment := range comments {
+		comment.Milestone = milestones[comment.MilestoneID]
 	}
 	return nil
 }
@@ -140,7 +140,7 @@ func (comments CommentList) loadOldMilestones(ctx context.Context) error {
 		return nil
 	}
 
-	milestoneMaps := make(map[int64]*Milestone, len(milestoneIDs))
+	milestones := make(map[int64]*Milestone, len(milestoneIDs))
 	left := len(milestoneIDs)
 	for left > 0 {
 		limit := db.DefaultMaxInSize
@@ -149,7 +149,7 @@ func (comments CommentList) loadOldMilestones(ctx context.Context) error {
 		}
 		err := db.GetEngine(ctx).
 			In("id", milestoneIDs[:limit]).
-			Find(&milestoneMaps)
+			Find(&milestones)
 		if err != nil {
 			return err
 		}
@@ -157,8 +157,8 @@ func (comments CommentList) loadOldMilestones(ctx context.Context) error {
 		milestoneIDs = milestoneIDs[limit:]
 	}
 
-	for _, issue := range comments {
-		issue.OldMilestone = milestoneMaps[issue.MilestoneID]
+	for _, comment := range comments {
+		comment.OldMilestone = milestones[comment.OldMilestoneID]
 	}
 	return nil
 }