diff --git a/pkg/models/project_users.go b/pkg/models/project_users.go
index e9053dd94..67661f014 100644
--- a/pkg/models/project_users.go
+++ b/pkg/models/project_users.go
@@ -31,7 +31,7 @@ import (
 // ProjectUser represents a project <-> user relation
 type ProjectUser struct {
 	// The unique, numeric id of this project <-> user relation.
-	ID int64 `xorm:"bigint autoincr not null unique pk" json:"id" param:"namespace"`
+	ID int64 `xorm:"bigint autoincr not null unique pk" json:"id"`
 	// The username.
 	Username string `xorm:"-" json:"user_id" param:"user"`
 	// Used internally to reference the user
@@ -55,7 +55,7 @@ func (ProjectUser) TableName() string {
 	return "users_projects"
 }
 
-// UserWithRight represents a user in combination with the right it can have on a project/namespace
+// UserWithRight represents a user in combination with the right it can have on a project
 type UserWithRight struct {
 	user.User `xorm:"extends"`
 	Right     Right `json:"right"`
diff --git a/pkg/modules/migration/create_from_structure.go b/pkg/modules/migration/create_from_structure.go
index 40d881811..fed57a291 100644
--- a/pkg/modules/migration/create_from_structure.go
+++ b/pkg/modules/migration/create_from_structure.go
@@ -47,13 +47,13 @@ func InsertFromStructure(str []*models.ProjectWithTasksAndBuckets, user *user.Us
 
 func insertFromStructure(s *xorm.Session, str []*models.ProjectWithTasksAndBuckets, user *user.User) (err error) {
 
-	log.Debugf("[creating structure] Creating %d namespaces", len(str))
+	log.Debugf("[creating structure] Creating %d projects", len(str))
 
 	labels := make(map[string]*models.Label)
 
 	archivedProjects := []int64{}
 
-	// Create all namespaces
+	// Create all projects
 	for _, p := range str {
 		p.ID = 0
 
diff --git a/pkg/modules/migration/microsoft-todo/microsoft_todo.go b/pkg/modules/migration/microsoft-todo/microsoft_todo.go
index 29469b315..3c953d8d9 100644
--- a/pkg/modules/migration/microsoft-todo/microsoft_todo.go
+++ b/pkg/modules/migration/microsoft-todo/microsoft_todo.go
@@ -261,7 +261,7 @@ func getMicrosoftTodoData(token string) (microsoftTodoData []*project, err error
 
 func convertMicrosoftTodoData(todoData []*project) (vikunjsStructure []*models.ProjectWithTasksAndBuckets, err error) {
 
-	// One namespace with all projects
+	// One project with all child projects
 	vikunjsStructure = []*models.ProjectWithTasksAndBuckets{
 		{
 			Project: models.Project{
diff --git a/pkg/user/notifications.go b/pkg/user/notifications.go
index 768ac9e24..96a91d93d 100644
--- a/pkg/user/notifications.go
+++ b/pkg/user/notifications.go
@@ -204,7 +204,7 @@ func (n *AccountDeletionConfirmNotification) ToMail() *notifications.Mail {
 		Action("Confirm the deletion of my account", config.ServiceFrontendurl.GetString()+"?accountDeletionConfirm="+n.ConfirmToken).
 		Line("This link will be valid for 24 hours.").
 		Line("Once you confirm the deletion we will schedule the deletion of your account in three days and send you another email until then.").
-		Line("If you proceed with the deletion of your account, we will remove all of your namespaces, projects and tasks you created. Everything you shared with another user or team will transfer ownership to them.").
+		Line("If you proceed with the deletion of your account, we will remove all of your projects and tasks you created. Everything you shared with another user or team will transfer ownership to them.").
 		Line("If you did not requested the deletion or changed your mind, you can simply ignore this email.").
 		Line("Have a nice day!")
 }