diff --git a/app/src/main/java/com/anytypeio/anytype/ui/allcontent/AllContentFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/allcontent/AllContentFragment.kt
index 41869baec2..bb51da113b 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/allcontent/AllContentFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/allcontent/AllContentFragment.kt
@@ -197,8 +197,8 @@ class AllContentFragment : BaseComposeFragment(), ObjectTypeSelectionListener {
                             space = command.space
                         )
                     }.onFailure {
-                        toast("Failed to open relation creation screen")
-                        Timber.e(it, "Failed to open relation creation screen from all content")
+                        toast("Failed to open property creation screen")
+                        Timber.e(it, "Failed to open property creation screen from all content")
                     }
                 }
 
diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ResExtension.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ResExtension.kt
index 2947db58fc..8f73c8623a 100644
--- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ResExtension.kt
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ResExtension.kt
@@ -260,23 +260,6 @@ fun String?.getMimeIcon(extension: String?): Int {
     }
 }
 
-fun ObjectLayoutView.getName(): Int? = when (this) {
-    is ObjectLayoutView.Basic -> R.string.name_layout_basic
-    is ObjectLayoutView.Image -> null
-    is ObjectLayoutView.Note -> R.string.name_layout_note
-    is ObjectLayoutView.Profile -> R.string.name_layout_profile
-    is ObjectLayoutView.Participant -> R.string.name_layout_participant
-    is ObjectLayoutView.Set -> R.string.name_layout_set
-    is ObjectLayoutView.Todo -> R.string.name_layout_todo
-    is ObjectLayoutView.Dashboard -> null
-    is ObjectLayoutView.PDF -> null
-    is ObjectLayoutView.File -> null
-    is ObjectLayoutView.ObjectType -> null
-    is ObjectLayoutView.Relation -> null
-    is ObjectLayoutView.Space -> null
-    is ObjectLayoutView.Bookmark -> null
-}
-
 @StringRes
 fun RelationFormat.getPrettyName(): Int = when (this) {
     RelationFormat.LONG_TEXT, RelationFormat.SHORT_TEXT -> R.string.relation_format_long_text
diff --git a/feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/space/new_settings/Items.kt b/feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/space/new_settings/Items.kt
index 0dcd6172d7..f84274226f 100644
--- a/feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/space/new_settings/Items.kt
+++ b/feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/space/new_settings/Items.kt
@@ -102,7 +102,7 @@ fun FieldsItem(
 ) {
     BaseButton(
         modifier = modifier,
-        title = stringResource(id = R.string.fields),
+        title = stringResource(id = R.string.properties),
         icon = R.drawable.ic_fields_24,
     )
 }
diff --git a/localization/src/main/res/values/strings.xml b/localization/src/main/res/values/strings.xml
index 5594b9649d..dcb77a951f 100644
--- a/localization/src/main/res/values/strings.xml
+++ b/localization/src/main/res/values/strings.xml
@@ -117,7 +117,6 @@
     <string name="option_other_divider">Line divider</string>
     <string name="option_other_dots">Dots divider</string>
     <string name="option_other_code">Code snippet</string>
-    <string name="option_relation_relation">Relation</string>
 
     <string name="toolbar_section_text">Text</string>
     <string name="toolbar_section_list">List</string>
@@ -126,7 +125,7 @@
     <string name="toolbar_section_tool">Tool</string>
     <string name="toolbar_section_media">Media</string>
     <string name="toolbar_section_objects">Objects</string>
-    <string name="toolbar_section_relation">Relation</string>
+    <string name="toolbar_section_relation">Property</string>
 
     <string name="toolbar_action_delete">Delete</string>
     <string name="toolbar_action_duplicate">Duplicate</string>
@@ -207,7 +206,7 @@
 
 
     <string name="untitled">Untitled</string>
-    <string name="untitled_set">Untitled set</string>
+    <string name="untitled_set">Untitled query</string>
     <string name="untitled_collection">Untitled collection</string>
     <string name="archived">Archived</string>
 
@@ -271,7 +270,6 @@
     <string name="search_hint">Search...</string>
     <string name="relations">Relations</string>
     <string name="fields">Fields</string>
-    <string name="relation">Relation</string>
     <string name="download">Download</string>
     <string name="view">View</string>
     <string name="views">Views</string>
@@ -296,8 +294,8 @@
     <string name="mention_suggester_create_object">Create object</string>
     <string name="your_search_query">Search</string>
     <string name="syncing">Syncing…</string>
-    <string name="choose_a_object_type_for_this_set">Choose a object type for this set</string>
-    <string name="new_set">New set</string>
+    <string name="choose_a_object_type_for_this_set">Choose a object type for this query</string>
+    <string name="new_set">New query</string>
     <string name="create_new_object_type">Create new object type</string>
     <plurals name="page_selected">
         <item quantity="zero">Select pages</item>
@@ -367,8 +365,8 @@
     <string name="unknown_object_type">Unknown type</string>
     <string name="relation_format_short_text">Short text</string>
     <string name="relation_format_long_text">Text</string>
-    <string name="set_new_relation">Set new relation</string>
-    <string name="relation_deleted">Deleted relation</string>
+    <string name="set_new_relation">Set new property</string>
+    <string name="relation_deleted">Deleted property</string>
 
     <string name="content_description_document_cover">Document\'s cover</string>
     <string name="content_description_cover_image_view">Cover image view</string>
@@ -392,7 +390,7 @@
     <string name="heading">Heading</string>
     <string name="subheading">Subheading</string>
     <string name="create_from_scratch">Create from scratch</string>
-    <string name="create_relation_with_name">Create relation \"%1$s\"</string>
+    <string name="create_relation_with_name">Create property \"%1$s\"</string>
     <string name="name_is_required">Name is required</string>
     <string name="favourite">Favorite</string>
     <string name="template">Template</string>
@@ -431,7 +429,7 @@
     <string name="content_desc_search_button">Search button</string>
     <string name="content_desc_add_doc_button">Add doc</string>
     <string name="unsupported_block">Unsupported block</string>
-    <string name="new_relation">New relation</string>
+    <string name="new_relation">New property</string>
     <string name="copy_link">Copy link</string>
     <string name="edit_link">Edit link</string>
     <string name="unlink">Unlink</string>
@@ -455,7 +453,6 @@
     <string name="no_data">No data</string>
     <string name="no_source">No source</string>
     <string name="deleted_object">Deleted object</string>
-    <string name="open_set">Open set</string>
     <string name="deleted">Deleted</string>
     <string name="paste_link_or_search">Paste link or search objects</string>
     <string name="paste_from_clipboard">Paste from clipboard</string>
@@ -483,7 +480,7 @@
     <string name="card">Card</string>
     <string name="inline">Inline</string>
     <string name="set_view">Set View</string>
-    <string name="inline_set">Inline set</string>
+    <string name="inline_set">Inline query</string>
     <string name="inline_collection">Inline collection</string>
     <string name="fit_image">Fit image</string>
     <string name="image_preview">Image preview</string>
@@ -548,15 +545,15 @@
     <string name="error_find_block">Could\'t find the selected block</string>
     <string name="error_block_selection">Block selection error</string>
     <string name="undefined">Undefined</string>
-    <string name="set_by_relation">Relation: %1$s</string>
-    <string name="set_by_relations">Relations: %1$s</string>
+    <string name="set_by_relation">Property: %1$s</string>
+    <string name="set_by_relations">Properties: %1$s</string>
     <string name="set_by_type">Object Type: %1$s</string>
     <string name="my_types">My types</string>
-    <string name="my_relations">My relations</string>
+    <string name="my_relations">My properties</string>
     <string name="type_added">Type \"%1$s\" added to your library</string>
-    <string name="block_data_view_content_description_title">The name of the source set of the inline set</string>
-    <string name="block_data_view_content_description_no_source">The inline set has no source</string>
-    <string name="block_data_view_content_description_no_data">The source of the inline set has no type</string>
+    <string name="block_data_view_content_description_title">The name of the source query of the inline query</string>
+    <string name="block_data_view_content_description_no_source">The inline query has no source</string>
+    <string name="block_data_view_content_description_no_data">The source of the inline query has no type</string>
 
     <string name="object_search_recently_opened_section_title">Recently opened</string>
     <string name="widget_source_anytype_library">Anytype Library</string>
@@ -576,8 +573,8 @@
     <string name="set_no_items_title">No objects</string>
     <string name="set_no_items_description">Create first object to continue</string>
     <string name="set_no_items_button">Create object</string>
-    <string name="set_collection_view_not_present">View is not present in set or collection, please recreate object</string>
-    <string name="menu_turn_to_collection">Turn Set into Collection</string>
+    <string name="set_collection_view_not_present">View is not present in Query or Collection, please recreate object</string>
+    <string name="menu_turn_to_collection">Turn Query into Collection</string>
     <string name="menu_change_query">Change query</string>
     <string name="collections">Collections</string>
     <string name="collection_widget_description">Your collections of objects</string>
@@ -594,8 +591,8 @@
     <string name="file_delete_cancel">Cancel</string>
     <string name="file_delete_delete">Delete</string>
     <string name="menu_type_change">Change type</string>
-    <string name="menu_type_open_set">Open set of %1$s</string>
-    <string name="menu_type_create_set">Create set of %1$s</string>
+    <string name="menu_type_open_set">Open query of %1$s</string>
+    <string name="menu_type_create_set">Create query of %1$s</string>
     <string name="toast_active_view_delete">Current view cannot be deleted</string>
     <string name="type_templates_widget_title">Create object</string>
     <string name="view_layout_widget_title">Layout</string>
@@ -721,7 +718,7 @@
     <string name="object_view_type">Object view type</string>
     <string name="object_type_name">Object type name</string>
     <string name="name">Name</string>
-    <string name="hint_type_name_for_new_relation">Name for new relation</string>
+    <string name="hint_type_name_for_new_relation">Name for new property</string>
     <string name="dv_create_new_object">New</string>
     <string name="content_description_plus_button">Plus button</string>
     <string name="content_description_image_icon">Image icon</string>
@@ -747,9 +744,9 @@
     <string name="edit_view">Edit view</string>
     <string name="relation_open_edit">Open to edit</string>
 
-    <string name="remove_from_set">Remove from this set</string>
+    <string name="remove_from_set">Remove from this query</string>
     <string name="reset">Reset</string>
-    <string name="search_a_relation">Search a relation</string>
+    <string name="search_a_relation">Search a property</string>
     <string name="content_description_check_icon">Check icon</string>
     <string name="content_desc_empty_values_bottom_check_icon">Sort empty values at the bottom</string>
     <string name="content_desc_empty_values_top_check_icon">Sort empty values at the top</string>
@@ -772,8 +769,8 @@
     <string name="remove">Remove</string>
     <string name="choose_options">Choose options</string>
     <string name="search_tags">Search tags</string>
-    <string name="choose_relation_to_filter">Choose a relation to filter</string>
-    <string name="choose_relation_to_sort">Choose a relation to sort</string>
+    <string name="choose_relation_to_filter">Choose a property to filter</string>
+    <string name="choose_relation_to_sort">Choose a property to sort</string>
     <string name="btn_apply_new_object">Add to list</string>
     <string name="btn_add">Add</string>
     <string name="btn_upload_gallery">Upload from Gallery</string>
@@ -783,10 +780,9 @@
     <string name="alert_qr_camera">Go to Settings – Key on Desktop in order to find the QR code for login.</string>
     <string name="alert_qr_camera_ok">Ok</string>
     <string name="choose_option">Choose option</string>
-    <string name="find_a_relation">Find a relation</string>
+    <string name="find_a_relation">Find a property</string>
     <string name="inbox">Inbox</string>
     <string name="unknown_type">Unknown type</string>
-    <string name="set">Set</string>
     <string name="collection">Collection</string>
     <string name="layout">Layout</string>
     <string name="button_fields">Properties</string>
@@ -815,7 +811,7 @@
     <string name="back_to_dashboard">Back to dashboard</string>
     <string name="go_back">Go back</string>
 
-    <string name="snack_object_set_not_found">Set not found for this type.</string>
+    <string name="snack_object_set_not_found">Query not found for this type.</string>
     <string name="create_new_set">Create</string>
 
     <string name="shortcut_create_new_object_of_type">New %1$s</string>
@@ -849,10 +845,10 @@
     <string name="without_template">Without template</string>
     <string name="unsplash_generic_error">Error while searching for images on Unsplash. Please try again later.</string>
     <string name="do_not_forget_to_save_recovery_phrase_msg">Don\'t forget to take and save your Key from settings</string>
-    <string name="unlock_your_object_to_add_new_relation">Unlock your object to add new relation</string>
+    <string name="unlock_your_object_to_add_new_relation">Unlock your object to add new property</string>
     <string name="unlock_your_object_to_edit_relations">Unlock your object to edit relations</string>
 
-    <string name="fragment_relation_create_from_scratch_title">Select relation type</string>
+    <string name="fragment_relation_create_from_scratch_title">Select property type</string>
 
     <string name="fragment_dashboard_restore">Restore</string>
     <string name="your_account_deleted">Your vault is deleted.</string>
@@ -885,7 +881,7 @@
 
 
     <string name="type_editing_title">Type settings</string>
-    <string name="relation_editing_title">Relation settings</string>
+    <string name="relation_editing_title">Property settings</string>
 
     <string name="type_editing_uninstall">Remove</string>
     <string name="empty_tree_widget">This object has no links to other objects.\nTry to create a new one.</string>
@@ -1066,7 +1062,7 @@
     <string name="widget_type_compact_list_description">Widget with a compact list view</string>
     <string name="widget_type_list">List</string>
     <string name="widget_type_view">View</string>
-    <string name="widget_type_view_description">Widget with a Set or Collection layout</string>
+    <string name="widget_type_view_description">Widget with a Query or Collection layout</string>
     <string name="widget_type_compact_list">Compact list</string>
     <string name="widget_change_source">Change Source</string>
     <string name="widget_change_type">Change Type</string>
@@ -1083,20 +1079,20 @@
     <string name="library_description_types">Types are like categories that help you group and manage your objects.</string>
     <string name="library_description_relations">All objects are connected. Use relations to build connections between objects.</string>
     <string name="library_button_create_type">Create a type</string>
-    <string name="library_button_create_relation">Create a relation</string>
+    <string name="library_button_create_relation">Create a property</string>
     <string name="library_subtitle_types">My types</string>
     <string name="library_subtitle_relations">My relations</string>
     <string name="library_subtitle_library">Library</string>
     <string name="library_create_new_type">Create a type \'%1$s\'</string>
-    <string name="library_create_new_relation">Create a relation \'%1$s\'</string>
+    <string name="library_create_new_relation">Create a property \'%1$s\'</string>
     <string name="library_objects_empty">There are no %1$s named \'%2$s\'</string>
     <string name="library_objects_empty_action">Try creating new one or search for something else</string>
     <string name="library_relations_empty">There are no types named \'%1$s\'</string>
 
     <string name="library_type_added">Type `%1$s` added to your library"</string>
     <string name="library_type_removed">Type `%1$s` removed from your library"</string>
-    <string name="library_relation_added">Relation `%1$s` added to your library"</string>
-    <string name="library_relation_removed">Relation `%1$s` removed from your library"</string>
+    <string name="library_relation_added">Property `%1$s` added to your library"</string>
+    <string name="library_relation_removed">Property `%1$s` removed from your library"</string>
     <string name="library_something_went_wrong">Something went wrong. Please, try again later.</string>
 
     <string name="type_creation_new_type">New type</string>
@@ -1197,8 +1193,8 @@
     <string name="content_description_delete_button">Delete button</string>
     <string name="content_description_duplicate_button">Duplicate button</string>
     <string name="content_description_edit_view_button">Edit-view button</string>
-    <string name="content_description_open_to_edit_view_button">Open to edit relation button</string>
-    <string name="content_description_remove_from_set_button">Remove relation from this set</string>
+    <string name="content_description_open_to_edit_view_button">Open to edit property button</string>
+    <string name="content_description_remove_from_set_button">Remove property from this query</string>
 
     <string name="content_desc_page_toolbar_search">Search pages</string>
     <string name="content_desc_page_toolbar_navigation">Navigation through pages</string>
@@ -1246,7 +1242,7 @@
 
     <!--endregion-->
 
-    <!--region ORIGIN RELATION VALUES -->
+    <!--region ORIGIN PROPERTIES VALUES -->
 
     <string name="relation_origin_none">None</string>
     <string name="relation_origin_clipboard">Clipboard</string>
@@ -1272,7 +1268,7 @@
         <item quantity="other">%d links</item>
     </plurals>
 
-    <!--region ORIGIN RELATION VALUES -->
+    <!--region ORIGIN PROPERTIES VALUES -->
 
     <string name="date_type_tomorrow">Tomorrow</string>
     <string name="date_type_today">Today</string>
@@ -1310,13 +1306,13 @@
 
     <string name="options_empty_description">Nothing found. Create first option to start.</string>
     <string name="options_empty_title">No options</string>
-    <string name="options_empty_not_editable">The relation is empty</string>
+    <string name="options_empty_not_editable">The property is empty</string>
     <string name="options_delete_title">Are you sure?</string>
     <string name="options_delete_description">The option will be permanently removed from your space</string>
 
     <string name="object_values_empty_description">Objects not found</string>
     <string name="object_values_empty_title">No values</string>
-    <string name="object_values_empty_not_editable">The relation is empty</string>
+    <string name="object_values_empty_not_editable">The property is empty</string>
     <string name="object_values_delete_title">Are you sure?</string>
     <string name="object_values_delete_description">The object will be moved to the Bin.</string>
 
@@ -1824,13 +1820,13 @@ Please provide specific details of your needs here.</string>
     <string name="onboarding_my_first_space">My First Space</string>
 
     <string name="all_content_error_unexpected_layout">Error: unexpected layout</string>
-    <string name="all_content_toast_relation_added">Relation added</string>
-    <string name="all_content_toast_relation_removed">Relation removed</string>
+    <string name="all_content_toast_relation_added">Property added</string>
+    <string name="all_content_toast_relation_removed">Property removed</string>
     <string name="all_content_toast_type_added">Object type added</string>
     <string name="all_content_toast_type_removed">Object type removed</string>
     <string name="all_content_toast_archived">Object archived</string>
 
-    <string name="all_content_new_relation">New relation</string>
+    <string name="all_content_new_relation">New property</string>
     <string name="all_content_new_type">New type</string>
     <string name="all_content_unlinked_description">Unlinked objects that do not have a direct link or backlink with other objects in the graph.</string>
     <string name="all_content_snackbar_title">moved to bin</string>
@@ -1863,8 +1859,8 @@ Please provide specific details of your needs here.</string>
     <string name="object_type_empty_items_title">It’s empty here.</string>
     <string name="object_type_empty_items_subtitle">Create your first objects to get started.</string>
     <string name="object_type_menu_delete">Delete completely</string>
-    <string name="object_type_objects_menu_open_set">Open Set</string>
-    <string name="object_type_objects_menu_create_set">Create Set</string>
+    <string name="object_type_objects_menu_open_set">Open Query</string>
+    <string name="object_type_objects_menu_create_set">Create Query</string>
     <string name="object_type_templates_menu_set_default">Set as default</string>
     <string name="object_type_templates_menu_edit">Edit</string>
     <string name="object_type_templates_menu_duplicate">Duplicate</string>
@@ -1922,7 +1918,7 @@ Please provide specific details of your needs here.</string>
 
     <string name="chats_alert_delete_this_message_description">It cannot be restored after confirmation</string>
     <string name="chats_alert_delete_this_message">Delete this message?</string>
-    <string name="object_set_of_title">Set of</string>
+    <string name="object_set_of_title">Query of</string>
     <string name="migration_migration_is_in_progress">Migration is in progress</string>
     <string name="migration_this_shouldn_t_take_long">This may take some time. Please don’t close the app until the process is complete.</string>
     <string name="migration_error_try_again">Try again</string>
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/history/VersionHistoryViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/history/VersionHistoryViewModel.kt
index 7199a7bf4f..5c0b34a98d 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/history/VersionHistoryViewModel.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/history/VersionHistoryViewModel.kt
@@ -219,7 +219,7 @@ class VersionHistoryViewModel(
             Relation.Format.FILE -> navigation.emit(Command.RelationObject(relation, isSet))
 
             else -> {
-                Timber.d("No interaction allowed with this relation with format:$relationFormat")
+                Timber.d("No interaction allowed with this property with format:$relationFormat")
             }
         }
     }