diff --git a/models/issues/comment.go b/models/issues/comment.go
index 015bb78f80..87d07ce6d5 100644
--- a/models/issues/comment.go
+++ b/models/issues/comment.go
@@ -131,7 +131,7 @@ const (
 	// 35 pr was un scheduled to auto merge when checks succeed
 	CommentTypePRUnScheduledToAutoMerge
 	// 36 Change plan time
-	CommentTypeChangePlanTime
+	CommentTypeChangeTimeEstimate
 )
 
 var commentStrings = []string{
diff --git a/models/issues/issue.go b/models/issues/issue.go
index c6f6c482f7..9e5c182514 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -795,7 +795,7 @@ func ChangeIssuePlanTime(issue *Issue, doer *user_model.User, planTimeHours, pla
 	}
 
 	opts := &CreateCommentOptions{
-		Type:            CommentTypeChangePlanTime,
+		Type:            CommentTypeChangeTimeEstimate,
 		Doer:            doer,
 		Repo:            issue.Repo,
 		Issue:           issue,
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 588084c84e..591a0acf1f 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1302,8 +1302,8 @@ issues.remove_assignee_at = `was unassigned by <b>%s</b> %s`
 issues.remove_self_assignment = `removed their assignment %s`
 issues.change_title_at = `changed title from <b><strike>%s</strike></b> to <b>%s</b> %s`
 issues.tracker_estimate = `Time Estimate`
-issues.change_plan_time_at = `changed planned time to <b>%d hour %d minutes</b> %s`
-issues.remove_plan_time = `removed planned time %s`
+issues.change_time_estimate_at = `changed planned time to <b>%d hour %d minutes</b> %s`
+issues.remove_time_estimate = `removed planned time %s`
 issues.change_ref_at = `changed reference from <b><strike>%s</strike></b> to <b>%s</b> %s`
 issues.remove_ref_at = `removed reference <b>%s</b> %s`
 issues.add_ref_at = `added reference <b>%s</b> %s`
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 58816590b6..3a4f891963 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -793,16 +793,16 @@
 					{{else}}{{$.locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr | Safe}}{{end}}
 				</span>
 			</div>
-		{{else if eq .Type 1001}}
+		{{else if eq .Type 36}}
 			<div class="timeline-item event" id="{{.HashTag}}">
 				<span class="badge">{{svg "octicon-clock"}}</span>
 				{{template "shared/user/avatarlink" Dict "Context" $.Context "user" .Poster}}
 				<span class="text grey muted-links">
 					{{template "shared/user/authorlink" .Poster}}
 					{{if and (eq .PlanTimeHours 0) (eq .PlanTimeMinutes 0)}}
-						{{$.locale.Tr "repo.issues.remove_plan_time" $createdStr | Safe}}
+						{{$.locale.Tr "repo.issues.remove_time_estimate" $createdStr | Safe}}
 					{{else}}
-						{{$.locale.Tr "repo.issues.change_plan_time_at" (.PlanTimeHours) (.PlanTimeMinutes) $createdStr | Safe}}
+						{{$.locale.Tr "repo.issues.change_time_estimate_at" (.PlanTimeHours) (.PlanTimeMinutes) $createdStr | Safe}}
 					{{end}}
 				</span>
 			</div>