diff --git a/database.sql b/database.sql
index d61a3eda5a..2528b0145e 100644
--- a/database.sql
+++ b/database.sql
@@ -190,7 +190,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`confirm` varbinary(383) COMMENT '',
 	`poco` varbinary(383) COMMENT '',
 	`writable` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`forum` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a forum. Deprecated, use \'contact-type\' = \'community\' and \'manually-approve\' = false instead',
+	`forum` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a group. Deprecated, use \'contact-type\' = \'community\' and \'manually-approve\' = false instead',
 	`prv` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a private group. Deprecated, use \'contact-type\' = \'community\' and \'manually-approve\' = true instead',
 	`bdyear` varchar(4) NOT NULL DEFAULT '' COMMENT '',
 	`site-pubkey` text COMMENT 'Deprecated',
@@ -717,7 +717,7 @@ CREATE TABLE IF NOT EXISTS `group` (
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
 	`visible` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the member list is not private',
 	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the circle has been deleted',
-	`cid` int unsigned COMMENT 'Contact id of forum. When this field is filled then the members are synced automatically.',
+	`cid` int unsigned COMMENT 'Contact id of group. When this field is filled then the members are synced automatically.',
 	`name` varchar(255) NOT NULL DEFAULT '' COMMENT 'human readable name of circle',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`),
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index f8999054fd..496210067a 100644
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -81,7 +81,7 @@ Fields
 | confirm                   |                                                                                                                | varbinary(383)     | YES  |     | NULL                |                |
 | poco                      |                                                                                                                | varbinary(383)     | YES  |     | NULL                |                |
 | writable                  |                                                                                                                | boolean            | NO   |     | 0                   |                |
-| forum                     | contact is a forum. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = false instead        | boolean            | NO   |     | 0                   |                |
+| forum                     | contact is a group. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = false instead        | boolean            | NO   |     | 0                   |                |
 | prv                       | contact is a private group. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = true instead | boolean            | NO   |     | 0                   |                |
 | bdyear                    |                                                                                                                | varchar(4)         | NO   |     |                     |                |
 | site-pubkey               | Deprecated                                                                                                     | text               | YES  |     | NULL                |                |
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index e94cf53ebf..f717247ad3 100644
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -12,7 +12,7 @@ Fields
 | uid     | Owner User id                                                                             | mediumint unsigned | NO   |     | 0       |                |
 | visible | 1 indicates the member list is not private                                                | boolean            | NO   |     | 0       |                |
 | deleted | 1 indicates the circle has been deleted                                                   | boolean            | NO   |     | 0       |                |
-| cid     | Contact id of forum. When this field is filled then the members are synced automatically. | int unsigned       | YES  |     | NULL    |                |
+| cid     | Contact id of group. When this field is filled then the members are synced automatically. | int unsigned       | YES  |     | NULL    |                |
 | name    | human readable name of circle                                                             | varchar(255)       | NO   |     |         |                |
 
 Indexes
diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 8ff6604121..92ed8c8df1 100644
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -250,7 +250,7 @@ return [
 			"confirm" => ["type" => "varbinary(383)", "comment" => ""],
 			"poco" => ["type" => "varbinary(383)", "comment" => ""],
 			"writable" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"forum" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "contact is a forum. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = false instead"],
+			"forum" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "contact is a group. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = false instead"],
 			"prv" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "contact is a private group. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = true instead"],
 			"bdyear" => ["type" => "varchar(4)", "not null" => "1", "default" => "", "comment" => ""],
 			// Deprecated fields that aren't in use anymore
@@ -767,7 +767,7 @@ return [
 			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"],
 			"visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the member list is not private"],
 			"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the circle has been deleted"],
-			"cid" => ["type" => "int unsigned", "foreign" => ["contact" => "id"], "comment" => "Contact id of forum. When this field is filled then the members are synced automatically."],
+			"cid" => ["type" => "int unsigned", "foreign" => ["contact" => "id"], "comment" => "Contact id of group. When this field is filled then the members are synced automatically."],
 			"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "human readable name of circle"],
 		],
 		"indexes" => [