diff --git a/docs/chat.md b/docs/chat.md
index 771bc76fce8..4f9df7a91d9 100644
--- a/docs/chat.md
+++ b/docs/chat.md
@@ -455,7 +455,7 @@ See [OCP\RichObjectStrings\Definitions](https://github.com/nextcloud/server/blob
 * `read_only` - {actor} locked the conversation
 * `listable_none` - {actor} limited the conversation to the current participants
 * `listable_users` - {actor} opened the conversation accessible to registered users
-* `listable_all` - {actor} opened the conversation accessible to registered and guest app users
+* `listable_all` - {actor} opened the conversation accessible to registered users and users created with the Guests app
 * `lobby_timer_reached` - The conversation is now open to everyone
 * `lobby_none` - {actor} opened the conversation to everyone
 * `lobby_non_moderators` - {actor} restricted the conversation to moderators
diff --git a/docs/constants.md b/docs/constants.md
index faf3bd0ddb8..3b1fe809dcc 100644
--- a/docs/constants.md
+++ b/docs/constants.md
@@ -24,7 +24,7 @@
 
 ### Listable scope
 * `0` Participants only
-* `1` Regular users only, excluding guest app users
+* `1` Regular users only, excluding users created with the Guests app
 * `2` Everyone
 
 ### Webinar lobby states
diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
index c9f91c17eca..36fa08f8eb9 100644
--- a/lib/Chat/Parser/SystemMessage.php
+++ b/lib/Chat/Parser/SystemMessage.php
@@ -191,11 +191,11 @@ public function parseMessage(Message $chatMessage): void {
 				$parsedMessage = $this->l->t('An administrator opened the conversation to registered users');
 			}
 		} elseif ($message === 'listable_all') {
-			$parsedMessage = $this->l->t('{actor} opened the conversation to registered and guest app users');
+			$parsedMessage = $this->l->t('{actor} opened the conversation to registered users and users created with the Guests app');
 			if ($currentUserIsActor) {
-				$parsedMessage = $this->l->t('You opened the conversation to registered and guest app users');
+				$parsedMessage = $this->l->t('You opened the conversation to registered users and users created with the Guests app');
 			} elseif ($cliIsActor) {
-				$parsedMessage = $this->l->t('An administrator opened the conversation to registered and guest app users');
+				$parsedMessage = $this->l->t('An administrator opened the conversation to registered users and users created with the Guests app');
 			}
 		} elseif ($message === 'lobby_timer_reached') {
 			$parsedMessage = $this->l->t('The conversation is now open to everyone');
diff --git a/lib/Manager.php b/lib/Manager.php
index b3fb1d13c70..f43fbd8f9f9 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -1291,8 +1291,7 @@ public function isValidParticipant(string $userId): bool {
 	}
 
 	/**
-	 * Returns whether the given user id is a guest user from
-	 * the guest app
+	 * Returns whether the given user id is a user created with the Guests app
 	 *
 	 * @param string $userId user id to check
 	 * @return bool true if the user is a guest, false otherwise
diff --git a/lib/Room.php b/lib/Room.php
index 1331cfe3470..252a730647d 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -85,12 +85,12 @@ class Room {
 	public const LISTABLE_NONE = 0;
 
 	/**
-	 * Searchable by all regular users and moderators, even when not joined, excluding users from the guest app
+	 * Searchable by all regular users and moderators, even when not joined, excluding users created with the Guests app
 	 */
 	public const LISTABLE_USERS = 1;
 
 	/**
-	 * Searchable by everyone, which includes guest users (from guest app), even when not joined
+	 * Searchable by everyone, which includes users created with the Guests app, even when not joined
 	 */
 	public const LISTABLE_ALL = 2;
 
diff --git a/src/components/ConversationSettings/ListableSettings.vue b/src/components/ConversationSettings/ListableSettings.vue
index d272014a245..529b643e3d3 100644
--- a/src/components/ConversationSettings/ListableSettings.vue
+++ b/src/components/ConversationSettings/ListableSettings.vue
@@ -33,7 +33,7 @@
 			:disabled="isListableLoading"
 			type="switch"
 			@update:checked="toggleListableGuests">
-			{{ t('spreed', 'Also open to guest app users') }}
+			{{ t('spreed', 'Also open to users created with the Guests app') }}
 		</NcCheckboxRadioSwitch>
 	</div>
 
@@ -97,7 +97,7 @@ export default {
 		summaryLabel() {
 			switch (this.listable) {
 			case CONVERSATION.LISTABLE.ALL:
-				return t('spreed', 'This conversation is open to registered and guest app users')
+				return t('spreed', 'This conversation is open to both registered users and users created with the Guests app')
 			case CONVERSATION.LISTABLE.USERS:
 				return t('spreed', 'This conversation is open to registered users')
 			case CONVERSATION.LISTABLE.NONE:
@@ -166,7 +166,7 @@ export default {
 				} else if (listable === CONVERSATION.LISTABLE.USERS) {
 					this.lastNotification = showSuccess(t('spreed', 'You opened the conversation to registered users'))
 				} else if (listable === CONVERSATION.LISTABLE.ALL) {
-					this.lastNotification = showSuccess(t('spreed', 'You opened the conversation to registered and guest app users'))
+					this.lastNotification = showSuccess(t('spreed', 'You opened the conversation to both registered users and users created with the Guests app'))
 				}
 				this.listable = listable
 			} catch (e) {
diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index b376f261686..8c8f865c4be 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -3024,7 +3024,7 @@ public function allowGuestAccountsCreation(): void {
 		$this->guestsAppWasEnabled = in_array('guests', $data['apps'], true);
 
 		if (!$this->guestsAppWasEnabled) {
-			// enable guests app
+			// enable Guests app
 			/*
 			$this->sendRequest('POST', '/cloud/apps/guests');
 			$this->assertStatusCode($this->response, 200);
@@ -3070,7 +3070,7 @@ public function resetSpreedAppData() {
 	 */
 	public function resetGuestsAppState() {
 		if ($this->guestsAppWasEnabled === null) {
-			// guests app was not touched
+			// Guests app was not touched
 			return;
 		}
 
diff --git a/tests/php/Chat/Parser/SystemMessageTest.php b/tests/php/Chat/Parser/SystemMessageTest.php
index 2710fdb6e69..4a0a2ee54c2 100644
--- a/tests/php/Chat/Parser/SystemMessageTest.php
+++ b/tests/php/Chat/Parser/SystemMessageTest.php
@@ -412,11 +412,11 @@ public static function dataParseMessage(): array {
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_all', [], 'recipient',
-				'{actor} opened the conversation to registered and guest app users',
+				'{actor} opened the conversation to registered users and users created with the Guests app',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_all', [], 'actor',
-				'You opened the conversation to registered and guest app users',
+				'You opened the conversation to registered users and users created with the Guests app',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['object_shared', ['metaData' => ['id' => 'geo:52.5450511,13.3741463', 'type' => 'geo-location', 'name' => 'Nextcloud Berlin Office']], 'actor',