diff --git a/models/project/column.go b/models/project/column.go
index 6e0ecdc4a9..eb9a4b186c 100644
--- a/models/project/column.go
+++ b/models/project/column.go
@@ -52,7 +52,7 @@ type Column struct {
 
 // TableName return the real table name
 func (Column) TableName() string {
-	return "project_board" // FIXME: the legacy table name should be project_column
+	return "project_board" // TODO: the legacy table name should be project_column
 }
 
 // NumIssues return counter of all issues assigned to the column
@@ -155,7 +155,7 @@ func deleteColumnByID(ctx context.Context, columnID int64) error {
 	}
 
 	if column.Default {
-		return fmt.Errorf("deleteBoardByID: cannot delete default column")
+		return fmt.Errorf("deleteColumnByID: cannot delete default column")
 	}
 
 	if err = column.removeIssues(ctx); err != nil {
diff --git a/models/project/template.go b/models/project/template.go
index 9dcf32616d..f3fb4f4a77 100644
--- a/models/project/template.go
+++ b/models/project/template.go
@@ -34,7 +34,7 @@ func GetTemplateConfigs() []TemplateConfig {
 	}
 }
 
-// IsTemplateTypeValid checks if the project board type is valid
+// IsTemplateTypeValid checks if the project template type is valid
 func IsTemplateTypeValid(p TemplateType) bool {
 	switch p {
 	case TemplateTypeNone, TemplateTypeBasicKanban, TemplateTypeBugTriage:
diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go
index e2064c179a..9c8e826440 100644
--- a/routers/web/org/projects.go
+++ b/routers/web/org/projects.go
@@ -327,15 +327,15 @@ func ViewProject(ctx *context.Context) {
 		return
 	}
 
-	boards, err := project.GetColumns(ctx)
+	columns, err := project.GetColumns(ctx)
 	if err != nil {
 		ctx.ServerError("GetProjectColumns", err)
 		return
 	}
 
-	issuesMap, err := issues_model.LoadIssuesFromColumnList(ctx, boards)
+	issuesMap, err := issues_model.LoadIssuesFromColumnList(ctx, columns)
 	if err != nil {
-		ctx.ServerError("LoadIssuesOfBoards", err)
+		ctx.ServerError("LoadIssuesOfColumns", err)
 		return
 	}
 
@@ -378,7 +378,7 @@ func ViewProject(ctx *context.Context) {
 	ctx.Data["CanWriteProjects"] = canWriteProjects(ctx)
 	ctx.Data["Project"] = project
 	ctx.Data["IssuesMap"] = issuesMap
-	ctx.Data["Columns"] = boards // TODO: rename boards to columns in backend
+	ctx.Data["Columns"] = columns
 	shared_user.RenderUserHeader(ctx)
 
 	err = shared_user.LoadHeaderCount(ctx)
@@ -624,7 +624,7 @@ func MoveIssues(ctx *context.Context) {
 	}
 
 	if column.ProjectID != project.ID {
-		ctx.NotFound("BoardNotInProject", nil)
+		ctx.NotFound("ColumnNotInProject", nil)
 		return
 	}