@@ -1,14 +1,14 @@
 <?php
 /**
- * Records and exposes the lineage root for attachments edited via
+ * Records and exposes the edit root for attachments edited via
  * `/wp/v2/media/{id}/edit`.
  *
  * Each call to core's `edit_media_item` creates a new child attachment.
- * On that path, we record the id at the top of the lineage in a
- * dedicated postmeta key (`_wp_attachment_original_id`) so the Media
- * Editor modal can offer a "Restore original" action without walking
- * the chain on every read, and so cleanup on parent delete can use
- * an indexed query.
+ * On that path, we record the id of the edit root (the attachment at
+ * the top of the edit chain) in a dedicated postmeta key
+ * (`_wp_attachment_edit_root_id`) so the Media Editor modal can offer
+ * a "Restore original" action without walking the chain on every
+ * read, and so cleanup on edit root delete can use an indexed query.
  *
  * This applies to every edit that goes through `/edit` — including
  * the image block's crop tools in the post editor — on any site
@@ -20,72 +20,71 @@
  */
 
 /**
- * Postmeta key for the lineage root id.
+ * Postmeta key for the edit root id.
  *
  * Underscore-prefixed so it's treated as private/internal and not
  * exposed by the default postmeta REST surface.
  */
-const GUTENBERG_ORIGINAL_ATTACHMENT_ID_META_KEY = '_wp_attachment_original_id';
+const GUTENBERG_EDIT_ROOT_ATTACHMENT_ID_META_KEY = '_wp_attachment_edit_root_id';
 
 /**
- * Get the lineage root (original) attachment id for an attachment.
+ * Get the edit root attachment id for an attachment.
  *
- * Returns the id recorded in `_wp_attachment_original_id` when the
+ * Returns the id recorded in `_wp_attachment_edit_root_id` when the
  * attachment was created by editing another one, or the attachment's
  * own id when it has no edit lineage. Callers that want to tell
- * "has an original" apart from "is its own original" should compare
+ * "has an edit root" apart from "is its own edit root" should compare
  * the result against the id they passed in.
  *
- * In core this would be `wp_get_original_attachment_id()`.
+ * In core this would be `wp_get_edit_root_attachment_id()`.
  *
  * @param int $attachment_id Attachment id to resolve.
- * @return int The original attachment id, or `$attachment_id` when there is no lineage.
+ * @return int The edit root attachment id, or `$attachment_id` when there is no lineage.
  */
-function gutenberg_get_original_attachment_id( $attachment_id ) {
-	$original_id = (int) get_post_meta(
+function gutenberg_get_edit_root_attachment_id( $attachment_id ) {
+	$edit_root_id = (int) get_post_meta(
 		$attachment_id,
-		GUTENBERG_ORIGINAL_ATTACHMENT_ID_META_KEY,
+		GUTENBERG_EDIT_ROOT_ATTACHMENT_ID_META_KEY,
 		true
 	);
 
-	return $original_id > 0 ? $original_id : (int) $attachment_id;
+	return $edit_root_id > 0 ? $edit_root_id : (int) $attachment_id;
 }
 
 /**
- * Persist the original attachment id when /edit creates a new edited
+ * Persist the edit root attachment id when /edit creates a new edited
  * attachment.
  *
  * Hooks `wp_edited_image_metadata` (fired by core inside
  * `WP_REST_Attachments_Controller::edit_media_item`, after the new
  * attachment id has been inserted but before its image metadata is
- * stored). The new child's original is its parent's original if the
+ * stored). The new child's edit root is its parent's edit root if the
  * parent has one, otherwise the parent itself.
  *
  * @param array $new_image_meta    Metadata for the new edited attachment (unused).
  * @param int   $new_attachment_id The new attachment id.
  * @param int   $attachment_id     The parent (source) attachment id.
  * @return array Filtered metadata (unchanged).
  */
-function gutenberg_record_original_attachment_id( $new_image_meta, $new_attachment_id, $attachment_id ) {
-	// The new child's original is its parent's original, or the parent
-	// itself when the parent has no lineage of its own.
-	$original_id = gutenberg_get_original_attachment_id( $attachment_id );
+function gutenberg_record_edit_root_attachment_id( $new_image_meta, $new_attachment_id, $attachment_id ) {
+	// The new child's edit root is its parent's edit root, or the
+	// parent itself when the parent has no lineage of its own.
+	$edit_root_id = gutenberg_get_edit_root_attachment_id( $attachment_id );
 
 	update_post_meta(
 		$new_attachment_id,
-		GUTENBERG_ORIGINAL_ATTACHMENT_ID_META_KEY,
-		$original_id
+		GUTENBERG_EDIT_ROOT_ATTACHMENT_ID_META_KEY,
+		$edit_root_id
 	);
 
 	return $new_image_meta;
 }
-add_filter( 'wp_edited_image_metadata', 'gutenberg_record_original_attachment_id', 10, 3 );
+add_filter( 'wp_edited_image_metadata', 'gutenberg_record_edit_root_attachment_id', 10, 3 );
 
 /**
- * Registers `original_attachment` as a REST field on the attachment
- * schema.
+ * Registers `edit_root` as a REST field on the attachment schema.
  *
- * The value is the id of the lineage root the attachment was edited
+ * The value is the id of the edit root the attachment was edited
  * from, or `0` when it has no edit lineage — mirroring
  * `featured_media`, where `0` means "none". Registering the field
  * (rather than injecting it in a response filter) exposes it in the
@@ -100,48 +99,48 @@ function gutenberg_record_original_attachment_id( $new_image_meta, $new_attachme
  * `view` context and never carries this field. Clients must refetch
  * the new attachment with `?context=edit`.
  */
-function gutenberg_register_original_attachment_field() {
+function gutenberg_register_edit_root_field() {
 	register_rest_field(
 		'attachment',
-		'original_attachment',
+		'edit_root',
 		array(
-			'get_callback' => 'gutenberg_get_original_attachment_field',
+			'get_callback' => 'gutenberg_get_edit_root_field',
 			'schema'       => array(
-				'description' => __( 'The ID of the original attachment this attachment was edited from, or 0 when it was not created by editing another attachment.', 'gutenberg' ),
+				'description' => __( 'The ID of the edit root attachment this attachment was edited from, or 0 when it was not created by editing another attachment.', 'gutenberg' ),
 				'type'        => 'integer',
 				'context'     => array( 'edit' ),
 				'readonly'    => true,
 			),
 		)
 	);
 }
-add_action( 'rest_api_init', 'gutenberg_register_original_attachment_field' );
+add_action( 'rest_api_init', 'gutenberg_register_edit_root_field' );
 
 /**
- * Resolves the `original_attachment` field value for a REST response.
+ * Resolves the `edit_root` field value for a REST response.
  *
- * Trusts the stored meta rather than verifying the original still
+ * Trusts the stored meta rather than verifying the edit root still
  * exists: the `delete_attachment` cleanup below keeps it accurate,
- * and a consumer fetching a dangling id (e.g. an original sitting in
+ * and a consumer fetching a dangling id (e.g. an edit root sitting in
  * the trash) simply gets no record.
  *
  * @param array $attachment Prepared attachment response data.
- * @return int The lineage root id, or 0 when there is no lineage.
+ * @return int The edit root id, or 0 when there is no lineage.
  */
-function gutenberg_get_original_attachment_field( $attachment ) {
+function gutenberg_get_edit_root_field( $attachment ) {
 	$attachment_id = isset( $attachment['id'] ) ? (int) $attachment['id'] : 0;
 	if ( $attachment_id <= 0 ) {
 		return 0;
 	}
 
-	$original_id = gutenberg_get_original_attachment_id( $attachment_id );
+	$edit_root_id = gutenberg_get_edit_root_attachment_id( $attachment_id );
 
-	return $original_id === $attachment_id ? 0 : $original_id;
+	return $edit_root_id === $attachment_id ? 0 : $edit_root_id;
 }
 
 /**
- * Filter `rest_prepare_attachment` to add the `wp:original-attachment`
- * link for attachments with an edit lineage.
+ * Filter `rest_prepare_attachment` to add the `wp:edit-root` link for
+ * attachments with an edit lineage.
  *
  * `register_rest_field` has no mechanism for links, so the link rides
  * a response filter while the field itself is registered above. Only
@@ -152,53 +151,53 @@ function gutenberg_get_original_attachment_field( $attachment ) {
  * @param WP_REST_Request  $request  REST request.
  * @return WP_REST_Response
  */
-function gutenberg_add_original_attachment_link( $response, $post, $request ) {
+function gutenberg_add_edit_root_link( $response, $post, $request ) {
 	if ( 'edit' !== $request['context'] ) {
 		return $response;
 	}
 
-	$original_id = gutenberg_get_original_attachment_id( $post->ID );
-	if ( $original_id === (int) $post->ID ) {
+	$edit_root_id = gutenberg_get_edit_root_attachment_id( $post->ID );
+	if ( $edit_root_id === (int) $post->ID ) {
 		return $response;
 	}
 
 	// Mirror `featured_media`: an embeddable link so clients can
-	// hydrate the original attachment with `?_embed`. Core fires
+	// hydrate the edit root attachment with `?_embed`. Core fires
 	// `rest_prepare_attachment` twice per attachment — once from the
 	// posts controller's `prepare_item_for_response()` and again from
 	// the attachments controller wrapping it — and `add_link()`
 	// appends unconditionally, so guard against adding it twice.
-	$rel   = 'https://api.w.org/original-attachment';
+	$rel   = 'https://api.w.org/edit-root';
 	$links = $response->get_links();
 	if ( ! isset( $links[ $rel ] ) ) {
 		$response->add_link(
 			$rel,
-			rest_url( 'wp/v2/media/' . $original_id ),
+			rest_url( 'wp/v2/media/' . $edit_root_id ),
 			array( 'embeddable' => true )
 		);
 	}
 
 	return $response;
 }
-add_filter( 'rest_prepare_attachment', 'gutenberg_add_original_attachment_link', 10, 3 );
+add_filter( 'rest_prepare_attachment', 'gutenberg_add_edit_root_link', 10, 3 );
 
 /**
- * Clear `_wp_attachment_original_id` from descendants when their
- * original is deleted.
+ * Clear `_wp_attachment_edit_root_id` from descendants when their
+ * edit root is deleted.
  *
  * Without this, descendants would carry a dangling pointer at a
  * recycled attachment id. The REST filter trusts this meta without
- * verifying the original still exists, so this cleanup is what keeps
+ * verifying the edit root still exists, so this cleanup is what keeps
  * the exposed field accurate and prevents it from pointing at an
  * unrelated attachment if the deleted id is later reused.
  *
  * Runs on hard delete only: with `MEDIA_TRASH`, trashing fires no
  * `delete_attachment`, so descendants keep pointing at a trashed
- * original (whose URL still resolves) until the trash is purged.
+ * edit root (whose URL still resolves) until the trash is purged.
  *
  * @param int $attachment_id Attachment id being deleted.
  */
-function gutenberg_clear_original_attachment_id_on_delete( $attachment_id ) {
+function gutenberg_clear_edit_root_attachment_id_on_delete( $attachment_id ) {
 	$attachment_id = (int) $attachment_id;
 	if ( $attachment_id <= 0 ) {
 		return;
@@ -211,9 +210,9 @@ function gutenberg_clear_original_attachment_id_on_delete( $attachment_id ) {
 	delete_metadata(
 		'post',
 		0,
-		GUTENBERG_ORIGINAL_ATTACHMENT_ID_META_KEY,
+		GUTENBERG_EDIT_ROOT_ATTACHMENT_ID_META_KEY,
 		$attachment_id,
 		true
 	);
 }
-add_action( 'delete_attachment', 'gutenberg_clear_original_attachment_id_on_delete' );
+add_action( 'delete_attachment', 'gutenberg_clear_edit_root_attachment_id_on_delete' );
@@ -68,7 +68,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require __DIR__ . '/compat/wordpress-7.2/view-config-api.php';
 	require __DIR__ . '/compat/wordpress-7.2/class-gutenberg-rest-view-config-controller-7-2.php';
 	require __DIR__ . '/compat/wordpress-7.2/rest-api.php';
-	require __DIR__ . '/compat/wordpress-7.2/original-attachment.php';
+	require __DIR__ . '/compat/wordpress-7.2/edit-root-attachment.php';
 
 	// Real-time collaboration.
 	require __DIR__ . '/experimental/collaboration/class-gutenberg-rest-autosaves-controller.php';
 
@@ -4,7 +4,7 @@
 
 ### Enhancements
 
--   Add the root-level `original_attachment` field to the `Attachment` entity type — the original attachment's id, or `0` when the attachment was not created by editing another one; embeddable via the `wp:original-attachment` link, exposed in the `edit` context ([#81803](https://github.com/WordPress/gutenberg/pull/81803)).
+-   Add the root-level `edit_root` field to the `Attachment` entity type — the edit root attachment's id, or `0` when the attachment was not created by editing another one; embeddable via the `wp:edit-root` link, exposed in the `edit` context ([#81803](https://github.com/WordPress/gutenberg/pull/81803)).
 -   `Icon`: add the `keywords` field exposed by the icons REST endpoint ([#82367](https://github.com/WordPress/gutenberg/pull/82367)).
 -   `__experimentalFetchLinkSuggestions`: add a `preferTypes` option to rank matches from one or more search types above the usual order ([#83408](https://github.com/WordPress/gutenberg/pull/83408)).
 
 
@@ -206,11 +206,11 @@ declare module './base-entity-records' {
 			 */
 			post: ContextualField< number | null, 'view' | 'edit', C >;
 			/**
-			 * The ID of the original attachment this attachment was edited
+			 * The ID of the edit root attachment this attachment was edited
 			 * from, or 0 when it has no edit lineage. Embeddable via the
-			 * `wp:original-attachment` link.
+			 * `wp:edit-root` link.
 			 */
-			original_attachment: ContextualField< number, 'edit', C >;
+			edit_root: ContextualField< number, 'edit', C >;
 			/**
 			 * URL to the original attachment file.
 			 */
 
@@ -20,7 +20,7 @@ const baseMedia: Media = {
 	title: { raw: 'Test Image', rendered: 'Test Image' },
 	author: 1,
 	featured_media: 0,
-	original_attachment: 0,
+	edit_root: 0,
 	comment_status: 'open',
 	ping_status: 'closed',
 	template: '',
 
@@ -44,7 +44,7 @@ const sampleMediaItem: MediaItem = {
 	},
 	author: 1,
 	featured_media: 0,
-	original_attachment: 0,
+	edit_root: 0,
 	comment_status: 'open',
 	ping_status: 'closed',
 	template: '',
@@ -142,7 +142,7 @@ const sampleMediaItemZip: MediaItem = {
 	},
 	author: 1,
 	featured_media: 0,
-	original_attachment: 0,
+	edit_root: 0,
 	comment_status: 'open',
 	ping_status: 'closed',
 	template: '',
@@ -242,7 +242,7 @@ const sampleMediaItemBrokenImage: MediaItem = {
 	},
 	author: 1,
 	featured_media: 0,
-	original_attachment: 0,
+	edit_root: 0,
 	comment_status: 'open',
 	ping_status: 'closed',
 	template: '',