diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index d5503be876c..eaee14f7acf 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -696,7 +696,7 @@ static function ( $validation_error ) {
 					$removed_property   = false;
 
 					foreach ( $invalid_properties as $invalid_property ) {
-						$validation_error['property_name'] = $invalid_property;
+						$validation_error['meta_property_name'] = $invalid_property;
 
 						if ( ! $this->is_empty_attribute_value( $properties[ $invalid_property ] ) ) {
 							$validation_error['property_value'] = $properties[ $invalid_property ];
@@ -724,10 +724,10 @@ static function ( $attr_value, $property ) use ( $properties ) {
 					}
 				} else {
 					if ( self::MISSING_MANDATORY_PROPERTY === $error_code ) {
-						$validation_error['property_name'] = $error_data['property'];
+						$validation_error['meta_property_name'] = $error_data['property'];
 					} elseif ( self::MISSING_REQUIRED_PROPERTY_VALUE === $error_code ) {
-						$validation_error['property_name']  = $error_data['name'];
-						$validation_error['property_value'] = $error_data['value'];
+						$validation_error['meta_property_name'] = $error_data['name'];
+						$validation_error['property_value']     = $error_data['value'];
 					}
 
 					$attr_spec = isset( $merged_attr_spec_list[ $attr_node->nodeName ] ) ? $merged_attr_spec_list[ $attr_node->nodeName ] : [];
diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php
index 7e89afb3435..16f2cda7fd1 100644
--- a/includes/validation/class-amp-validation-error-taxonomy.php
+++ b/includes/validation/class-amp-validation-error-taxonomy.php
@@ -2949,21 +2949,21 @@ public static function get_error_title_from_code( $validation_error ) {
 				return $title;
 			case AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_PROPERTY_IN_ATTR_VALUE:
 				$title = esc_html__( 'Invalid property', 'amp' );
-				if ( isset( $validation_error['property_name'] ) ) {
-					$title .= sprintf( ': <code>%s</code>', esc_html( $validation_error['property_name'] ) );
+				if ( isset( $validation_error['meta_property_name'] ) ) {
+					$title .= sprintf( ': <code>%s</code>', esc_html( $validation_error['meta_property_name'] ) );
 				}
 				return $title;
 			case AMP_Tag_And_Attribute_Sanitizer::MISSING_MANDATORY_PROPERTY:
 				$title = esc_html__( 'Missing required property', 'amp' );
-				if ( isset( $validation_error['property_name'] ) ) {
-					$title .= sprintf( ': <code>%s</code>', esc_html( $validation_error['property_name'] ) );
+				if ( isset( $validation_error['meta_property_name'] ) ) {
+					$title .= sprintf( ': <code>%s</code>', esc_html( $validation_error['meta_property_name'] ) );
 				}
 				return $title;
 			case AMP_Tag_And_Attribute_Sanitizer::MISSING_REQUIRED_PROPERTY_VALUE:
 				$title = sprintf(
 					/* translators: %1$s is the property name, %2$s is the value for the property */
 					wp_kses( __( 'Missing required value for <code>%1$s</code> property: <code>%2$s</code>', 'amp' ), [ 'code' => '' ] ),
-					esc_html( $validation_error['property_name'] ),
+					esc_html( $validation_error['meta_property_name'] ),
 					esc_html( $validation_error['property_value'] )
 				);
 
@@ -3014,7 +3014,7 @@ public static function get_source_key_label( $key, $validation_error ) {
 				return __( 'Type', 'amp' );
 			case 'sources':
 				return __( 'Sources', 'amp' );
-			case 'property_name':
+			case 'meta_property_name':
 				if ( AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_PROPERTY_IN_ATTR_VALUE === $validation_error['code'] ) {
 					return __( 'Invalid property', 'amp' );
 				} elseif ( AMP_Tag_And_Attribute_Sanitizer::MISSING_MANDATORY_PROPERTY === $validation_error['code'] ) {