diff --git a/17/umbraco-cms/model-your-content/property-editors/umbraco-flavored-markdown.md b/17/umbraco-cms/model-your-content/property-editors/umbraco-flavored-markdown.md
index 35b118ce9ad..2b42f013342 100644
--- a/17/umbraco-cms/model-your-content/property-editors/umbraco-flavored-markdown.md
+++ b/17/umbraco-cms/model-your-content/property-editors/umbraco-flavored-markdown.md
@@ -122,6 +122,7 @@ The following UFM components are available to use.
 | Label Value  | `{umbValue: headline}`                 |
 | Localize     | `{umbLocalize: general_name}`          |
 | Content Name | `{umbContentName: pickerAlias}`        |
+| Member Name  | `{umbMemberName: pickerAlias}`         |
 | Link Title   | `{umbLink: pickerAlias}`               |
 | Form Name    | `{umbFormName: formAlias}`             | 
 
@@ -149,7 +150,14 @@ The Content Name component will render the name of a content item, (either Docum
 
 The alias prefix is `umbContentName`. An example of the syntax is `{umbContentName: pickerAlias}`, which would render the component as `<ufm-content-name alias="pickerAlias"></ufm-content-name>`.
 
-The Content Name component supports content-based pickers, such as the Document Picker, Content Picker (formerly known as Multinode Treepicker), and Member Picker. Support for the advanced Media Picker will be available in an upcoming Umbraco release.
+The Content Name component supports content-based pickers, such as the Document Picker, Content Picker (formerly known as Multinode Treepicker) and Media Picker.
+
+#### Member Name
+
+The Member Name component will render the name of a member from the value of a given Member Picker property editor. Multiple values will render the names as a comma-separated list.
+
+The alias prefix is `umbMemberName`. An example of the syntax is `{umbMemberName: pickerAlias}`, which would render the component as `<ufm-member-name alias="pickerAlias"></ufm-member-name>`.
+
 
 #### Link Title
 
diff --git a/18/umbraco-cms/model-your-content/property-editors/umbraco-flavored-markdown.md b/18/umbraco-cms/model-your-content/property-editors/umbraco-flavored-markdown.md
index 35b118ce9ad..9747fa67d20 100644
--- a/18/umbraco-cms/model-your-content/property-editors/umbraco-flavored-markdown.md
+++ b/18/umbraco-cms/model-your-content/property-editors/umbraco-flavored-markdown.md
@@ -122,6 +122,8 @@ The following UFM components are available to use.
 | Label Value  | `{umbValue: headline}`                 |
 | Localize     | `{umbLocalize: general_name}`          |
 | Content Name | `{umbContentName: pickerAlias}`        |
+| Element Name | `{umbElementName: pickerAlias}`        |
+| Member Name  | `{umbMemberName: pickerAlias}`         |
 | Link Title   | `{umbLink: pickerAlias}`               |
 | Form Name    | `{umbFormName: formAlias}`             | 
 
@@ -149,7 +151,19 @@ The Content Name component will render the name of a content item, (either Docum
 
 The alias prefix is `umbContentName`. An example of the syntax is `{umbContentName: pickerAlias}`, which would render the component as `<ufm-content-name alias="pickerAlias"></ufm-content-name>`.
 
-The Content Name component supports content-based pickers, such as the Document Picker, Content Picker (formerly known as Multinode Treepicker), and Member Picker. Support for the advanced Media Picker will be available in an upcoming Umbraco release.
+The Content Name component supports content-based pickers, such as the Document Picker, Content Picker (formerly known as Multinode Treepicker) and Media Picker.
+
+#### Element Name
+
+The Element Name component will render the name of an element from the value of a given Element Picker property editor. Multiple values will render the names as a comma-separated list.
+
+The alias prefix is `umbElementName`. An example of the syntax is `{umbElementName: pickerAlias}`, which would render the component as `<ufm-element-name alias="pickerAlias"></ufm-element-name>`.
+
+#### Member Name
+
+The Member Name component will render the name of a member from the value of a given Member Picker property editor. Multiple values will render the names as a comma-separated list.
+
+The alias prefix is `umbMemberName`. An example of the syntax is `{umbMemberName: pickerAlias}`, which would render the component as `<ufm-member-name alias="pickerAlias"></ufm-member-name>`.
 
 #### Link Title