diff --git a/Gruntfile.js b/Gruntfile.js
index 0d421488f79..725b78af2a1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -110,7 +110,7 @@ module.exports = function( grunt ) {
 			var commitHash, lsOutput, versionAppend, paths;
 			commitHash = stdout.shift();
 			lsOutput = stdout.shift();
-			versionAppend = commitHash + '-' + new Date().toISOString().replace( /\.\d+/, '' ).replace( /-|:/g, '' );
+			versionAppend = new Date().toISOString().replace( /\.\d+/, '' ).replace( /-|:/g, '' ) + '-' + commitHash;
 
 			paths = lsOutput.trim().split( /\n/ ).filter( function( file ) {
 				return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|dev-lib|readme\.md|composer\..*|webpack.*|languages\/README.*)/.test( file );
diff --git a/amp.php b/amp.php
index ab892aca2d9..18f7d03d359 100644
--- a/amp.php
+++ b/amp.php
@@ -5,7 +5,7 @@
  * Plugin URI: https://github.com/automattic/amp-wp
  * Author: WordPress.com VIP, XWP, Google, and contributors
  * Author URI: https://github.com/Automattic/amp-wp/graphs/contributors
- * Version: 1.0-beta4
+ * Version: 1.0-RC1
  * Text Domain: amp
  * Domain Path: /languages/
  * License: GPLv2 or later
@@ -49,7 +49,7 @@ function _amp_print_composer_install_admin_notice() {
 
 define( 'AMP__FILE__', __FILE__ );
 define( 'AMP__DIR__', dirname( __FILE__ ) );
-define( 'AMP__VERSION', '1.0-beta4' );
+define( 'AMP__VERSION', '1.0-RC1' );
 
 require_once AMP__DIR__ . '/includes/class-amp-autoloader.php';
 AMP_Autoloader::register();
@@ -177,6 +177,24 @@ function amp_init() {
 
 	// Add actions for legacy post templates.
 	add_action( 'wp', 'amp_maybe_add_actions' );
+
+	/*
+	 * Broadcast plugin updates.
+	 * Note that AMP_Options_Manager::get_option( 'version', '0.0' ) cannot be used because
+	 * version was new option added, and in that case default would never be used for a site
+	 * upgrading from a version prior to 1.0. So this is why get_option() is currently used.
+	 */
+	$options     = get_option( AMP_Options_Manager::OPTION_NAME, array() );
+	$old_version = isset( $options['version'] ) ? $options['version'] : '0.0';
+	if ( AMP__VERSION !== $old_version ) {
+		/**
+		 * Triggers when after amp_init when the plugin version has updated.
+		 *
+		 * @param string $old_version Old version.
+		 */
+		do_action( 'amp_plugin_update', $old_version );
+		AMP_Options_Manager::update_option( 'version', AMP__VERSION );
+	}
 }
 
 /**
diff --git a/assets/css/amp-validation-error-taxonomy.css b/assets/css/amp-validation-error-taxonomy.css
index ed56caf5a35..937ca08159d 100644
--- a/assets/css/amp-validation-error-taxonomy.css
+++ b/assets/css/amp-validation-error-taxonomy.css
@@ -203,14 +203,14 @@ details.single-error-detail[open] .single-error-detail-summary::after {
 body.taxonomy-amp_validation_error .wp-list-table .new th,
 body.taxonomy-amp_validation_error .wp-list-table .new td,
 tr.expanded.new + tr > td:first-of-type,
-body.post-type-amp_invalid_url .wp-list-table .new th,
-body.post-type-amp_invalid_url .wp-list-table .new td {
+body.post-type-amp_validated_url .wp-list-table .new th,
+body.post-type-amp_validated_url .wp-list-table .new td {
 	background-color: #fef7f1;
 }
 
 body.taxonomy-amp_validation_error .wp-list-table .new th.check-column,
 tr.expanded.new + tr > td:first-of-type,
-body.post-type-amp_invalid_url .wp-list-table .new th.check-column {
+body.post-type-amp_validated_url .wp-list-table .new th.check-column {
 	border-left: 4px solid #d54e21;
 }
 
diff --git a/assets/css/amp-validation-single-error-url.css b/assets/css/amp-validation-single-error-url.css
index d8a8db2510b..63ba02c8b4e 100644
--- a/assets/css/amp-validation-single-error-url.css
+++ b/assets/css/amp-validation-single-error-url.css
@@ -110,7 +110,7 @@ table.striped > tbody > tr.even {
 	display: none;
 }
 
-.amp-invalid-url a {
+.amp-validated-url a {
 	text-decoration: none;
 }
 
diff --git a/assets/js/amp-invalid-url-post-edit-screen.js b/assets/js/amp-validated-url-post-edit-screen.js
similarity index 99%
rename from assets/js/amp-invalid-url-post-edit-screen.js
rename to assets/js/amp-validated-url-post-edit-screen.js
index 60fcd9880bb..72c45575412 100644
--- a/assets/js/amp-invalid-url-post-edit-screen.js
+++ b/assets/js/amp-validated-url-post-edit-screen.js
@@ -1,6 +1,6 @@
-/* exported ampInvalidUrlPostEditScreen */
+/* exported ampValidatedUrlPostEditScreen */
 
-const ampInvalidUrlPostEditScreen = ( function() { // eslint-disable-line no-unused-vars
+const ampValidatedUrlPostEditScreen = ( function() { // eslint-disable-line no-unused-vars
 	let component = {
 		data: {
 			l10n: {
diff --git a/assets/js/amp-invalid-urls-index.js b/assets/js/amp-validated-urls-index.js
similarity index 83%
rename from assets/js/amp-invalid-urls-index.js
rename to assets/js/amp-validated-urls-index.js
index 49ff6b7d887..3cc1572c599 100644
--- a/assets/js/amp-invalid-urls-index.js
+++ b/assets/js/amp-validated-urls-index.js
@@ -1,6 +1,6 @@
-/* exported ampInvalidUrlsIndex */
+/* exported ampValidatedUrlsIndex */
 
-const ampInvalidUrlsIndex = ( function() { // eslint-disable-line no-unused-vars
+const ampValidatedUrlsIndex = ( function() { // eslint-disable-line no-unused-vars
 	let component = {
 		classes: {}
 	};
diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index f3adc45d045..777f70b120f 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -196,7 +196,7 @@ function amp_add_amphtml_link() {
 
 	// Check to see if there are known unaccepted validation errors for this URL.
 	if ( current_theme_supports( AMP_Theme_Support::SLUG ) ) {
-		$validation_errors = AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( $current_url, array( 'ignore_accepted' => true ) );
+		$validation_errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $current_url, array( 'ignore_accepted' => true ) );
 		$error_count       = count( $validation_errors );
 		if ( $error_count > 0 ) {
 			echo "<!--\n";
diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php
index 37589fab260..2d3c8725742 100644
--- a/includes/class-amp-autoloader.php
+++ b/includes/class-amp-autoloader.php
@@ -98,7 +98,7 @@ class AMP_Autoloader {
 		'AMP_HTML_Utils'                              => 'includes/utils/class-amp-html-utils',
 		'AMP_Image_Dimension_Extractor'               => 'includes/utils/class-amp-image-dimension-extractor',
 		'AMP_Validation_Manager'                      => 'includes/validation/class-amp-validation-manager',
-		'AMP_Invalid_URL_Post_Type'                   => 'includes/validation/class-amp-invalid-url-post-type',
+		'AMP_Validated_URL_Post_Type'                 => 'includes/validation/class-amp-validated-url-post-type',
 		'AMP_Validation_Error_Taxonomy'               => 'includes/validation/class-amp-validation-error-taxonomy',
 		'AMP_CLI'                                     => 'includes/class-amp-cli',
 		'AMP_String_Utils'                            => 'includes/utils/class-amp-string-utils',
diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index ed1c6671d17..af249ac3ae4 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -256,7 +256,7 @@ public function validate_site( $args, $assoc_args ) {
 
 		$url_more_details = add_query_arg(
 			'post_type',
-			AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 			admin_url( 'edit.php' )
 		);
 		/* translators: %s is the URL to the admin */
@@ -266,7 +266,7 @@ public function validate_site( $args, $assoc_args ) {
 	/**
 	 * Reset all validation data on a site.
 	 *
-	 * This deletes all amp_invalid_url posts and all amp_validation_error terms.
+	 * This deletes all amp_validated_url posts and all amp_validation_error terms.
 	 *
 	 * ## OPTIONS
 	 *
@@ -285,16 +285,16 @@ public function validate_site( $args, $assoc_args ) {
 	public function reset_site_validation( $args, $assoc_args ) {
 		unset( $args );
 		global $wpdb;
-		WP_CLI::confirm( 'Are you sure you want to empty all amp_invalid_url posts and amp_validation_error taxonomy terms?', $assoc_args );
+		WP_CLI::confirm( 'Are you sure you want to empty all amp_validated_url posts and amp_validation_error taxonomy terms?', $assoc_args );
 
 		// Delete all posts.
-		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = %s", AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
-		$query = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s", AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG );
+		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = %s", AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
+		$query = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s", AMP_Validated_URL_Post_Type::POST_TYPE_SLUG );
 		$posts = new WP_CLI\Iterators\Query( $query, 10000 );
 
 		$progress = WP_CLI\Utils\make_progress_bar(
 			/* translators: %d is the number of posts */
-			sprintf( __( 'Deleting %d amp_invalid_url posts...', 'amp' ), $count ),
+			sprintf( __( 'Deleting %d amp_validated_url posts...', 'amp' ), $count ),
 			$count
 		);
 		while ( $posts->valid() ) {
@@ -640,7 +640,7 @@ public static function validate_and_store_url( $url, $type ) {
 		}
 
 		$validation_errors = wp_list_pluck( $validity['results'], 'error' );
-		AMP_Invalid_URL_Post_Type::store_validation_errors(
+		AMP_Validated_URL_Post_Type::store_validation_errors(
 			$validation_errors,
 			$validity['url'],
 			wp_array_slice_assoc( $validity, array( 'queried_object' ) )
diff --git a/includes/options/class-amp-options-manager.php b/includes/options/class-amp-options-manager.php
index 423cabc18aa..168deab443e 100644
--- a/includes/options/class-amp-options-manager.php
+++ b/includes/options/class-amp-options-manager.php
@@ -32,6 +32,7 @@ class AMP_Options_Manager {
 		'all_templates_supported'  => true,
 		'supported_templates'      => array( 'is_singular' ),
 		'enable_response_caching'  => true,
+		'version'                  => AMP__VERSION,
 	);
 
 	/**
@@ -519,7 +520,7 @@ public static function handle_updated_theme_support_option() {
 					}
 				}
 
-				$invalid_url_post_id    = AMP_Invalid_URL_Post_Type::store_validation_errors( $errors, $url );
+				$invalid_url_post_id    = AMP_Validated_URL_Post_Type::store_validation_errors( $errors, $url );
 				$invalid_url_screen_url = ! is_wp_error( $invalid_url_post_id ) ? get_edit_post_link( $invalid_url_post_id, 'raw' ) : null;
 
 				if ( $rejected_errors > 0 ) {
diff --git a/includes/options/class-amp-options-menu.php b/includes/options/class-amp-options-menu.php
index 9ca359c7233..41c7bcda09a 100644
--- a/includes/options/class-amp-options-menu.php
+++ b/includes/options/class-amp-options-menu.php
@@ -191,7 +191,7 @@ public function render_theme_support() {
 					<dd>
 						<?php esc_html_e( 'Display AMP responses in classic (legacy) post templates in a basic design that does not match your theme\'s templates.', 'amp' ); ?>
 
-						<?php if ( ! current_theme_supports( AMP_Theme_Support::SLUG ) && wp_count_posts( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG )->publish > 0 ) : ?>
+						<?php if ( ! current_theme_supports( AMP_Theme_Support::SLUG ) && wp_count_posts( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG )->publish > 0 ) : ?>
 							<div class="notice notice-info inline notice-alt">
 								<p>
 									<?php
@@ -201,8 +201,8 @@ public function render_theme_support() {
 											__( 'View current site compatibility results for native and paired modes: %1$s and %2$s.', 'amp' ),
 											sprintf(
 												'<a href="%s">%s</a>',
-												esc_url( add_query_arg( 'post_type', AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, admin_url( 'edit.php' ) ) ),
-												esc_html( get_post_type_object( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG )->labels->name )
+												esc_url( add_query_arg( 'post_type', AMP_Validated_URL_Post_Type::POST_TYPE_SLUG, admin_url( 'edit.php' ) ) ),
+												esc_html( get_post_type_object( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG )->labels->name )
 											),
 											sprintf(
 												'<a href="%s">%s</a>',
@@ -210,7 +210,7 @@ public function render_theme_support() {
 													add_query_arg(
 														array(
 															'taxonomy' => AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG,
-															'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+															'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 														),
 														admin_url( 'edit-tags.php' )
 													)
@@ -280,7 +280,7 @@ public function render_validation_handling() {
 									add_query_arg(
 										array(
 											'taxonomy'  => AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG,
-											'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+											'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 										),
 										admin_url( 'edit-tags.php' )
 									)
diff --git a/includes/validation/class-amp-invalid-url-post-type.php b/includes/validation/class-amp-validated-url-post-type.php
similarity index 94%
rename from includes/validation/class-amp-invalid-url-post-type.php
rename to includes/validation/class-amp-validated-url-post-type.php
index 3d41f7d9643..90e750fc987 100644
--- a/includes/validation/class-amp-invalid-url-post-type.php
+++ b/includes/validation/class-amp-validated-url-post-type.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * Class AMP_Invalid_URL_Post_Type
+ * Class AMP_Validated_URL_Post_Type
  *
  * @package AMP
  */
 
 /**
- * Class AMP_Invalid_URL_Post_Type
+ * Class AMP_Validated_URL_Post_Type
  *
  * @since 1.0
  */
-class AMP_Invalid_URL_Post_Type {
+class AMP_Validated_URL_Post_Type {
 
 	/**
 	 * The slug of the post type to store URLs that have AMP errors.
 	 *
 	 * @var string
 	 */
-	const POST_TYPE_SLUG = 'amp_invalid_url';
+	const POST_TYPE_SLUG = 'amp_validated_url';
 
 	/**
 	 * The action to recheck URLs for AMP validity.
@@ -52,7 +52,7 @@ class AMP_Invalid_URL_Post_Type {
 	 *
 	 * @var string
 	 */
-	const EDIT_POST_SCRIPT_HANDLE = 'amp-invalid-url-post-edit-screen';
+	const EDIT_POST_SCRIPT_HANDLE = 'amp-validated-url-post-edit-screen';
 
 	/**
 	 * The query arg for the number of URLs tested.
@@ -95,16 +95,18 @@ class AMP_Invalid_URL_Post_Type {
 	 * @return void
 	 */
 	public static function register() {
+		add_action( 'amp_plugin_update', array( __CLASS__, 'handle_plugin_update' ) );
+
 		$post_type = register_post_type(
 			self::POST_TYPE_SLUG,
 			array(
 				'labels'       => array(
-					'name'               => _x( 'Invalid URLs', 'post type general name', 'amp' ),
-					'menu_name'          => __( 'Invalid URLs', 'amp' ),
-					'singular_name'      => __( 'Invalid URL', 'amp' ),
-					'not_found'          => __( 'No invalid URLs found', 'amp' ),
-					'not_found_in_trash' => __( 'No forgotten invalid URLs', 'amp' ),
-					'search_items'       => __( 'Search invalid URLs', 'amp' ),
+					'name'               => _x( 'AMP Validated URLs', 'post type general name', 'amp' ),
+					'menu_name'          => __( 'Validated URLs', 'amp' ),
+					'singular_name'      => __( 'Validated URL', 'amp' ),
+					'not_found'          => __( 'No validated URLs found', 'amp' ),
+					'not_found_in_trash' => __( 'No forgotten validated URLs', 'amp' ),
+					'search_items'       => __( 'Search validated URLs', 'amp' ),
 					'edit_item'          => '', // Overwritten in JS, so this prevents the page header from appearing and changing.
 				),
 				'supports'     => false,
@@ -123,6 +125,32 @@ public static function register() {
 		}
 	}
 
+	/**
+	 * Handle update to plugin.
+	 *
+	 * @param string $old_version Old version.
+	 */
+	public static function handle_plugin_update( $old_version ) {
+
+		// Update the old post type slug from amp_validated_url to amp_validated_url.
+		if ( '1.0-' === substr( $old_version, 0, 4 ) || version_compare( $old_version, '1.0', '<' ) ) {
+			global $wpdb;
+			$post_ids = get_posts( array(
+				'post_type'      => 'amp_invalid_url',
+				'fields'         => 'ids',
+				'posts_per_page' => -1,
+			) );
+			foreach ( $post_ids as $post_id ) {
+				$wpdb->update(
+					$wpdb->posts,
+					array( 'post_type' => self::POST_TYPE_SLUG ),
+					array( 'ID' => $post_id )
+				);
+				clean_post_cache( $post_id );
+			}
+		}
+	}
+
 	/**
 	 * Determine whether the admin menu item should be included.
 	 *
@@ -155,10 +183,10 @@ public static function add_admin_hooks() {
 
 		// Post list screen hooks.
 		add_filter( 'view_mode_post_types', function( $post_types ) {
-			return array_diff( $post_types, array( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+			return array_diff( $post_types, array( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 		} );
 		add_action( 'load-edit.php', function() {
-			if ( 'edit-amp_invalid_url' !== get_current_screen()->id ) {
+			if ( 'edit-' . AMP_Validated_URL_Post_Type::POST_TYPE_SLUG !== get_current_screen()->id ) {
 				return;
 			}
 			add_action( 'admin_head-edit.php', function() {
@@ -183,9 +211,9 @@ public static function add_admin_hooks() {
 		add_filter( sprintf( 'views_edit-%s', self::POST_TYPE_SLUG ), array( __CLASS__, 'filter_table_views' ) );
 		add_filter( 'bulk_post_updated_messages', array( __CLASS__, 'filter_bulk_post_updated_messages' ), 10, 2 );
 
-		// Hide irrelevant "published" label in the invalid URL post list.
+		// Hide irrelevant "published" label in the AMP Validated URLs post list.
 		add_filter( 'post_date_column_status', function ( $status, $post ) {
-			if ( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG === get_post_type( $post ) ) {
+			if ( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG === get_post_type( $post ) ) {
 				$status = '';
 			}
 
@@ -196,7 +224,7 @@ public static function add_admin_hooks() {
 		add_filter( 'removable_query_args', function ( $query_vars ) {
 			$query_vars[] = 'amp_actioned';
 			$query_vars[] = 'amp_taxonomy_terms_updated';
-			$query_vars[] = AMP_Invalid_URL_Post_Type::REMAINING_ERRORS;
+			$query_vars[] = AMP_Validated_URL_Post_Type::REMAINING_ERRORS;
 			$query_vars[] = 'amp_urls_tested';
 			$query_vars[] = 'amp_validate_error';
 
@@ -209,23 +237,23 @@ public static function add_admin_hooks() {
 	public static function enqueue_post_list_screen_scripts() {
 		$screen = get_current_screen();
 
-		if ( 'edit-amp_invalid_url' === $screen->id && self::POST_TYPE_SLUG === $screen->post_type ) {
+		if ( 'edit-' . self::POST_TYPE_SLUG === $screen->id && self::POST_TYPE_SLUG === $screen->post_type ) {
 			wp_enqueue_script(
-				'amp-invalid-urls-index',
-				amp_get_asset_url( 'js/amp-invalid-urls-index.js' ),
+				'amp-validated-urls-index',
+				amp_get_asset_url( 'js/amp-validated-urls-index.js' ),
 				array(),
 				AMP__VERSION,
 				true
 			);
 			wp_add_inline_script(
-				'amp-invalid-urls-index',
-				sprintf( 'document.addEventListener( "DOMContentLoaded", function() { ampInvalidUrlsIndex.boot(); } );' ),
+				'amp-validated-urls-index',
+				sprintf( 'document.addEventListener( "DOMContentLoaded", function() { ampValidatedUrlsIndex.boot(); } );' ),
 				'after'
 			);
 		}
 
-		// Enqueue this on both the 'Invalid URLs' page and the single URL page.
-		if ( 'edit-amp_invalid_url' === $screen->id || self::POST_TYPE_SLUG === $screen->id ) {
+		// Enqueue this on both the 'AMP Validated URLs' page and the single URL page.
+		if ( 'edit-' . self::POST_TYPE_SLUG === $screen->id || self::POST_TYPE_SLUG === $screen->id ) {
 			wp_enqueue_style(
 				'amp-admin-tables',
 				amp_get_asset_url( 'css/admin-tables.css' ),
@@ -234,7 +262,7 @@ public static function enqueue_post_list_screen_scripts() {
 			);
 		}
 
-		if ( 'edit-amp_invalid_url' !== $screen->id ) {
+		if ( 'edit-' . self::POST_TYPE_SLUG !== $screen->id ) {
 			return;
 		}
 
@@ -260,7 +288,7 @@ public static function enqueue_post_list_screen_scripts() {
 	}
 
 	/**
-	 * On the 'Invalid URLs' screen, renders a link to the 'Error Index' page.
+	 * On the 'AMP Validated URLs' screen, renders a link to the 'Error Index' page.
 	 *
 	 * @see AMP_Validation_Error_Taxonomy::render_link_to_invalid_urls_screen()
 	 */
@@ -324,9 +352,9 @@ public static function add_admin_menu_new_invalid_url_count() {
 	}
 
 	/**
-	 * Gets validation errors for a given invalid URL post.
+	 * Gets validation errors for a given validated URL post.
 	 *
-	 * @param string|int|WP_Post $url Either the URL string or a post (ID or WP_Post) of amp_invalid_url type.
+	 * @param string|int|WP_Post $url Either the URL string or a post (ID or WP_Post) of amp_validated_url type.
 	 * @param array              $args {
 	 *     Args.
 	 *
@@ -342,7 +370,7 @@ public static function get_invalid_url_validation_errors( $url, $args = array()
 			$args
 		);
 
-		// Look up post by URL or ensure the amp_invalid_url object.
+		// Look up post by URL or ensure the amp_validated_url object.
 		if ( is_string( $url ) ) {
 			$post = self::get_invalid_url_post( $url );
 		} else {
@@ -388,7 +416,7 @@ public static function get_invalid_url_validation_errors( $url, $args = array()
 	/**
 	 * Display summary of the validation error counts for a given post.
 	 *
-	 * @param int|WP_Post $post Post of amp_invalid_url type.
+	 * @param int|WP_Post $post Post of amp_validated_url type.
 	 * @param array       $args {
 	 *     Arguments.
 	 *
@@ -497,7 +525,7 @@ public static function get_invalid_url_post( $url, $options = array() ) {
 	}
 
 	/**
-	 * Get the URL from a given amp_invalid_url post.
+	 * Get the URL from a given amp_validated_url post.
 	 *
 	 * The URL will be returned with the amp query var added to it if the site is not canonical. The post_title
 	 * is always stored using the canonical AMP-less URL.
@@ -566,7 +594,7 @@ protected static function normalize_url_for_storage( $url ) {
 	/**
 	 * Stores the validation errors.
 	 *
-	 * If there are no validation errors provided, then any existing amp_invalid_url post is deleted.
+	 * If there are no validation errors provided, then any existing amp_validated_url post is deleted.
 	 *
 	 * @param array  $validation_errors Validation errors.
 	 * @param string $url               URL on which the validation errors occurred. Will be normalized to non-AMP version.
@@ -658,7 +686,7 @@ public static function store_validation_errors( $validation_errors, $url, $args
 		}
 
 		$post_content = wp_json_encode( $stored_validation_errors );
-		$placeholder  = 'amp_invalid_url_content_placeholder' . wp_rand();
+		$placeholder  = 'amp_validated_url_content_placeholder' . wp_rand();
 
 		// Guard against Kses from corrupting content by adding post_content after content_save_pre filter applies.
 		$insert_post_content = function( $post_data ) use ( $placeholder, $post_content ) {
@@ -667,7 +695,7 @@ public static function store_validation_errors( $validation_errors, $url, $args
 				&&
 				$placeholder === $post_data['post_content']
 				&&
-				AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG === $post_data['post_type']
+				AMP_Validated_URL_Post_Type::POST_TYPE_SLUG === $post_data['post_type']
 			);
 			if ( $should_supply_post_content ) {
 				$post_data['post_content'] = wp_slash( $post_content );
@@ -719,9 +747,9 @@ public static function get_validated_environment() {
 	}
 
 	/**
-	 * Get the differences between the current themes, plugins, and relevant options when amp_invalid_url post was last updated and now.
+	 * Get the differences between the current themes, plugins, and relevant options when amp_validated_url post was last updated and now.
 	 *
-	 * @param int|WP_Post $post Post of amp_invalid_url type.
+	 * @param int|WP_Post $post Post of amp_validated_url type.
 	 * @return array {
 	 *     Staleness of the validation results. An empty array if the results are fresh.
 	 *
@@ -809,7 +837,7 @@ public static function add_post_columns( $columns ) {
 	}
 
 	/**
-	 * Adds post columns to the /wp-admin/post.php page for amp_invalid_url.
+	 * Adds post columns to the /wp-admin/post.php page for amp_validated_url.
 	 *
 	 * @return array The filtered post columns.
 	 */
@@ -896,10 +924,10 @@ public static function output_custom_column( $column_name, $post_id ) {
 	}
 
 	/**
-	 * Renders the sources column on the the single error URL page and the 'Invalid URLs' page.
+	 * Renders the sources column on the the single error URL page and the 'AMP Validated URLs' page.
 	 *
 	 * @param array $error_summary The summary of errors.
-	 * @param int   $post_id       The ID of the amp_invalid_url post.
+	 * @param int   $post_id       The ID of the amp_validated_url post.
 	 */
 	public static function render_sources_column( $error_summary, $post_id ) {
 		if ( ! isset( $error_summary[ AMP_Validation_Error_Taxonomy::SOURCES_INVALID_OUTPUT ] ) ) {
@@ -1311,7 +1339,7 @@ public static function handle_validate_request() {
 				if ( ! $url ) {
 					throw new Exception( 'illegal_url' );
 				}
-				// Don't let non-admins create new amp_invalid_url posts.
+				// Don't let non-admins create new amp_validated_url posts.
 				if ( ! current_user_can( 'manage_options' ) ) {
 					throw new Exception( 'unauthorized' );
 				}
@@ -1372,7 +1400,7 @@ function ( $error ) {
 	}
 
 	/**
-	 * Re-check invalid URL post for whether it has blocking validation errors.
+	 * Re-check validated URL post for whether it has blocking validation errors.
 	 *
 	 * @param int|WP_Post $post Post.
 	 * @return array|WP_Error List of blocking validation results, or a WP_Error in the case of failure.
@@ -1541,7 +1569,7 @@ public static function add_edit_post_inline_script() {
 
 		wp_add_inline_script(
 			self::EDIT_POST_SCRIPT_HANDLE,
-			sprintf( 'document.addEventListener( "DOMContentLoaded", function() { ampInvalidUrlPostEditScreen.boot( %s ); } );', wp_json_encode( $data ) ),
+			sprintf( 'document.addEventListener( "DOMContentLoaded", function() { ampValidatedUrlPostEditScreen.boot( %s ); } );', wp_json_encode( $data ) ),
 			'after'
 		);
 	}
@@ -1700,7 +1728,7 @@ public static function print_status_meta_box( $post ) {
 	 * Renders the single URL list table.
 	 *
 	 * Mainly copied from edit-tags.php.
-	 * This is output on the post.php page for amp_invalid_url,
+	 * This is output on the post.php page for amp_validated_url,
 	 * where the editor normally would be.
 	 * But it's really more similar to /wp-admin/edit-tags.php than a post.php page,
 	 * as this outputs a WP_Terms_List_Table of amp_validation_error terms.
@@ -1729,7 +1757,7 @@ public static function render_single_url_list_table( $post ) {
 		 * @return WP_Term[]
 		 */
 		$override_terms_in_occurrence_order = function() use ( $post ) {
-			return wp_list_pluck( AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( $post ), 'term' );
+			return wp_list_pluck( AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $post ), 'term' );
 		};
 
 		add_filter( 'get_terms', $override_terms_in_occurrence_order );
@@ -1769,7 +1797,7 @@ public static function render_single_url_list_table( $post ) {
 	}
 
 	/**
-	 * Gets the number of amp_validation_error terms that should appear on the single amp_invalid_url /wp-admin/post.php page.
+	 * Gets the number of amp_validation_error terms that should appear on the single amp_validated_url /wp-admin/post.php page.
 	 *
 	 * @param int $terms_per_page The number of terms on a page.
 	 * @return int The number of terms on the page.
@@ -1817,7 +1845,7 @@ public static function print_url_as_title( $post ) {
 		}
 
 		?>
-		<h2 class="amp-invalid-url">
+		<h2 class="amp-validated-url">
 			<a href="<?php echo esc_url( $url ); ?>">
 				<?php
 				printf(
@@ -1834,7 +1862,7 @@ public static function print_url_as_title( $post ) {
 	}
 
 	/**
-	 * Strip host name from AMP invalid URL being printed.
+	 * Strip host name from AMP validated URL being printed.
 	 *
 	 * @param string  $title Title.
 	 * @param WP_Post $post  Post.
@@ -1849,7 +1877,7 @@ public static function filter_the_title_in_post_list_table( $title, $post ) {
 	}
 
 	/**
-	 * Renders the filters on the invalid URL post type edit.php page.
+	 * Renders the filters on the validated URL post type edit.php page.
 	 *
 	 * @param string $post_type The slug of the post type.
 	 * @param string $which     The location for the markup, either 'top' or 'bottom'.
@@ -2086,22 +2114,22 @@ public static function filter_bulk_post_updated_messages( $messages, $bulk_count
 				array(
 					/* translators: %s is the number of posts permanently forgotten */
 					'deleted'   => _n(
-						'%s invalid URL forgotten.',
-						'%s invalid URLs forgotten.',
+						'%s validated URL forgotten.',
+						'%s validated URLs forgotten.',
 						$bulk_counts['deleted'],
 						'amp'
 					),
 					/* translators: %s is the number of posts forgotten */
 					'trashed'   => _n(
-						'%s invalid URL forgotten.',
-						'%s invalid URLs forgotten.',
+						'%s validated URL forgotten.',
+						'%s validated URLs forgotten.',
 						$bulk_counts['trashed'],
 						'amp'
 					),
 					/* translators: %s is the number of posts restored from trash. */
 					'untrashed' => _n(
-						'%s invalid URL unforgotten.',
-						'%s invalid URLs unforgotten.',
+						'%s validated URL unforgotten.',
+						'%s validated URLs unforgotten.',
 						$bulk_counts['untrashed'],
 						'amp'
 					),
@@ -2131,7 +2159,7 @@ public static function is_amp_enabled_on_post( $post ) {
 	}
 
 	/**
-	 * Count Invalid URL Validation Errors
+	 * Count URL Validation Errors
 	 *
 	 * @param array $validation_errors Validation errors.
 	 *
diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php
index e46145e7895..af65569c434 100644
--- a/includes/validation/class-amp-validation-error-taxonomy.php
+++ b/includes/validation/class-amp-validation-error-taxonomy.php
@@ -230,7 +230,7 @@ class AMP_Validation_Error_Taxonomy {
 	 */
 	public static function register() {
 
-		register_taxonomy( self::TAXONOMY_SLUG, AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, array(
+		register_taxonomy( self::TAXONOMY_SLUG, AMP_Validated_URL_Post_Type::POST_TYPE_SLUG, array(
 			'labels'             => array(
 				'name'                  => _x( 'AMP Validation Error Index', 'taxonomy general name', 'amp' ),
 				'singular_name'         => _x( 'AMP Validation Error', 'taxonomy singular name', 'amp' ),
@@ -256,7 +256,7 @@ public static function register() {
 			'show_tagcloud'      => false,
 			'show_in_quick_edit' => false,
 			'hierarchical'       => false, // Or true? Code could be the parent term?
-			'show_in_menu'       => ( self::should_show_in_menu() || AMP_Invalid_URL_Post_Type::should_show_in_menu() ),
+			'show_in_menu'       => ( self::should_show_in_menu() || AMP_Validated_URL_Post_Type::should_show_in_menu() ),
 			'meta_box_cb'        => false,
 			'capabilities'       => array(
 				'assign_terms' => 'do_not_allow',
@@ -311,7 +311,7 @@ public static function get_term( $error ) {
 	}
 
 	/**
-	 * Delete all amp_validation_error terms that have zero counts (no amp_invalid_url posts associated with them).
+	 * Delete all amp_validation_error terms that have zero counts (no amp_validated_url posts associated with them).
 	 *
 	 * @since 1.0
 	 *
@@ -599,7 +599,7 @@ public static function get_validation_error_count( $args = array() ) {
 	/**
 	 * Add support for querying posts by amp_validation_error_status and by error type.
 	 *
-	 * Add recognition of amp_validation_error_status query var for amp_invalid_url post queries.
+	 * Add recognition of amp_validation_error_status query var for amp_validated_url post queries.
 	 * Also, conditionally filter for error type, like js_error or css_error.
 	 *
 	 * @see WP_Tax_Query::get_sql_for_clause()
@@ -612,7 +612,7 @@ public static function filter_posts_where_for_validation_error_status( $where, W
 		global $wpdb;
 
 		// If the post type is not correct, return the $where clause unchanged.
-		if ( ! in_array( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, (array) $query->get( 'post_type' ), true ) ) {
+		if ( ! in_array( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG, (array) $query->get( 'post_type' ), true ) ) {
 			return $where;
 		}
 
@@ -748,7 +748,7 @@ public static function add_admin_hooks() {
 		}
 		add_action( 'parse_term_query', array( __CLASS__, 'parse_post_php_term_query' ) );
 		add_filter( 'manage_' . self::TAXONOMY_SLUG . '_custom_column', array( __CLASS__, 'filter_manage_custom_columns' ), 10, 3 );
-		add_filter( 'manage_' . AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG . '_sortable_columns', array( __CLASS__, 'add_single_post_sortable_columns' ) );
+		add_filter( 'manage_' . AMP_Validated_URL_Post_Type::POST_TYPE_SLUG . '_sortable_columns', array( __CLASS__, 'add_single_post_sortable_columns' ) );
 		add_filter( 'posts_where', array( __CLASS__, 'filter_posts_where_for_validation_error_status' ), 10, 2 );
 		add_filter( 'post_action_' . self::VALIDATION_ERROR_REJECT_ACTION, array( __CLASS__, 'handle_single_url_page_bulk_and_inline_actions' ) );
 		add_filter( 'post_action_' . self::VALIDATION_ERROR_ACCEPT_ACTION, array( __CLASS__, 'handle_single_url_page_bulk_and_inline_actions' ) );
@@ -922,7 +922,7 @@ public static function add_term_filter_query_var( $url, $tax ) {
 			||
 			! isset( $_POST['post_type'] ) // WPCS: CSRF OK.
 			||
-			AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG !== $_POST['post_type'] // WPCS: CSRF OK.
+			AMP_Validated_URL_Post_Type::POST_TYPE_SLUG !== $_POST['post_type'] // WPCS: CSRF OK.
 		) {
 			return $url;
 		}
@@ -1095,9 +1095,9 @@ public static function render_taxonomy_filters( $taxonomy_name ) {
 	}
 
 	/**
-	 * On the 'Error Index' screen, renders a link to the 'Invalid URLs' page.
+	 * On the 'Error Index' screen, renders a link to the 'AMP Validated URLs' page.
 	 *
-	 * @see AMP_Invalid_URL_Post_Type::render_link_to_error_index_screen()
+	 * @see AMP_Validated_URL_Post_Type::render_link_to_error_index_screen()
 	 *
 	 * @param string $taxonomy_name The name of the taxonomy.
 	 */
@@ -1106,7 +1106,7 @@ public static function render_link_to_invalid_urls_screen( $taxonomy_name ) {
 			return;
 		}
 
-		$post_type_object = get_post_type_object( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG );
+		$post_type_object = get_post_type_object( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG );
 		if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
 			return;
 		}
@@ -1117,11 +1117,11 @@ public static function render_link_to_invalid_urls_screen( $taxonomy_name ) {
 			'<a href="%s" class="page-title-action" id="%s" hidden style="margin-left: 1rem;">%s</a>',
 			esc_url( add_query_arg(
 				'post_type',
-				AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+				AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 				admin_url( 'edit.php' )
 			) ),
 			esc_attr( $id ),
-			esc_html__( 'View Invalid URLs', 'amp' )
+			esc_html__( 'View Validated URLs', 'amp' )
 		);
 
 		?>
@@ -1156,7 +1156,7 @@ public static function render_error_status_filter() {
 
 		} elseif ( 'edit' === $screen_base ) {
 			$args = array(
-				'post_type'              => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+				'post_type'              => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 				'update_post_meta_cache' => false,
 				'update_post_term_cache' => false,
 			);
@@ -1419,7 +1419,7 @@ public static function filter_terms_clauses_for_description_search( $clauses, $t
 	 * Show notices for changes to amp_validation_error terms.
 	 */
 	public static function add_admin_notices() {
-		if ( ! ( self::TAXONOMY_SLUG === get_current_screen()->taxonomy || AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG === get_current_screen()->post_type ) ) { // WPCS: CSRF ok.
+		if ( ! ( self::TAXONOMY_SLUG === get_current_screen()->taxonomy || AMP_Validated_URL_Post_Type::POST_TYPE_SLUG === get_current_screen()->post_type ) ) { // WPCS: CSRF ok.
 			return;
 		}
 
@@ -1494,7 +1494,7 @@ public static function filter_tag_row_actions( $actions, WP_Term $tag ) {
 
 			/*
 			 * Hide deletion link since a validation error should only be removed once
-			 * it no longer has an occurrence on the site. When an invalid URL is re-checked
+			 * it no longer has an occurrence on the site. When a validated URL is re-checked
 			 * and it no longer has this validation error, then the count will be decremented.
 			 * When a validation error term no longer has a count, then it is hidden from the
 			 * list table. A cron job could periodically delete terms that have no counts.
@@ -1512,7 +1512,7 @@ public static function filter_tag_row_actions( $actions, WP_Term $tag ) {
 					'<a href="%s">%s</a>',
 					admin_url( add_query_arg( array(
 						self::TAXONOMY_SLUG => $term->name,
-						'post_type'         => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+						'post_type'         => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 					), 'edit.php' ) ),
 					esc_html__( 'Details', 'amp' )
 				);
@@ -1564,16 +1564,16 @@ public static function add_admin_menu_validation_error_item() {
 			$menu_item_label,
 			$taxonomy_caps->manage_terms,
 			// The following esc_attr() is sadly needed due to <https://github.com/WordPress/wordpress-develop/blob/4.9.5/src/wp-admin/menu-header.php#L201>.
-			esc_attr( 'edit-tags.php?taxonomy=' . self::TAXONOMY_SLUG . '&post_type=' . AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG )
+			esc_attr( 'edit-tags.php?taxonomy=' . self::TAXONOMY_SLUG . '&post_type=' . AMP_Validated_URL_Post_Type::POST_TYPE_SLUG )
 		);
 	}
 
 	/**
 	 * Parses the term query on post.php pages (single error URL).
 	 *
-	 * This post.php page for amp_invalid_url is more like an edit-tags.php page,
+	 * This post.php page for amp_validated_url is more like an edit-tags.php page,
 	 * in that it has a WP_Terms_List_Table of terms (of type amp_validation_error).
-	 * So this needs to only show the terms (errors) associated with this amp_invalid_url post.
+	 * So this needs to only show the terms (errors) associated with this amp_validated_url post.
 	 *
 	 * @param WP_Term_Query $wp_term_query Instance of WP_Term_Query.
 	 */
@@ -1583,9 +1583,9 @@ public static function parse_post_php_term_query( $wp_term_query ) {
 			return;
 		}
 
-		// Only set the query var if this is the invalid URL post type.
+		// Only set the query var if this is the validated URL post type.
 		$post_id = sanitize_key( $_GET['post'] );
-		if ( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG === get_post_type( $post_id ) ) {
+		if ( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG === get_post_type( $post_id ) ) {
 			$wp_term_query->query_vars['object_ids'] = $post_id;
 		}
 	}
@@ -1665,7 +1665,7 @@ public static function filter_manage_custom_columns( $content, $column_name, $te
 						'<a href="%s" class="error-code">%s</a>',
 						admin_url( add_query_arg( array(
 							self::TAXONOMY_SLUG => $term->name,
-							'post_type'         => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+							'post_type'         => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 						), 'edit.php' ) ),
 						esc_html( $validation_error['code'] )
 					);
@@ -1836,12 +1836,12 @@ public static function filter_manage_custom_columns( $content, $column_name, $te
 					break;
 				}
 				$url_post_id       = intval( $_GET['post'] ); // WPCS: CSRF OK.
-				$validation_errors = AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( $url_post_id );
+				$validation_errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $url_post_id );
 				$validation_errors = array_filter( $validation_errors, function( $error ) use ( $term ) {
 					return $error['term']->term_id === $term->term_id;
 				} );
 				$error_summary     = self::summarize_validation_errors( wp_list_pluck( $validation_errors, 'data' ) );
-				AMP_Invalid_URL_Post_Type::render_sources_column( $error_summary, $url_post_id );
+				AMP_Validated_URL_Post_Type::render_sources_column( $error_summary, $url_post_id );
 
 				break;
 			case 'error_type':
@@ -1862,7 +1862,7 @@ public static function filter_manage_custom_columns( $content, $column_name, $te
 	}
 
 	/**
-	 * Adds post columns to the /wp-admin/post.php page for amp_invalid_url.
+	 * Adds post columns to the /wp-admin/post.php page for amp_validated_url.
 	 *
 	 * @param array $sortable_columns The sortable columns.
 	 * @return array $sortable_columns The filtered sortable columns.
@@ -1887,7 +1887,7 @@ public static function add_single_post_sortable_columns( $sortable_columns ) {
 	public static function render_single_url_error_details( $validation_error, $term ) {
 		// Get the sources, if they exist.
 		if ( isset( $_GET['post'] ) ) {
-			$validation_errors = AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( intval( $_GET['post'] ) ); // WPCS: CSRF OK.
+			$validation_errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( intval( $_GET['post'] ) ); // WPCS: CSRF OK.
 			foreach ( $validation_errors as $error ) {
 				if ( isset( $error['data']['sources'], $error['term']->term_id ) && $error['term']->term_id === $term->term_id ) {
 					$validation_error['sources'] = $error['data']['sources'];
@@ -2012,7 +2012,7 @@ public static function handle_inline_edit_request() {
 		}
 
 		// If we have a post_type check that it is the correct one.
-		if ( isset( $_GET['post_type'] ) && \AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG !== $_GET['post_type'] ) { // WPCS: CSRF ok.
+		if ( isset( $_GET['post_type'] ) && \AMP_Validated_URL_Post_Type::POST_TYPE_SLUG !== $_GET['post_type'] ) { // WPCS: CSRF ok.
 			return;
 		}
 		$action = sanitize_key( $_GET['action'] ); // WPCS: CSRF ok.
@@ -2042,7 +2042,7 @@ public static function handle_inline_edit_request() {
 	 * @param int $post_id The ID of the post for which to apply the bulk action.
 	 */
 	public static function handle_single_url_page_bulk_and_inline_actions( $post_id ) {
-		if ( ! isset( $_REQUEST['action'] ) || AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG !== get_post_type( $post_id ) ) {  // WPCS: CSRF OK.
+		if ( ! isset( $_REQUEST['action'] ) || AMP_Validated_URL_Post_Type::POST_TYPE_SLUG !== get_post_type( $post_id ) ) {  // WPCS: CSRF OK.
 			return;
 		}
 
diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index 7bcda6fe929..e1a23603d08 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -155,7 +155,7 @@ public static function init( $args = array() ) {
 
 		self::$should_locate_sources = $args['should_locate_sources'];
 
-		AMP_Invalid_URL_Post_Type::register();
+		AMP_Validated_URL_Post_Type::register();
 		AMP_Validation_Error_Taxonomy::register();
 
 		// Short-circuit if AMP is not supported as only the post types should be available.
@@ -268,7 +268,7 @@ public static function add_admin_bar_menu_items( $wp_admin_bar ) {
 			return;
 		}
 
-		$amp_invalid_url_post = null;
+		$amp_validated_url_post = null;
 
 		$current_url = amp_get_current_url();
 		$non_amp_url = amp_remove_endpoint( $current_url );
@@ -291,7 +291,7 @@ public static function add_admin_bar_menu_items( $wp_admin_bar ) {
 
 		/*
 		 * If not an AMP response, then obtain the count of validation errors from either the query param supplied after redirecting from AMP
-		 * to non-AMP due to validation errors (see AMP_Theme_Support::prepare_response()), or if there is an amp_invalid_url post that already
+		 * to non-AMP due to validation errors (see AMP_Theme_Support::prepare_response()), or if there is an amp_validated_url post that already
 		 * is populated with the last-known validation errors. Otherwise, if it *is* an AMP response then the error count is obtained after
 		 * when the response is being prepared by AMP_Validation_Manager::finalize_validation().
 		 */
@@ -300,10 +300,10 @@ public static function add_admin_bar_menu_items( $wp_admin_bar ) {
 				$error_count = intval( $_GET[ self::VALIDATION_ERRORS_QUERY_VAR ] );
 			}
 			if ( $error_count < 0 ) {
-				$amp_invalid_url_post = AMP_Invalid_URL_Post_Type::get_invalid_url_post( $amp_url );
-				if ( $amp_invalid_url_post ) {
+				$amp_validated_url_post = AMP_Validated_URL_Post_Type::get_invalid_url_post( $amp_url );
+				if ( $amp_validated_url_post ) {
 					$error_count = 0;
-					foreach ( AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( $amp_invalid_url_post ) as $error ) {
+					foreach ( AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $amp_validated_url_post ) as $error ) {
 						if ( AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACK_REJECTED_STATUS === $error['term_status'] || AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_NEW_REJECTED_STATUS === $error['term_status'] ) {
 							$error_count++;
 						}
@@ -312,13 +312,13 @@ public static function add_admin_bar_menu_items( $wp_admin_bar ) {
 			}
 		}
 
-		$user_can_revalidate = $amp_invalid_url_post ? current_user_can( 'edit_post', $amp_invalid_url_post->ID ) : current_user_can( 'manage_options' );
+		$user_can_revalidate = $amp_validated_url_post ? current_user_can( 'edit_post', $amp_validated_url_post->ID ) : current_user_can( 'manage_options' );
 		if ( ! $user_can_revalidate ) {
 			return;
 		}
 
-		// @todo The amp_invalid_url post should probably only be accessible to users who can manage_options, or limit access to a post if the user has the cap to edit the queried object?
-		$validate_url = AMP_Invalid_URL_Post_Type::get_recheck_url( $amp_invalid_url_post ? $amp_invalid_url_post : $amp_url );
+		// @todo The amp_validated_url post should probably only be accessible to users who can manage_options, or limit access to a post if the user has the cap to edit the queried object?
+		$validate_url = AMP_Validated_URL_Post_Type::get_recheck_url( $amp_validated_url_post ? $amp_validated_url_post : $amp_url );
 
 		if ( is_amp_endpoint() ) {
 			$icon = '&#x2705;'; // WHITE HEAVY CHECK MARK. This will get overridden in AMP_Validation_Manager::finalize_validation() if there are unaccepted errors.
@@ -556,7 +556,7 @@ function( $post ) {
 
 		/*
 		 * It is unlikely that there will be more than one post in the array.
-		 * For the bulk recheck action, see AMP_Invalid_URL_Post_Type::handle_bulk_action().
+		 * For the bulk recheck action, see AMP_Validated_URL_Post_Type::handle_bulk_action().
 		 */
 		foreach ( $posts as $post ) {
 			$url = amp_get_permalink( $post->ID );
@@ -572,9 +572,9 @@ function( $post ) {
 			if ( is_wp_error( $validity ) ) {
 				$validation_posts[ $post->ID ] = $validity;
 			} else {
-				$invalid_url_post_id = intval( get_post_meta( $post->ID, '_amp_invalid_url_post_id', true ) );
+				$invalid_url_post_id = intval( get_post_meta( $post->ID, '_amp_validated_url_post_id', true ) );
 
-				$validation_posts[ $post->ID ] = AMP_Invalid_URL_Post_Type::store_validation_errors(
+				$validation_posts[ $post->ID ] = AMP_Validated_URL_Post_Type::store_validation_errors(
 					wp_list_pluck( $validity['results'], 'error' ),
 					$validity['url'],
 					array_merge(
@@ -585,9 +585,9 @@ function( $post ) {
 					)
 				);
 
-				// Remember the amp_invalid_url post so that when the slug changes the old amp_invalid_url post can be updated.
+				// Remember the amp_validated_url post so that when the slug changes the old amp_validated_url post can be updated.
 				if ( ! is_wp_error( $validation_posts[ $post->ID ] ) && $invalid_url_post_id !== $validation_posts[ $post->ID ] ) {
-					update_post_meta( $post->ID, '_amp_invalid_url_post_id', $validation_posts[ $post->ID ] );
+					update_post_meta( $post->ID, '_amp_validated_url_post_id', $validation_posts[ $post->ID ] );
 				}
 			}
 		}
@@ -655,7 +655,7 @@ public static function get_amp_validity_rest_field( $post_data, $field_name, $re
 		}
 
 		if ( empty( $validation_status_post ) ) {
-			$validation_status_post = AMP_Invalid_URL_Post_Type::get_invalid_url_post( amp_get_permalink( $post->ID ) );
+			$validation_status_post = AMP_Validated_URL_Post_Type::get_invalid_url_post( amp_get_permalink( $post->ID ) );
 		}
 
 		$field = array(
@@ -665,7 +665,7 @@ public static function get_amp_validity_rest_field( $post_data, $field_name, $re
 
 		if ( $validation_status_post ) {
 			$field['review_link'] = get_edit_post_link( $validation_status_post->ID, 'raw' );
-			foreach ( AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( $validation_status_post ) as $result ) {
+			foreach ( AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $validation_status_post ) as $result ) {
 				$field['results'][] = array(
 					'sanitized'   => AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACK_ACCEPTED_STATUS === $result['status'],
 					'error'       => $result['data'],
@@ -803,14 +803,14 @@ public static function print_edit_form_validation_status( $post ) {
 			return;
 		}
 
-		$invalid_url_post = AMP_Invalid_URL_Post_Type::get_invalid_url_post( get_permalink( $post->ID ) );
+		$invalid_url_post = AMP_Validated_URL_Post_Type::get_invalid_url_post( get_permalink( $post->ID ) );
 		if ( ! $invalid_url_post ) {
 			return;
 		}
 
 		// Show all validation errors which have not been explicitly acknowledged as accepted.
 		$validation_errors = array();
-		foreach ( AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( $invalid_url_post ) as $error ) {
+		foreach ( AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $invalid_url_post ) as $error ) {
 			$needs_moderation = (
 				AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACK_REJECTED_STATUS === $error['status'] || // @todo Show differently since moderated?
 				AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_NEW_REJECTED_STATUS === $error['status'] ||
@@ -1683,7 +1683,7 @@ public static function validate_after_plugin_activation() {
 		}
 		$validation_errors = wp_list_pluck( $validity['results'], 'error' );
 		if ( is_array( $validity ) && count( $validation_errors ) > 0 ) { // @todo This should only warn when there are unaccepted validation errors.
-			AMP_Invalid_URL_Post_Type::store_validation_errors(
+			AMP_Validated_URL_Post_Type::store_validation_errors(
 				$validation_errors,
 				$validity['url'],
 				wp_array_slice_assoc( $validity, array( 'queried_object_id', 'queried_object_type' ) )
@@ -1860,7 +1860,7 @@ public static function print_plugin_notice() {
 					'<a href="%s">%s</a>',
 					esc_url( add_query_arg(
 						'post_type',
-						AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+						AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 						admin_url( 'edit.php' )
 					) ),
 					__( 'More details', 'amp' )
diff --git a/readme.md b/readme.md
index 362e45b8382..074dfd66c8e 100644
--- a/readme.md
+++ b/readme.md
@@ -160,7 +160,7 @@ To learn how to use the new features in this release, please see the wiki pages
 - Default to auto sanitization and tree shaking being enabled. See [#1402](https://github.com/Automattic/amp-wp/issues/1402). Props westonruter.
 - Omit validation errors sanitized by filter or tree-shaking option; since sanitization is forced, there is no point to store. See (#1413)[https://github.com/Automattic/amp-wp/pull/1413]. Props westonruter.
 - Prevent URL validation from happening during bulk imports. See [#1424](https://github.com/Automattic/amp-wp/pull/1424), [#1404](https://github.com/Automattic/amp-wp/issues/1404). Props westonruter.
-- Normalize invalid URL stored for `amp_invalid_url` post type. See [#1436](https://github.com/Automattic/amp-wp/pull/1436). Props westonruter.
+- Normalize invalid URL stored for `amp_validated_url` post type. See [#1436](https://github.com/Automattic/amp-wp/pull/1436). Props westonruter.
 - Expose and store queried object for validated URL; show edit link. See [#1426](https://github.com/Automattic/amp-wp/pull/1426), [#1428](https://github.com/Automattic/amp-wp/pull/1428), [#1433](https://github.com/Automattic/amp-wp/pull/1433). Props westonruter.
 - Re-validate the site when switching modes and show the results in a notice. See [#1443](https://github.com/Automattic/amp-wp/pull/1443). Props kienstra, westonruter.
 - Improve access to AMP admin screens for users who are not administrators. [#1437](https://github.com/Automattic/amp-wp/pull/1437). Props westonruter.
diff --git a/readme.txt b/readme.txt
index e11b29eba2f..6ca16c33990 100644
--- a/readme.txt
+++ b/readme.txt
@@ -143,7 +143,7 @@ To learn how to use the new features in this release, please see the wiki pages
 - Default to auto sanitization and tree shaking being enabled. See [#1402](https://github.com/Automattic/amp-wp/issues/1402). Props westonruter.
 - Omit validation errors sanitized by filter or tree-shaking option; since sanitization is forced, there is no point to store. See (#1413)[https://github.com/Automattic/amp-wp/pull/1413]. Props westonruter.
 - Prevent URL validation from happening during bulk imports. See [#1424](https://github.com/Automattic/amp-wp/pull/1424), [#1404](https://github.com/Automattic/amp-wp/issues/1404). Props westonruter.
-- Normalize invalid URL stored for `amp_invalid_url` post type. See [#1436](https://github.com/Automattic/amp-wp/pull/1436). Props westonruter.
+- Normalize invalid URL stored for `amp_validated_url` post type. See [#1436](https://github.com/Automattic/amp-wp/pull/1436). Props westonruter.
 - Expose and store queried object for validated URL; show edit link. See [#1426](https://github.com/Automattic/amp-wp/pull/1426), [#1428](https://github.com/Automattic/amp-wp/pull/1428), [#1433](https://github.com/Automattic/amp-wp/pull/1433). Props westonruter.
 - Re-validate the site when switching modes and show the results in a notice. See [#1443](https://github.com/Automattic/amp-wp/pull/1443). Props kienstra, westonruter.
 - Improve access to AMP admin screens for users who are not administrators. [#1437](https://github.com/Automattic/amp-wp/pull/1437). Props westonruter.
diff --git a/tests/test-amp-helper-functions.php b/tests/test-amp-helper-functions.php
index 0dfb4c44704..d831bc72cf7 100644
--- a/tests/test-amp-helper-functions.php
+++ b/tests/test-amp-helper-functions.php
@@ -298,7 +298,7 @@ public function test_amp_add_amphtml_link( $canonical_url, $amphtml_url ) {
 			'template_dir' => './',
 		) );
 		AMP_Theme_Support::init();
-		$invalid_url_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_url_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'foo' ),
 			),
diff --git a/tests/test-class-amp-cli.php b/tests/test-class-amp-cli.php
index 07abec0df74..b08ddb3f28d 100644
--- a/tests/test-class-amp-cli.php
+++ b/tests/test-class-amp-cli.php
@@ -453,14 +453,14 @@ public function get_inital_url_count() {
 	 */
 	public function get_validated_urls() {
 		$query = new WP_Query( array(
-			'post_type'      => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'post_type'      => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 			'posts_per_page' => 100,
 			'fields'         => 'ids',
 		) );
 
 		return array_map(
 			function( $post ) {
-				return remove_query_arg( 'amp', AMP_Invalid_URL_Post_Type::get_url_from_post( $post ) );
+				return remove_query_arg( 'amp', AMP_Validated_URL_Post_Type::get_url_from_post( $post ) );
 			},
 			$query->posts
 		);
diff --git a/tests/test-class-amp-options-manager.php b/tests/test-class-amp-options-manager.php
index 9401eb8d20c..5d2a0447848 100644
--- a/tests/test-class-amp-options-manager.php
+++ b/tests/test-class-amp-options-manager.php
@@ -104,6 +104,7 @@ public function test_get_and_set_options() {
 				'all_templates_supported'  => true,
 				'supported_templates'      => array( 'is_singular' ),
 				'enable_response_caching'  => true,
+				'version'                  => AMP__VERSION,
 			),
 			AMP_Options_Manager::get_options()
 		);
@@ -437,7 +438,7 @@ public function test_handle_updated_theme_support_option_disabled() {
 		$new_error           = end( $amp_settings_errors );
 		$this->assertStringStartsWith( 'Classic mode activated!', $new_error['message'] );
 		$this->assertContains( esc_url( amp_get_permalink( $page_id ) ), $new_error['message'], 'Expect amp_admin_get_preview_permalink() to return a page since it is the only post type supported.' );
-		$this->assertCount( 0, get_posts( array( 'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) ) );
+		$this->assertCount( 0, get_posts( array( 'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) ) );
 	}
 
 	/**
@@ -477,7 +478,7 @@ public function test_handle_updated_theme_support_option_native_success_but_erro
 		$this->assertStringStartsWith( 'Native mode activated!', $new_error['message'] );
 		$this->assertContains( esc_url( amp_get_permalink( $post_id ) ), $new_error['message'], 'Expect amp_admin_get_preview_permalink() to return a post since it is the only post type supported.' );
 		$invalid_url_posts = get_posts( array(
-			'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 			'fields'    => 'ids',
 		) );
 		$this->assertEquals( 'updated', $new_error['type'] );
@@ -512,7 +513,7 @@ public function test_handle_updated_theme_support_option_native_validate_error()
 		$new_error           = end( $amp_settings_errors );
 		$this->assertStringStartsWith( 'Native mode activated!', $new_error['message'] );
 		$invalid_url_posts = get_posts( array(
-			'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 			'fields'    => 'ids',
 		) );
 		$this->assertCount( 0, $invalid_url_posts );
@@ -560,7 +561,7 @@ public function test_handle_updated_theme_support_option_paired() {
 		$this->assertStringStartsWith( 'Paired mode activated!', $new_error['message'] );
 		$this->assertContains( esc_url( amp_get_permalink( $post_id ) ), $new_error['message'], 'Expect amp_admin_get_preview_permalink() to return a post since it is the only post type supported.' );
 		$invalid_url_posts = get_posts( array(
-			'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 			'fields'    => 'ids',
 		) );
 		$this->assertEquals( 'updated', $new_error['type'] );
diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index be997bd0672..3604587e17b 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -1318,6 +1318,7 @@ public function test_post_processor_cache_effectiveness() {
 		$args          = array( 'enable_response_caching' => true );
 		wp_using_ext_object_cache( true ); // turn on external object cache flag.
 		$this->reset_post_processor_cache_effectiveness();
+		AMP_Options_Manager::update_option( 'enable_response_caching', true );
 
 		// Test the response is not cached after exceeding the cache miss threshold.
 		for ( $num_calls = 1, $max = AMP_Theme_Support::CACHE_MISS_THRESHOLD + 2; $num_calls <= $max; $num_calls++ ) {
diff --git a/tests/validation/test-class-amp-invalid-url-post-type.php b/tests/validation/test-class-amp-validated-url-post-type.php
similarity index 67%
rename from tests/validation/test-class-amp-invalid-url-post-type.php
rename to tests/validation/test-class-amp-validated-url-post-type.php
index a6a87606d6d..e2f1a117123 100644
--- a/tests/validation/test-class-amp-invalid-url-post-type.php
+++ b/tests/validation/test-class-amp-validated-url-post-type.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for AMP_Invalid_URL_Post_Type class.
+ * Tests for AMP_Validated_URL_Post_Type class.
  *
  * @package AMP
  */
@@ -8,13 +8,13 @@
 // phpcs:disable WordPress.Variables.GlobalVariables.OverrideProhibited
 
 /**
- * Tests for AMP_Invalid_URL_Post_Type class.
+ * Tests for AMP_Validated_URL_Post_Type class.
  *
- * @covers AMP_Invalid_URL_Post_Type
+ * @covers AMP_Validated_URL_Post_Type
  */
-class Test_AMP_Invalid_URL_Post_Type extends \WP_UnitTestCase {
+class Test_AMP_Validated_URL_Post_Type extends \WP_UnitTestCase {
 
-	const TESTED_CLASS = 'AMP_Invalid_URL_Post_Type';
+	const TESTED_CLASS = 'AMP_Validated_URL_Post_Type';
 
 	/**
 	 * After a test method runs, reset any state in WordPress the test method might have changed.
@@ -28,60 +28,60 @@ public function tearDown() {
 	/**
 	 * Test register.
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::register()
-	 * @covers \AMP_Invalid_URL_Post_Type::add_admin_hooks()
+	 * @covers \AMP_Validated_URL_Post_Type::register()
+	 * @covers \AMP_Validated_URL_Post_Type::add_admin_hooks()
 	 */
 	public function test_register() {
 		add_theme_support( AMP_Theme_Support::SLUG );
 		$this->assertFalse( is_admin() );
 
-		AMP_Invalid_URL_Post_Type::register();
-		$amp_post_type = get_post_type_object( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG );
+		AMP_Validated_URL_Post_Type::register();
+		$amp_post_type = get_post_type_object( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG );
 
-		$this->assertTrue( in_array( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, get_post_types(), true ) );
-		$this->assertEquals( array(), get_all_post_type_supports( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
-		$this->assertEquals( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, $amp_post_type->name );
-		$this->assertEquals( 'Invalid URLs', $amp_post_type->label );
+		$this->assertTrue( in_array( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG, get_post_types(), true ) );
+		$this->assertEquals( array(), get_all_post_type_supports( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
+		$this->assertEquals( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG, $amp_post_type->name );
+		$this->assertEquals( 'AMP Validated URLs', $amp_post_type->label );
 		$this->assertEquals( false, $amp_post_type->public );
 		$this->assertTrue( $amp_post_type->show_ui );
 		$this->assertEquals( AMP_Options_Manager::OPTION_NAME, $amp_post_type->show_in_menu );
 		$this->assertTrue( $amp_post_type->show_in_admin_bar );
-		$this->assertNotContains( AMP_Invalid_URL_Post_Type::REMAINING_ERRORS, wp_removable_query_args() );
+		$this->assertNotContains( AMP_Validated_URL_Post_Type::REMAINING_ERRORS, wp_removable_query_args() );
 
 		// Make sure that add_admin_hooks() gets called.
 		set_current_screen( 'index.php' );
-		AMP_Invalid_URL_Post_Type::register();
-		$this->assertContains( AMP_Invalid_URL_Post_Type::REMAINING_ERRORS, wp_removable_query_args() );
+		AMP_Validated_URL_Post_Type::register();
+		$this->assertContains( AMP_Validated_URL_Post_Type::REMAINING_ERRORS, wp_removable_query_args() );
 	}
 
 	/**
 	 * Test should_show_in_menu.
 	 *
-	 * @covers AMP_Invalid_URL_Post_Type::should_show_in_menu()
+	 * @covers AMP_Validated_URL_Post_Type::should_show_in_menu()
 	 */
 	public function test_should_show_in_menu() {
 		global $pagenow;
 		add_theme_support( AMP_Theme_Support::SLUG );
-		$this->assertTrue( AMP_Invalid_URL_Post_Type::should_show_in_menu() );
+		$this->assertTrue( AMP_Validated_URL_Post_Type::should_show_in_menu() );
 
 		remove_theme_support( AMP_Theme_Support::SLUG );
-		$this->assertFalse( AMP_Invalid_URL_Post_Type::should_show_in_menu() );
+		$this->assertFalse( AMP_Validated_URL_Post_Type::should_show_in_menu() );
 
 		$pagenow           = 'edit.php'; // WPCS: override ok.
 		$_GET['post_type'] = 'post';
-		$this->assertFalse( AMP_Invalid_URL_Post_Type::should_show_in_menu() );
+		$this->assertFalse( AMP_Validated_URL_Post_Type::should_show_in_menu() );
 
-		$_GET['post_type'] = AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG;
-		$this->assertTrue( AMP_Invalid_URL_Post_Type::should_show_in_menu() );
+		$_GET['post_type'] = AMP_Validated_URL_Post_Type::POST_TYPE_SLUG;
+		$this->assertTrue( AMP_Validated_URL_Post_Type::should_show_in_menu() );
 	}
 
 	/**
 	 * Test add_admin_hooks.
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::add_admin_hooks()
+	 * @covers \AMP_Validated_URL_Post_Type::add_admin_hooks()
 	 */
 	public function test_add_admin_hooks() {
-		AMP_Invalid_URL_Post_Type::add_admin_hooks();
+		AMP_Validated_URL_Post_Type::add_admin_hooks();
 
 		$this->assertEquals( 10, has_filter( 'dashboard_glance_items', array( self::TESTED_CLASS, 'filter_dashboard_glance_items' ) ) );
 		$this->assertEquals( 10, has_action( 'rightnow_end', array( self::TESTED_CLASS, 'print_dashboard_glance_styles' ) ) );
@@ -92,25 +92,25 @@ public function test_add_admin_hooks() {
 
 		$this->assertEquals( 10, has_filter( 'the_title', array( self::TESTED_CLASS, 'filter_the_title_in_post_list_table' ) ) );
 		$this->assertEquals( 10, has_filter( 'restrict_manage_posts', array( self::TESTED_CLASS, 'render_post_filters' ) ) );
-		$this->assertEquals( 10, has_filter( 'manage_' . AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG . '_posts_columns', array( self::TESTED_CLASS, 'add_post_columns' ) ) );
-		$this->assertEquals( 10, has_filter( 'manage_' . AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG . '_columns', array( self::TESTED_CLASS, 'add_single_post_columns' ) ) );
+		$this->assertEquals( 10, has_filter( 'manage_' . AMP_Validated_URL_Post_Type::POST_TYPE_SLUG . '_posts_columns', array( self::TESTED_CLASS, 'add_post_columns' ) ) );
+		$this->assertEquals( 10, has_filter( 'manage_' . AMP_Validated_URL_Post_Type::POST_TYPE_SLUG . '_columns', array( self::TESTED_CLASS, 'add_single_post_columns' ) ) );
 		$this->assertEquals( 10, has_action( 'manage_posts_custom_column', array( self::TESTED_CLASS, 'output_custom_column' ) ) );
 		$this->assertEquals( 10, has_filter( 'post_row_actions', array( self::TESTED_CLASS, 'filter_post_row_actions' ) ) );
-		$this->assertEquals( 10, has_filter( 'bulk_actions-edit-' . AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, array( self::TESTED_CLASS, 'filter_bulk_actions' ) ) );
-		$this->assertEquals( 10, has_filter( 'bulk_actions-' . AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, '__return_false' ) );
-		$this->assertEquals( 10, has_filter( 'handle_bulk_actions-edit-' . AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, array( self::TESTED_CLASS, 'handle_bulk_action' ) ) );
+		$this->assertEquals( 10, has_filter( 'bulk_actions-edit-' . AMP_Validated_URL_Post_Type::POST_TYPE_SLUG, array( self::TESTED_CLASS, 'filter_bulk_actions' ) ) );
+		$this->assertEquals( 10, has_filter( 'bulk_actions-' . AMP_Validated_URL_Post_Type::POST_TYPE_SLUG, '__return_false' ) );
+		$this->assertEquals( 10, has_filter( 'handle_bulk_actions-edit-' . AMP_Validated_URL_Post_Type::POST_TYPE_SLUG, array( self::TESTED_CLASS, 'handle_bulk_action' ) ) );
 		$this->assertEquals( 10, has_action( 'admin_notices', array( self::TESTED_CLASS, 'print_admin_notice' ) ) );
-		$this->assertEquals( 10, has_action( 'admin_action_' . AMP_Invalid_URL_Post_Type::VALIDATE_ACTION, array( self::TESTED_CLASS, 'handle_validate_request' ) ) );
-		$this->assertEquals( 10, has_action( 'post_action_' . AMP_Invalid_URL_Post_Type::UPDATE_POST_TERM_STATUS_ACTION, array( self::TESTED_CLASS, 'handle_validation_error_status_update' ) ) );
+		$this->assertEquals( 10, has_action( 'admin_action_' . AMP_Validated_URL_Post_Type::VALIDATE_ACTION, array( self::TESTED_CLASS, 'handle_validate_request' ) ) );
+		$this->assertEquals( 10, has_action( 'post_action_' . AMP_Validated_URL_Post_Type::UPDATE_POST_TERM_STATUS_ACTION, array( self::TESTED_CLASS, 'handle_validation_error_status_update' ) ) );
 		$this->assertEquals( 10, has_action( 'admin_menu', array( self::TESTED_CLASS, 'add_admin_menu_new_invalid_url_count' ) ) );
 
-		$post = $this->factory()->post->create_and_get( array( 'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+		$post = $this->factory()->post->create_and_get( array( 'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 		$this->assertEquals( '', apply_filters( 'post_date_column_status', 'publish', $post ) );
 		$this->assertEquals( 'publish', apply_filters( 'post_date_column_status', 'publish', $this->factory()->post->create_and_get() ) );
 
 		$this->assertContains( 'amp_actioned', wp_removable_query_args() );
 		$this->assertContains( 'amp_taxonomy_terms_updated', wp_removable_query_args() );
-		$this->assertContains( AMP_Invalid_URL_Post_Type::REMAINING_ERRORS, wp_removable_query_args() );
+		$this->assertContains( AMP_Validated_URL_Post_Type::REMAINING_ERRORS, wp_removable_query_args() );
 		$this->assertContains( 'amp_urls_tested', wp_removable_query_args() );
 		$this->assertContains( 'amp_validate_error', wp_removable_query_args() );
 	}
@@ -118,14 +118,14 @@ public function test_add_admin_hooks() {
 	/**
 	 * Test add_admin_menu_new_invalid_url_count.
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::add_admin_menu_new_invalid_url_count()
+	 * @covers \AMP_Validated_URL_Post_Type::add_admin_menu_new_invalid_url_count()
 	 */
 	public function test_add_admin_menu_new_invalid_url_count() {
 		global $submenu;
 		AMP_Validation_Manager::init(); // Register the post type and taxonomy.
 
 		unset( $submenu[ AMP_Options_Manager::OPTION_NAME ] );
-		AMP_Invalid_URL_Post_Type::add_admin_menu_new_invalid_url_count();
+		AMP_Validated_URL_Post_Type::add_admin_menu_new_invalid_url_count();
 
 		$submenu[ AMP_Options_Manager::OPTION_NAME ] = array( // WPCS: override ok.
 			0 => array(
@@ -143,12 +143,12 @@ public function test_add_admin_menu_new_invalid_url_count() {
 			2 => array(
 				0 => 'Invalid Pages',
 				1 => 'edit_posts',
-				2 => 'edit.php?post_type=amp_invalid_url',
+				2 => 'edit.php?post_type=amp_validated_url',
 				3 => 'Invalid AMP Pages (URLs)',
 			),
 		);
 
-		$invalid_url_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_url_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array(
 					'code' => 'hello',
@@ -158,7 +158,7 @@ public function test_add_admin_menu_new_invalid_url_count() {
 		);
 		$this->assertNotInstanceOf( 'WP_Error', $invalid_url_post_id );
 
-		AMP_Invalid_URL_Post_Type::add_admin_menu_new_invalid_url_count();
+		AMP_Validated_URL_Post_Type::add_admin_menu_new_invalid_url_count();
 
 		$this->assertContains( '<span class="awaiting-mod"><span class="pending-count">1</span></span>', $submenu[ AMP_Options_Manager::OPTION_NAME ][2][0] );
 	}
@@ -166,16 +166,16 @@ public function test_add_admin_menu_new_invalid_url_count() {
 	/**
 	 * Test get_invalid_url_validation_errors and display_invalid_url_validation_error_counts_summary.
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors()
-	 * @covers \AMP_Invalid_URL_Post_Type::display_invalid_url_validation_error_counts_summary()
-	 * @covers \AMP_Invalid_URL_Post_Type::store_validation_errors()
+	 * @covers \AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors()
+	 * @covers \AMP_Validated_URL_Post_Type::display_invalid_url_validation_error_counts_summary()
+	 * @covers \AMP_Validated_URL_Post_Type::store_validation_errors()
 	 */
 	public function test_get_invalid_url_validation_errors() {
 		AMP_Options_Manager::update_option( 'auto_accept_sanitization', false );
 		add_theme_support( AMP_Theme_Support::SLUG, array( 'paired' => true ) );
 		AMP_Validation_Manager::init();
 		$post = $this->factory()->post->create();
-		$this->assertEmpty( AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( get_permalink( $post ) ) );
+		$this->assertEmpty( AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( get_permalink( $post ) ) );
 
 		add_filter( 'amp_validation_error_sanitized', function( $sanitized, $error ) {
 			if ( 'accepted' === $error['code'] ) {
@@ -186,7 +186,7 @@ public function test_get_invalid_url_validation_errors() {
 			return $sanitized;
 		}, 10, 2 );
 
-		$invalid_url_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_url_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'accepted' ),
 				array( 'code' => 'rejected' ),
@@ -196,7 +196,7 @@ public function test_get_invalid_url_validation_errors() {
 		);
 		$this->assertNotInstanceOf( 'WP_Error', $invalid_url_post_id );
 
-		$errors = AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( get_permalink( $post ) );
+		$errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( get_permalink( $post ) );
 		$this->assertCount( 3, $errors );
 
 		$error = array_shift( $errors );
@@ -209,7 +209,7 @@ public function test_get_invalid_url_validation_errors() {
 		$this->assertEquals( 'new', $error['data']['code'] );
 		$this->assertEquals( AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_NEW_REJECTED_STATUS, $error['term_status'] );
 
-		$errors = AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( get_permalink( $post ), array( 'ignore_accepted' => true ) );
+		$errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( get_permalink( $post ), array( 'ignore_accepted' => true ) );
 		$this->assertCount( 2, $errors );
 		$error = array_shift( $errors );
 		$this->assertEquals( 'rejected', $error['data']['code'] );
@@ -219,7 +219,7 @@ public function test_get_invalid_url_validation_errors() {
 		$this->assertEquals( AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_NEW_REJECTED_STATUS, $error['term_status'] );
 
 		ob_start();
-		AMP_Invalid_URL_Post_Type::display_invalid_url_validation_error_counts_summary( $invalid_url_post_id );
+		AMP_Validated_URL_Post_Type::display_invalid_url_validation_error_counts_summary( $invalid_url_post_id );
 		$summary = ob_get_clean();
 		$this->assertContains( 'New Rejected: 1', $summary );
 		$this->assertContains( 'Accepted: 1', $summary );
@@ -229,15 +229,15 @@ public function test_get_invalid_url_validation_errors() {
 	/**
 	 * Test for get_invalid_url_post().
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::get_invalid_url_post()
+	 * @covers \AMP_Validated_URL_Post_Type::get_invalid_url_post()
 	 */
 	public function test_get_invalid_url_post() {
 		add_theme_support( AMP_Theme_Support::SLUG, array( 'paired' => true ) );
 		AMP_Validation_Manager::init();
 		$post = $this->factory()->post->create_and_get();
-		$this->assertEquals( null, AMP_Invalid_URL_Post_Type::get_invalid_url_post( get_permalink( $post ) ) );
+		$this->assertEquals( null, AMP_Validated_URL_Post_Type::get_invalid_url_post( get_permalink( $post ) ) );
 
-		$invalid_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'foo' ),
 			),
@@ -247,16 +247,16 @@ public function test_get_invalid_url_post() {
 
 		$this->assertEquals(
 			$invalid_post_id,
-			AMP_Invalid_URL_Post_Type::get_invalid_url_post( get_permalink( $post ) )->ID
+			AMP_Validated_URL_Post_Type::get_invalid_url_post( get_permalink( $post ) )->ID
 		);
 
 		// Test trashed.
 		wp_trash_post( $invalid_post_id );
-		$this->assertNull( AMP_Invalid_URL_Post_Type::get_invalid_url_post( get_permalink( $post ) ) );
+		$this->assertNull( AMP_Validated_URL_Post_Type::get_invalid_url_post( get_permalink( $post ) ) );
 		$args = array( 'include_trashed' => true );
 		$this->assertEquals(
 			$invalid_post_id,
-			AMP_Invalid_URL_Post_Type::get_invalid_url_post( get_permalink( $post ), $args )->ID
+			AMP_Validated_URL_Post_Type::get_invalid_url_post( get_permalink( $post ), $args )->ID
 		);
 		wp_untrash_post( $invalid_post_id );
 
@@ -264,29 +264,29 @@ public function test_get_invalid_url_post() {
 		$args = array( 'normalize' => false );
 		$url  = add_query_arg( 'utm_foo', 'bar', get_permalink( $post ) . '#baz' );
 		$url  = set_url_scheme( $url, 'http' );
-		$this->assertNull( AMP_Invalid_URL_Post_Type::get_invalid_url_post( $url, $args ) );
+		$this->assertNull( AMP_Validated_URL_Post_Type::get_invalid_url_post( $url, $args ) );
 		$args = array( 'normalize' => true );
-		$this->assertEquals( $invalid_post_id, AMP_Invalid_URL_Post_Type::get_invalid_url_post( $url, $args )->ID );
-		$this->assertEquals( $invalid_post_id, AMP_Invalid_URL_Post_Type::get_invalid_url_post( $url )->ID );
+		$this->assertEquals( $invalid_post_id, AMP_Validated_URL_Post_Type::get_invalid_url_post( $url, $args )->ID );
+		$this->assertEquals( $invalid_post_id, AMP_Validated_URL_Post_Type::get_invalid_url_post( $url )->ID );
 		$url = set_url_scheme( get_permalink( $post ), 'http' );
-		$this->assertNull( AMP_Invalid_URL_Post_Type::get_invalid_url_post( $url, array( 'normalize' => false ) ) );
-		$this->assertEquals( $invalid_post_id, AMP_Invalid_URL_Post_Type::get_invalid_url_post( $url, array( 'normalize' => true ) )->ID );
+		$this->assertNull( AMP_Validated_URL_Post_Type::get_invalid_url_post( $url, array( 'normalize' => false ) ) );
+		$this->assertEquals( $invalid_post_id, AMP_Validated_URL_Post_Type::get_invalid_url_post( $url, array( 'normalize' => true ) )->ID );
 	}
 
 	/**
 	 * Test get_url_from_post.
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::get_url_from_post()
+	 * @covers \AMP_Validated_URL_Post_Type::get_url_from_post()
 	 */
 	public function test_get_url_from_post() {
 		add_theme_support( AMP_Theme_Support::SLUG, array( 'paired' => true ) );
 		AMP_Validation_Manager::init();
 		$post = $this->factory()->post->create_and_get();
 
-		$this->assertNull( AMP_Invalid_URL_Post_Type::get_url_from_post( 0 ) );
-		$this->assertNull( AMP_Invalid_URL_Post_Type::get_url_from_post( $post ) );
+		$this->assertNull( AMP_Validated_URL_Post_Type::get_url_from_post( 0 ) );
+		$this->assertNull( AMP_Validated_URL_Post_Type::get_url_from_post( $post ) );
 
-		$invalid_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'foo' ),
 			),
@@ -296,26 +296,26 @@ public function test_get_url_from_post() {
 
 		$this->assertEquals(
 			add_query_arg( amp_get_slug(), '', get_permalink( $post ) ),
-			AMP_Invalid_URL_Post_Type::get_url_from_post( $invalid_post_id )
+			AMP_Validated_URL_Post_Type::get_url_from_post( $invalid_post_id )
 		);
 
 		add_theme_support( AMP_Theme_Support::SLUG, array( 'paired' => false ) );
 		$this->assertEquals(
 			get_permalink( $post ),
-			AMP_Invalid_URL_Post_Type::get_url_from_post( $invalid_post_id )
+			AMP_Validated_URL_Post_Type::get_url_from_post( $invalid_post_id )
 		);
 
 		// Check URL scheme.
 		update_option( 'home', home_url( '/', 'http' ) );
-		$this->assertEquals( 'http', wp_parse_url( AMP_Invalid_URL_Post_Type::get_url_from_post( $invalid_post_id ), PHP_URL_SCHEME ) );
+		$this->assertEquals( 'http', wp_parse_url( AMP_Validated_URL_Post_Type::get_url_from_post( $invalid_post_id ), PHP_URL_SCHEME ) );
 		update_option( 'home', home_url( '/', 'https' ) );
-		$this->assertEquals( 'https', wp_parse_url( AMP_Invalid_URL_Post_Type::get_url_from_post( $invalid_post_id ), PHP_URL_SCHEME ) );
+		$this->assertEquals( 'https', wp_parse_url( AMP_Validated_URL_Post_Type::get_url_from_post( $invalid_post_id ), PHP_URL_SCHEME ) );
 	}
 
 	/**
 	 * Test for store_validation_errors()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::store_validation_errors()
+	 * @covers \AMP_Validated_URL_Post_Type::store_validation_errors()
 	 */
 	public function test_store_validation_errors() {
 		global $post;
@@ -364,7 +364,7 @@ public function test_store_validation_errors() {
 			),
 		);
 
-		$invalid_url_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_url_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			$errors,
 			get_permalink( $post ),
 			array(
@@ -378,7 +378,7 @@ public function test_store_validation_errors() {
 		wp_trash_post( $invalid_url_post_id );
 		$this->assertEquals(
 			$invalid_url_post_id,
-			AMP_Invalid_URL_Post_Type::store_validation_errors(
+			AMP_Validated_URL_Post_Type::store_validation_errors(
 				$errors,
 				get_permalink( $post ),
 				array(
@@ -401,7 +401,7 @@ public function test_store_validation_errors() {
 		// Test passing specific post to override the URL.
 		$this->assertEquals(
 			$invalid_url_post_id,
-			AMP_Invalid_URL_Post_Type::store_validation_errors(
+			AMP_Validated_URL_Post_Type::store_validation_errors(
 				$errors,
 				home_url( '/something/else/' ),
 				array(
@@ -415,7 +415,7 @@ public function test_store_validation_errors() {
 			get_post( $invalid_url_post_id )->post_title
 		);
 
-		$stored_errors = AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( $invalid_url_post_id );
+		$stored_errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $invalid_url_post_id );
 		$this->assertEquals(
 			$errors,
 			array_map(
@@ -457,14 +457,14 @@ function( $stored_error ) {
 	/**
 	 * Test get_validated_environment().
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::get_validated_environment()
+	 * @covers \AMP_Validated_URL_Post_Type::get_validated_environment()
 	 */
 	public function test_get_validated_environment() {
 		switch_theme( 'twentysixteen' );
 		update_option( 'active_plugins', array( 'foo/foo.php', 'bar.php' ) );
 		AMP_Options_Manager::update_option( 'accept_tree_shaking', true );
 		AMP_Options_Manager::update_option( 'auto_accept_sanitization', false );
-		$old_env = AMP_Invalid_URL_Post_Type::get_validated_environment();
+		$old_env = AMP_Validated_URL_Post_Type::get_validated_environment();
 		$this->assertArrayHasKey( 'theme', $old_env );
 		$this->assertArrayHasKey( 'plugins', $old_env );
 		$this->assertArrayHasKey( 'options', $old_env );
@@ -475,7 +475,7 @@ public function test_get_validated_environment() {
 		switch_theme( 'twentyseventeen' );
 		update_option( 'active_plugins', array( 'foo/foo.php', 'baz.php' ) );
 		AMP_Options_Manager::update_option( 'accept_tree_shaking', false );
-		$new_env = AMP_Invalid_URL_Post_Type::get_validated_environment();
+		$new_env = AMP_Validated_URL_Post_Type::get_validated_environment();
 		$this->assertNotEquals( $old_env, $new_env );
 		$this->assertFalse( $new_env['options']['accept_tree_shaking'] );
 		$this->assertEquals( 'twentyseventeen', $new_env['theme'] );
@@ -484,20 +484,20 @@ public function test_get_validated_environment() {
 	/**
 	 * Test get_post_staleness method.
 	 *
-	 * @covers AMP_Invalid_URL_Post_Type::get_post_staleness()
-	 * @covers AMP_Invalid_URL_Post_Type::get_validated_environment()
+	 * @covers AMP_Validated_URL_Post_Type::get_post_staleness()
+	 * @covers AMP_Validated_URL_Post_Type::get_validated_environment()
 	 */
 	public function test_get_post_staleness() {
 		$error = array( 'code' => 'foo' );
 		switch_theme( 'twentysixteen' );
 		update_option( 'active_plugins', array( 'foo/foo.php', 'bar.php' ) );
 
-		$invalid_url_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors( array( $error ), home_url( '/' ) );
+		$invalid_url_post_id = AMP_Validated_URL_Post_Type::store_validation_errors( array( $error ), home_url( '/' ) );
 		$this->assertInternalType( 'int', $invalid_url_post_id );
-		$this->assertEmpty( AMP_Invalid_URL_Post_Type::get_post_staleness( $invalid_url_post_id ) );
+		$this->assertEmpty( AMP_Validated_URL_Post_Type::get_post_staleness( $invalid_url_post_id ) );
 
 		update_option( 'active_plugins', array( 'foo/foo.php', 'baz.php' ) );
-		$staleness = AMP_Invalid_URL_Post_Type::get_post_staleness( $invalid_url_post_id );
+		$staleness = AMP_Validated_URL_Post_Type::get_post_staleness( $invalid_url_post_id );
 		$this->assertNotEmpty( $staleness );
 		$this->assertArrayHasKey( 'plugins', $staleness );
 		$this->assertArrayNotHasKey( 'theme', $staleness );
@@ -506,20 +506,20 @@ public function test_get_post_staleness() {
 		$this->assertEqualSets( array( 'bar.php' ), $staleness['plugins']['old'] );
 
 		switch_theme( 'twentyseventeen' );
-		$next_staleness = AMP_Invalid_URL_Post_Type::get_post_staleness( $invalid_url_post_id );
+		$next_staleness = AMP_Validated_URL_Post_Type::get_post_staleness( $invalid_url_post_id );
 		$this->assertArrayHasKey( 'theme', $next_staleness );
 		$this->assertEquals( 'twentysixteen', $next_staleness['theme'] );
 		$this->assertSame( $next_staleness['plugins'], $staleness['plugins'] );
 
 		// Re-storing results updates freshness.
-		AMP_Invalid_URL_Post_Type::store_validation_errors( array( $error ), home_url( '/' ), $invalid_url_post_id );
-		$this->assertEmpty( AMP_Invalid_URL_Post_Type::get_post_staleness( $invalid_url_post_id ) );
+		AMP_Validated_URL_Post_Type::store_validation_errors( array( $error ), home_url( '/' ), $invalid_url_post_id );
+		$this->assertEmpty( AMP_Validated_URL_Post_Type::get_post_staleness( $invalid_url_post_id ) );
 	}
 
 	/**
 	 * Test for add_post_columns()
 	 *
-	 * @covers AMP_Invalid_URL_Post_Type::add_post_columns()
+	 * @covers AMP_Validated_URL_Post_Type::add_post_columns()
 	 */
 	public function test_add_post_columns() {
 		$initial_columns = array(
@@ -534,14 +534,14 @@ public function test_add_post_columns() {
 					AMP_Validation_Error_Taxonomy::SOURCES_INVALID_OUTPUT => 'Sources',
 				)
 			) ),
-			array_keys( AMP_Invalid_URL_Post_Type::add_post_columns( $initial_columns ) )
+			array_keys( AMP_Validated_URL_Post_Type::add_post_columns( $initial_columns ) )
 		);
 	}
 
 	/**
 	 * Test for add_single_post_columns()
 	 *
-	 * @covers AMP_Invalid_URL_Post_Type::add_single_post_columns()
+	 * @covers AMP_Validated_URL_Post_Type::add_single_post_columns()
 	 */
 	public function test_add_single_post_columns() {
 		$this->assertEquals(
@@ -553,7 +553,7 @@ public function test_add_single_post_columns() {
 				'sources_with_invalid_output' => 'Sources',
 				'error_type'                  => 'Error Type',
 			),
-			AMP_Invalid_URL_Post_Type::add_single_post_columns()
+			AMP_Validated_URL_Post_Type::add_single_post_columns()
 		);
 	}
 
@@ -603,7 +603,7 @@ public function get_custom_columns() {
 	 * Test for output_custom_column()
 	 *
 	 * @dataProvider get_custom_columns
-	 * @covers       AMP_Invalid_URL_Post_Type::output_custom_column()
+	 * @covers       AMP_Validated_URL_Post_Type::output_custom_column()
 	 *
 	 * @param string $column_name    The name of the column.
 	 * @param string $expected_value The value that is expected to be present in the column markup.
@@ -611,17 +611,17 @@ public function get_custom_columns() {
 	 */
 	public function test_output_custom_column( $column_name, $expected_value, $errors ) {
 		AMP_Validation_Manager::init();
-		$invalid_url_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors( $errors, home_url( '/' ) );
+		$invalid_url_post_id = AMP_Validated_URL_Post_Type::store_validation_errors( $errors, home_url( '/' ) );
 
 		ob_start();
-		AMP_Invalid_URL_Post_Type::output_custom_column( $column_name, $invalid_url_post_id );
+		AMP_Validated_URL_Post_Type::output_custom_column( $column_name, $invalid_url_post_id );
 		$this->assertContains( $expected_value, ob_get_clean() );
 	}
 
 	/**
 	 * Test for filter_bulk_actions()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::filter_bulk_actions()
+	 * @covers \AMP_Validated_URL_Post_Type::filter_bulk_actions()
 	 */
 	public function test_filter_bulk_actions() {
 		$initial_action = array(
@@ -629,9 +629,9 @@ public function test_filter_bulk_actions() {
 			'trash'  => 'Trash',
 			'delete' => 'Delete',
 		);
-		$actions        = AMP_Invalid_URL_Post_Type::filter_bulk_actions( $initial_action );
+		$actions        = AMP_Validated_URL_Post_Type::filter_bulk_actions( $initial_action );
 		$this->assertFalse( isset( $action['edit'] ) );
-		$this->assertEquals( 'Recheck', $actions[ AMP_Invalid_URL_Post_Type::BULK_VALIDATE_ACTION ] );
+		$this->assertEquals( 'Recheck', $actions[ AMP_Validated_URL_Post_Type::BULK_VALIDATE_ACTION ] );
 		$this->assertArrayNotHasKey( 'trash', $actions );
 		$this->assertEquals( 'Forget', $actions['delete'] );
 	}
@@ -639,7 +639,7 @@ public function test_filter_bulk_actions() {
 	/**
 	 * Test for handle_bulk_action()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::handle_bulk_action()
+	 * @covers \AMP_Validated_URL_Post_Type::handle_bulk_action()
 	 */
 	public function test_handle_bulk_action() {
 		AMP_Options_Manager::update_option( 'auto_accept_sanitization', false );
@@ -647,7 +647,7 @@ public function test_handle_bulk_action() {
 		add_theme_support( AMP_Theme_Support::SLUG, array( 'paired' => true ) );
 		AMP_Validation_Manager::init();
 
-		$invalid_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'foo' ),
 			),
@@ -658,10 +658,10 @@ public function test_handle_bulk_action() {
 		$items            = array( $invalid_post_id );
 		$urls_tested      = (string) count( $items );
 
-		$_GET[ AMP_Invalid_URL_Post_Type::URLS_TESTED ] = $urls_tested;
+		$_GET[ AMP_Validated_URL_Post_Type::URLS_TESTED ] = $urls_tested;
 
 		// The action isn't correct, so the callback should return the URL unchanged.
-		$this->assertEquals( $initial_redirect, AMP_Invalid_URL_Post_Type::handle_bulk_action( $initial_redirect, 'trash', $items ) );
+		$this->assertEquals( $initial_redirect, AMP_Validated_URL_Post_Type::handle_bulk_action( $initial_redirect, 'trash', $items ) );
 
 		$that   = $this;
 		$filter = function() use ( $that ) {
@@ -686,12 +686,12 @@ function( $error ) {
 		$this->assertEquals(
 			add_query_arg(
 				array(
-					AMP_Invalid_URL_Post_Type::URLS_TESTED => $urls_tested,
-					AMP_Invalid_URL_Post_Type::REMAINING_ERRORS => count( $items ),
+					AMP_Validated_URL_Post_Type::URLS_TESTED      => $urls_tested,
+					AMP_Validated_URL_Post_Type::REMAINING_ERRORS => count( $items ),
 				),
 				$initial_redirect
 			),
-			AMP_Invalid_URL_Post_Type::handle_bulk_action( $initial_redirect, AMP_Invalid_URL_Post_Type::BULK_VALIDATE_ACTION, $items )
+			AMP_Validated_URL_Post_Type::handle_bulk_action( $initial_redirect, AMP_Validated_URL_Post_Type::BULK_VALIDATE_ACTION, $items )
 		);
 		remove_filter( 'pre_http_request', $filter, 10 );
 
@@ -704,60 +704,60 @@ function( $error ) {
 		$this->assertEquals(
 			add_query_arg(
 				array(
-					AMP_Invalid_URL_Post_Type::URLS_TESTED => $urls_tested,
-					'amp_validate_error'                   => array( 'response_comment_absent' ),
+					AMP_Validated_URL_Post_Type::URLS_TESTED => $urls_tested,
+					'amp_validate_error' => array( 'response_comment_absent' ),
 				),
 				$initial_redirect
 			),
-			AMP_Invalid_URL_Post_Type::handle_bulk_action( $initial_redirect, AMP_Invalid_URL_Post_Type::BULK_VALIDATE_ACTION, $items )
+			AMP_Validated_URL_Post_Type::handle_bulk_action( $initial_redirect, AMP_Validated_URL_Post_Type::BULK_VALIDATE_ACTION, $items )
 		);
 	}
 
 	/**
 	 * Test for print_admin_notice()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::print_admin_notice()
+	 * @covers \AMP_Validated_URL_Post_Type::print_admin_notice()
 	 */
 	public function test_print_admin_notice() {
 		add_theme_support( AMP_Theme_Support::SLUG );
 		AMP_Validation_Manager::init();
 
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_admin_notice();
+		AMP_Validated_URL_Post_Type::print_admin_notice();
 		$this->assertEmpty( ob_get_clean() );
 
 		$_GET['post_type'] = 'post';
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_admin_notice();
+		AMP_Validated_URL_Post_Type::print_admin_notice();
 		$this->assertEmpty( ob_get_clean() );
 
 		set_current_screen( 'edit.php' );
-		get_current_screen()->post_type = AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG;
+		get_current_screen()->post_type = AMP_Validated_URL_Post_Type::POST_TYPE_SLUG;
 
-		$_GET[ AMP_Invalid_URL_Post_Type::REMAINING_ERRORS ] = '1';
-		$_GET[ AMP_Invalid_URL_Post_Type::URLS_TESTED ]      = '1';
+		$_GET[ AMP_Validated_URL_Post_Type::REMAINING_ERRORS ] = '1';
+		$_GET[ AMP_Validated_URL_Post_Type::URLS_TESTED ]      = '1';
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_admin_notice();
+		AMP_Validated_URL_Post_Type::print_admin_notice();
 		$this->assertContains( 'The rechecked URL still has unaccepted validation errors', ob_get_clean() );
 
-		$_GET[ AMP_Invalid_URL_Post_Type::URLS_TESTED ] = '2';
+		$_GET[ AMP_Validated_URL_Post_Type::URLS_TESTED ] = '2';
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_admin_notice();
+		AMP_Validated_URL_Post_Type::print_admin_notice();
 		$this->assertContains( 'The rechecked URLs still have unaccepted validation errors', ob_get_clean() );
 
-		$_GET[ AMP_Invalid_URL_Post_Type::REMAINING_ERRORS ] = '0';
+		$_GET[ AMP_Validated_URL_Post_Type::REMAINING_ERRORS ] = '0';
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_admin_notice();
+		AMP_Validated_URL_Post_Type::print_admin_notice();
 		$this->assertContains( 'The rechecked URLs are free of unaccepted validation errors', ob_get_clean() );
 
-		$_GET[ AMP_Invalid_URL_Post_Type::URLS_TESTED ] = '1';
+		$_GET[ AMP_Validated_URL_Post_Type::URLS_TESTED ] = '1';
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_admin_notice();
+		AMP_Validated_URL_Post_Type::print_admin_notice();
 		$this->assertContains( 'The rechecked URL is free of unaccepted validation errors', ob_get_clean() );
 
 		$_GET['amp_validate_error'] = array( 'http_request_failed' );
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_admin_notice();
+		AMP_Validated_URL_Post_Type::print_admin_notice();
 		$this->assertContains( 'Failed to fetch URL(s) to validate', ob_get_clean() );
 
 		unset( $GLOBALS['current_screen'] );
@@ -766,7 +766,7 @@ public function test_print_admin_notice() {
 	/**
 	 * Test for handle_validate_request()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::handle_validate_request()
+	 * @covers \AMP_Validated_URL_Post_Type::handle_validate_request()
 	 */
 	public function test_handle_validate_request() {
 		AMP_Options_Manager::update_option( 'auto_accept_sanitization', false );
@@ -774,14 +774,14 @@ public function test_handle_validate_request() {
 		wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
 		AMP_Validation_Manager::init();
 
-		$post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'foo' ),
 			),
 			home_url( '/' )
 		);
 
-		$_REQUEST['_wpnonce'] = wp_create_nonce( AMP_Invalid_URL_Post_Type::NONCE_ACTION );
+		$_REQUEST['_wpnonce'] = wp_create_nonce( AMP_Validated_URL_Post_Type::NONCE_ACTION );
 
 		$exception = null;
 		add_filter( 'wp_redirect', function( $url, $status ) {
@@ -811,7 +811,7 @@ function( $error ) {
 
 		$handle_validate_request = function() {
 			try {
-				AMP_Invalid_URL_Post_Type::handle_validate_request();
+				AMP_Validated_URL_Post_Type::handle_validate_request();
 			} catch ( Exception $exception ) {
 				return $exception;
 			}
@@ -823,7 +823,7 @@ function( $error ) {
 		$this->assertInstanceOf( 'Exception', $exception );
 		$this->assertEquals( 302, $exception->getCode() );
 		$this->assertStringEndsWith(
-			'/edit.php?post_type=amp_invalid_url&amp_validate_error=missing_url&amp_urls_tested=0',
+			'/edit.php?post_type=amp_validated_url&amp_validate_error=missing_url&amp_urls_tested=0',
 			$exception->getMessage()
 		);
 		unset( $_GET['post'] );
@@ -834,7 +834,7 @@ function( $error ) {
 		$this->assertInstanceOf( 'Exception', $exception );
 		$this->assertEquals( 302, $exception->getCode() );
 		$this->assertStringEndsWith(
-			'/edit.php?post_type=amp_invalid_url&amp_validate_error=invalid_post&amp_urls_tested=0',
+			'/edit.php?post_type=amp_validated_url&amp_validate_error=invalid_post&amp_urls_tested=0',
 			$exception->getMessage()
 		);
 		unset( $_GET['post'] );
@@ -845,7 +845,7 @@ function( $error ) {
 		$this->assertInstanceOf( 'Exception', $exception );
 		$this->assertEquals( 302, $exception->getCode() );
 		$this->assertStringEndsWith(
-			'/edit.php?post_type=amp_invalid_url&amp_validate_error=invalid_post&amp_urls_tested=0',
+			'/edit.php?post_type=amp_validated_url&amp_validate_error=invalid_post&amp_urls_tested=0',
 			$exception->getMessage()
 		);
 		unset( $_GET['post'] );
@@ -887,7 +887,7 @@ function( $error ) {
 		$this->assertInstanceOf( 'Exception', $exception );
 		$this->assertEquals( 302, $exception->getCode() );
 		$this->assertStringEndsWith(
-			'wp-admin/edit.php?post_type=amp_invalid_url&amp_validate_error=illegal_url&amp_urls_tested=0',
+			'wp-admin/edit.php?post_type=amp_validated_url&amp_validate_error=illegal_url&amp_urls_tested=0',
 			$exception->getMessage()
 		);
 	}
@@ -895,20 +895,20 @@ function( $error ) {
 	/**
 	 * Test for recheck_post()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::recheck_post()
+	 * @covers \AMP_Validated_URL_Post_Type::recheck_post()
 	 */
 	public function test_recheck_post() {
 		AMP_Validation_Manager::init();
 
-		$r = AMP_Invalid_URL_Post_Type::recheck_post( 'nope' );
+		$r = AMP_Validated_URL_Post_Type::recheck_post( 'nope' );
 		$this->assertInstanceOf( 'WP_Error', $r );
 		$this->assertEquals( 'missing_post', $r->get_error_code() );
 
-		$r = AMP_Invalid_URL_Post_Type::recheck_post( $this->factory()->post->create() );
+		$r = AMP_Validated_URL_Post_Type::recheck_post( $this->factory()->post->create() );
 		$this->assertInstanceOf( 'WP_Error', $r );
 		$this->assertEquals( 'missing_url', $r->get_error_code() );
 
-		$invalid_url_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_url_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'foo' ),
 			),
@@ -938,13 +938,13 @@ public function test_recheck_post() {
 			);
 		} );
 
-		$r = AMP_Invalid_URL_Post_Type::recheck_post( $invalid_url_post_id );
+		$r = AMP_Validated_URL_Post_Type::recheck_post( $invalid_url_post_id );
 		$this->assertInternalType( 'array', $r );
 		$this->assertCount( 2, $r );
 		$this->assertEquals( 'bar', $r[0]['error']['code'] );
 		$this->assertEquals( 'baz', $r[1]['error']['code'] );
 
-		$errors = AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( $invalid_url_post_id );
+		$errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $invalid_url_post_id );
 		$this->assertCount( 2, $errors );
 		foreach ( $errors as $i => $error ) {
 			$this->assertEquals(
@@ -957,19 +957,19 @@ public function test_recheck_post() {
 	/**
 	 * Test for handle_validation_error_status_update()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::handle_validation_error_status_update()
+	 * @covers \AMP_Validated_URL_Post_Type::handle_validation_error_status_update()
 	 */
 	public function test_handle_validation_error_status_update() {
 		global $post;
 		AMP_Validation_Manager::init();
 
 		wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
-		$_REQUEST[ AMP_Invalid_URL_Post_Type::UPDATE_POST_TERM_STATUS_ACTION . '_nonce' ] = wp_create_nonce( AMP_Invalid_URL_Post_Type::UPDATE_POST_TERM_STATUS_ACTION );
-		AMP_Invalid_URL_Post_Type::handle_validation_error_status_update(); // No-op since no post.
+		$_REQUEST[ AMP_Validated_URL_Post_Type::UPDATE_POST_TERM_STATUS_ACTION . '_nonce' ] = wp_create_nonce( AMP_Validated_URL_Post_Type::UPDATE_POST_TERM_STATUS_ACTION );
+		AMP_Validated_URL_Post_Type::handle_validation_error_status_update(); // No-op since no post.
 
 		$error = array( 'code' => 'foo' );
 
-		$invalid_url_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_url_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array( $error ),
 			home_url( '/' )
 		);
@@ -991,7 +991,7 @@ public function test_handle_validation_error_status_update() {
 
 		$post = get_post( $invalid_url_post_id ); // WPCS: override ok.
 
-		$errors = AMP_Invalid_URL_Post_Type::get_invalid_url_validation_errors( $invalid_url_post_id );
+		$errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $invalid_url_post_id );
 
 		$_POST[ AMP_Validation_Manager::VALIDATION_ERROR_TERM_STATUS_QUERY_VAR ] = array(
 			$errors[0]['term']->slug => AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACK_ACCEPTED_STATUS,
@@ -1002,7 +1002,7 @@ public function test_handle_validation_error_status_update() {
 		}, 10, 2 );
 		$exception = null;
 		try {
-			AMP_Invalid_URL_Post_Type::handle_validation_error_status_update();
+			AMP_Validated_URL_Post_Type::handle_validation_error_status_update();
 		} catch ( Exception $e ) {
 			$exception = $e;
 		}
@@ -1014,41 +1014,41 @@ public function test_handle_validation_error_status_update() {
 	/**
 	 * Test for enqueue_edit_post_screen_scripts()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::enqueue_edit_post_screen_scripts()
+	 * @covers \AMP_Validated_URL_Post_Type::enqueue_edit_post_screen_scripts()
 	 */
 	public function test_enqueue_edit_post_screen_scripts() {
 		wp_enqueue_script( 'autosave' );
 		set_current_screen( 'index.php' );
-		AMP_Invalid_URL_Post_Type::enqueue_edit_post_screen_scripts();
+		AMP_Validated_URL_Post_Type::enqueue_edit_post_screen_scripts();
 		$this->assertTrue( wp_script_is( 'autosave', 'enqueued' ) );
-		$this->assertFalse( wp_script_is( 'amp-invalid-url-post-edit-screen', 'enqueued' ) );
+		$this->assertFalse( wp_script_is( 'amp-validated-url-post-edit-screen', 'enqueued' ) );
 
 		global $pagenow;
 		$pagenow = 'post.php';
-		set_current_screen( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG );
-		AMP_Invalid_URL_Post_Type::enqueue_edit_post_screen_scripts();
+		set_current_screen( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG );
+		AMP_Validated_URL_Post_Type::enqueue_edit_post_screen_scripts();
 		$this->assertFalse( wp_script_is( 'autosave', 'enqueued' ) );
-		$this->assertTrue( wp_script_is( 'amp-invalid-url-post-edit-screen', 'enqueued' ) );
+		$this->assertTrue( wp_script_is( 'amp-validated-url-post-edit-screen', 'enqueued' ) );
 		$pagenow = null;
 	}
 
 	/**
 	 * Test render_link_to_error_index_screen.
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::render_link_to_error_index_screen()
+	 * @covers \AMP_Validated_URL_Post_Type::render_link_to_error_index_screen()
 	 */
 	public function test_render_link_to_error_index_screen() {
 		wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
 		global $current_screen;
 		set_current_screen( 'index.php' );
 		ob_start();
-		AMP_Invalid_URL_Post_Type::render_link_to_error_index_screen();
+		AMP_Validated_URL_Post_Type::render_link_to_error_index_screen();
 		$this->assertEmpty( ob_get_clean() );
 
 		set_current_screen( 'edit.php' );
-		$current_screen->post_type = AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG;
+		$current_screen->post_type = AMP_Validated_URL_Post_Type::POST_TYPE_SLUG;
 		ob_start();
-		AMP_Invalid_URL_Post_Type::render_link_to_error_index_screen();
+		AMP_Validated_URL_Post_Type::render_link_to_error_index_screen();
 		$output = ob_get_clean();
 		$this->assertContains( 'View Error Index', $output );
 	}
@@ -1056,31 +1056,31 @@ public function test_render_link_to_error_index_screen() {
 	/**
 	 * Test for add_edit_post_inline_script()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::add_edit_post_inline_script()
+	 * @covers \AMP_Validated_URL_Post_Type::add_edit_post_inline_script()
 	 */
 	public function test_add_edit_post_inline_script() {
 		global $pagenow, $post;
 
-		$pagenow              = 'post.php';
-		$amp_invalid_url_post = $this->factory()->post->create_and_get( array( 'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
-		$test_post            = $this->factory()->post->create_and_get();
+		$pagenow                = 'post.php';
+		$amp_validated_url_post = $this->factory()->post->create_and_get( array( 'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
+		$test_post              = $this->factory()->post->create_and_get();
 
-		$post         = $amp_invalid_url_post;
-		$_GET['post'] = $amp_invalid_url_post->ID;
-		set_current_screen( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG );
-		AMP_Invalid_URL_Post_Type::enqueue_edit_post_screen_scripts();
-		AMP_Invalid_URL_Post_Type::add_edit_post_inline_script();
+		$post         = $amp_validated_url_post;
+		$_GET['post'] = $amp_validated_url_post->ID;
+		set_current_screen( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG );
+		AMP_Validated_URL_Post_Type::enqueue_edit_post_screen_scripts();
+		AMP_Validated_URL_Post_Type::add_edit_post_inline_script();
 
-		$after_script  = wp_scripts()->registered[ AMP_Invalid_URL_Post_Type::EDIT_POST_SCRIPT_HANDLE ]->extra['after'];
+		$after_script  = wp_scripts()->registered[ AMP_Validated_URL_Post_Type::EDIT_POST_SCRIPT_HANDLE ]->extra['after'];
 		$inline_script = end( $after_script );
 		$this->assertContains( 'document.addEventListener(', $inline_script );
 		$this->assertContains( 'You have unsaved changes. Are you sure you want to leave?', $inline_script );
 
 		// Now that the total errors are set, they should appear in the inline script.
-		$total_errors                                    = 22;
-		AMP_Invalid_URL_Post_Type::$total_errors_for_url = $total_errors;
-		AMP_Invalid_URL_Post_Type::add_edit_post_inline_script();
-		$after_script  = wp_scripts()->registered[ AMP_Invalid_URL_Post_Type::EDIT_POST_SCRIPT_HANDLE ]->extra['after'];
+		$total_errors                                      = 22;
+		AMP_Validated_URL_Post_Type::$total_errors_for_url = $total_errors;
+		AMP_Validated_URL_Post_Type::add_edit_post_inline_script();
+		$after_script  = wp_scripts()->registered[ AMP_Validated_URL_Post_Type::EDIT_POST_SCRIPT_HANDLE ]->extra['after'];
 		$inline_script = end( $after_script );
 		$this->assertContains( 'showing_number_errors', $inline_script );
 		$this->assertContains( strval( $total_errors ), $inline_script );
@@ -1088,15 +1088,15 @@ public function test_add_edit_post_inline_script() {
 		// The 'page_heading' value should be present in the inline script.
 		$_GET['action'] = 'edit';
 		update_post_meta(
-			$amp_invalid_url_post->ID,
+			$amp_validated_url_post->ID,
 			'_amp_queried_object',
 			array(
 				'type' => 'post',
 				'id'   => $test_post->ID,
 			)
 		);
-		AMP_Invalid_URL_Post_Type::add_edit_post_inline_script();
-		$after_script  = wp_scripts()->registered[ AMP_Invalid_URL_Post_Type::EDIT_POST_SCRIPT_HANDLE ]->extra['after'];
+		AMP_Validated_URL_Post_Type::add_edit_post_inline_script();
+		$after_script  = wp_scripts()->registered[ AMP_Validated_URL_Post_Type::EDIT_POST_SCRIPT_HANDLE ]->extra['after'];
 		$inline_script = end( $after_script );
 		$this->assertContains(
 			sprintf( 'Errors for: %s', $test_post->post_title ),
@@ -1108,13 +1108,13 @@ public function test_add_edit_post_inline_script() {
 	/**
 	 * Test for add_meta_boxes()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::add_meta_boxes()
+	 * @covers \AMP_Validated_URL_Post_Type::add_meta_boxes()
 	 */
 	public function test_add_meta_boxes() {
 		global $wp_meta_boxes;
-		AMP_Invalid_URL_Post_Type::add_meta_boxes();
-		$side_meta_box = $wp_meta_boxes[ AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ]['side']['default'][ AMP_Invalid_URL_Post_Type::STATUS_META_BOX ];
-		$this->assertEquals( AMP_Invalid_URL_Post_Type::STATUS_META_BOX, $side_meta_box['id'] );
+		AMP_Validated_URL_Post_Type::add_meta_boxes();
+		$side_meta_box = $wp_meta_boxes[ AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ]['side']['default'][ AMP_Validated_URL_Post_Type::STATUS_META_BOX ];
+		$this->assertEquals( AMP_Validated_URL_Post_Type::STATUS_META_BOX, $side_meta_box['id'] );
 		$this->assertEquals( 'Status', $side_meta_box['title'] );
 		$this->assertEquals(
 			array(
@@ -1124,7 +1124,7 @@ public function test_add_meta_boxes() {
 			$side_meta_box['callback']
 		);
 
-		$contexts = $wp_meta_boxes[ AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ]['side'];
+		$contexts = $wp_meta_boxes[ AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ]['side'];
 		foreach ( $contexts as $context ) {
 			$this->assertFalse( $context['submitdiv'] );
 		}
@@ -1133,7 +1133,7 @@ public function test_add_meta_boxes() {
 	/**
 	 * Test for get_terms_per_page()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::get_terms_per_page()
+	 * @covers \AMP_Validated_URL_Post_Type::get_terms_per_page()
 	 */
 	public function test_get_terms_per_page() {
 		$initial_counts = array( 0, 22, 1000 );
@@ -1143,7 +1143,7 @@ public function test_get_terms_per_page() {
 		foreach ( $initial_counts as $initial_count ) {
 			$this->assertEquals(
 				PHP_INT_MAX,
-				AMP_Invalid_URL_Post_Type::get_terms_per_page( $initial_count )
+				AMP_Validated_URL_Post_Type::get_terms_per_page( $initial_count )
 			);
 		}
 
@@ -1152,7 +1152,7 @@ public function test_get_terms_per_page() {
 		foreach ( $initial_counts as $initial_count ) {
 			$this->assertEquals(
 				$initial_count,
-				AMP_Invalid_URL_Post_Type::get_terms_per_page( $initial_count )
+				AMP_Validated_URL_Post_Type::get_terms_per_page( $initial_count )
 			);
 		}
 	}
@@ -1160,42 +1160,42 @@ public function test_get_terms_per_page() {
 	/**
 	 * Test for add_taxonomy()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::add_taxonomy()
+	 * @covers \AMP_Validated_URL_Post_Type::add_taxonomy()
 	 */
 	public function test_add_taxonomy() {
 		// The 'pagenow' value is incorrect, so this should not add the taxonomy.
 		$GLOBALS['pagenow'] = 'edit.php';
-		AMP_Invalid_URL_Post_Type::add_taxonomy();
+		AMP_Validated_URL_Post_Type::add_taxonomy();
 		$this->assertFalse( isset( $_REQUEST['taxonomy'] ) ); // WPCS: CSRF OK.
 
 		// Though the 'pagenow' value is correct, the $_REQUEST['post'] is not set, and this should not add the taxonomy.
 		$GLOBALS['pagenow'] = 'post.php';
-		AMP_Invalid_URL_Post_Type::add_taxonomy();
+		AMP_Validated_URL_Post_Type::add_taxonomy();
 		$this->assertFalse( isset( $_REQUEST['taxonomy'] ) ); // WPCS: CSRF OK.
 
 		// Though the $_REQUEST['post'] is set, it is for a post of the wrong type.
 		$wrong_post_type  = $this->factory()->post->create();
 		$_REQUEST['post'] = $wrong_post_type;
-		AMP_Invalid_URL_Post_Type::add_taxonomy();
+		AMP_Validated_URL_Post_Type::add_taxonomy();
 		$this->assertFalse( isset( $_REQUEST['taxonomy'] ) ); // WPCS: CSRF OK.
 
 		// Now that the post type is correct, this should add the taxonomy to $_REQUEST.
-		$correct_post_type = $this->factory()->post->create( array( 'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+		$correct_post_type = $this->factory()->post->create( array( 'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 		$_REQUEST['post']  = $correct_post_type;
-		AMP_Invalid_URL_Post_Type::add_taxonomy();
+		AMP_Validated_URL_Post_Type::add_taxonomy();
 		$this->assertEquals( AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG, $_REQUEST['taxonomy'] ); // WPCS: CSRF OK.
 	}
 
 	/**
 	 * Test for print_status_meta_box()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::print_status_meta_box()
+	 * @covers \AMP_Validated_URL_Post_Type::print_status_meta_box()
 	 */
 	public function test_print_status_meta_box() {
 		AMP_Validation_Manager::init();
 		wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
 
-		$invalid_url_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_url_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'foo' ),
 			),
@@ -1205,7 +1205,7 @@ public function test_print_status_meta_box() {
 		$post_storing_error = get_post( $invalid_url_post_id );
 
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_status_meta_box( get_post( $invalid_url_post_id ) );
+		AMP_Validated_URL_Post_Type::print_status_meta_box( get_post( $invalid_url_post_id ) );
 		$output = ob_get_clean();
 
 		$this->assertContains( date_i18n( 'M j, Y @ H:i', strtotime( $post_storing_error->post_date ) ), $output );
@@ -1218,11 +1218,11 @@ public function test_print_status_meta_box() {
 	/**
 	 * Test for render_single_url_list_table()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::render_single_url_list_table()
+	 * @covers \AMP_Validated_URL_Post_Type::render_single_url_list_table()
 	 */
 	public function test_render_single_url_list_table() {
 		AMP_Validation_Error_Taxonomy::register();
-		$post_correct_post_type = $this->factory()->post->create_and_get( array( 'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+		$post_correct_post_type = $this->factory()->post->create_and_get( array( 'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 		$post_wrong_post_type   = $this->factory()->post->create_and_get( array( 'post_type' => 'page' ) );
 		$GLOBALS['hook_suffix'] = 'post.php'; // WPCS: Global override OK.
 		$this->go_to( admin_url( 'post.php' ) );
@@ -1231,12 +1231,12 @@ public function test_render_single_url_list_table() {
 
 		// If the post type is wrong, so the conditional should be false, and this should not echo anything.
 		ob_start();
-		AMP_Invalid_URL_Post_Type::render_single_url_list_table( $post_wrong_post_type );
+		AMP_Validated_URL_Post_Type::render_single_url_list_table( $post_wrong_post_type );
 		$this->assertEmpty( ob_get_clean() );
 
 		// Now that the current user has permissions, this should output the correct markup.
 		ob_start();
-		AMP_Invalid_URL_Post_Type::render_single_url_list_table( $post_correct_post_type );
+		AMP_Validated_URL_Post_Type::render_single_url_list_table( $post_correct_post_type );
 		$output = ob_get_clean();
 		$this->assertContains( '<form class="search-form wp-clearfix" method="get">', $output );
 		$this->assertContains( '<div id="accept-reject-buttons" class="hidden">', $output );
@@ -1247,40 +1247,40 @@ public function test_render_single_url_list_table() {
 	/**
 	 * Test for print_url_as_title()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::print_url_as_title()
+	 * @covers \AMP_Validated_URL_Post_Type::print_url_as_title()
 	 */
 	public function test_print_url_as_title() {
 		$post_wrong_post_type = $this->factory()->post->create_and_get();
 
 		// The $post has the wrong post type, so the method should exit without echoing anything.
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_url_as_title( $post_wrong_post_type );
+		AMP_Validated_URL_Post_Type::print_url_as_title( $post_wrong_post_type );
 		$this->assertEmpty( ob_get_clean() );
 
 		// The post type is correct, but it doesn't have a validation URL associated with it, so this shouldn't output anything.
 		$post_correct_post_type = $this->factory()->post->create_and_get( array(
-			'post-type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'post-type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 		) );
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_url_as_title( $post_correct_post_type );
+		AMP_Validated_URL_Post_Type::print_url_as_title( $post_correct_post_type );
 		$this->assertEmpty( ob_get_clean() );
 
 		// The post has the correct type and a validation URL in the title, so this should output markup.
 		$post_correct_post_type = $this->factory()->post->create_and_get( array(
-			'post_type'  => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'post_type'  => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 			'post_title' => home_url(),
 		) );
 		ob_start();
-		AMP_Invalid_URL_Post_Type::print_url_as_title( $post_correct_post_type );
+		AMP_Validated_URL_Post_Type::print_url_as_title( $post_correct_post_type );
 		$output = ob_get_clean();
-		$this->assertContains( '<h2 class="amp-invalid-url">', $output );
+		$this->assertContains( '<h2 class="amp-validated-url">', $output );
 		$this->assertContains( home_url(), $output );
 	}
 
 	/**
 	 * Test for filter_the_title_in_post_list_table()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::filter_the_title_in_post_list_table()
+	 * @covers \AMP_Validated_URL_Post_Type::filter_the_title_in_post_list_table()
 	 */
 	public function test_filter_the_title_in_post_list_table() {
 		global $current_screen;
@@ -1289,21 +1289,21 @@ public function test_filter_the_title_in_post_list_table() {
 		set_current_screen( 'front' );
 
 		// The first conditional isn't true yet, so $title should be unchanged.
-		$this->assertEquals( $title, AMP_Invalid_URL_Post_Type::filter_the_title_in_post_list_table( $title, $post ) );
+		$this->assertEquals( $title, AMP_Validated_URL_Post_Type::filter_the_title_in_post_list_table( $title, $post ) );
 
 		/*
 		 * The first conditional still isn't true yet, as the $post->post_type isn't correct.
 		 * So this should again return $ttile unchanged.
 		 */
 		set_current_screen( 'edit.php' );
-		$current_screen->post_type = AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG;
-		$this->assertEquals( $title, AMP_Invalid_URL_Post_Type::filter_the_title_in_post_list_table( $title, $post ) );
+		$current_screen->post_type = AMP_Validated_URL_Post_Type::POST_TYPE_SLUG;
+		$this->assertEquals( $title, AMP_Validated_URL_Post_Type::filter_the_title_in_post_list_table( $title, $post ) );
 
 		// The conditional should be true, and this should return the filtered $title.
 		$post_correct_post_type = $this->factory()->post->create_and_get( array(
-			'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 		) );
-		$this->assertEquals( '/baz', AMP_Invalid_URL_Post_Type::filter_the_title_in_post_list_table( $title, $post_correct_post_type ) );
+		$this->assertEquals( '/baz', AMP_Validated_URL_Post_Type::filter_the_title_in_post_list_table( $title, $post_correct_post_type ) );
 	}
 
 	/**
@@ -1313,7 +1313,7 @@ public function test_filter_the_title_in_post_list_table() {
 	 */
 	public function test_render_post_filters() {
 		set_current_screen( 'edit.php' );
-		AMP_Invalid_URL_Post_Type::register();
+		AMP_Validated_URL_Post_Type::register();
 		AMP_Validation_Error_Taxonomy::register();
 
 		$number_of_new_errors = 20;
@@ -1321,7 +1321,7 @@ public function test_render_post_filters() {
 		$number_of_accepted   = 5;
 
 		for ( $i = 0; $i < 40; $i++ ) {
-			$invalid_url_post      = $this->factory()->post->create( array( 'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+			$invalid_url_post      = $this->factory()->post->create( array( 'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 			$validation_error_term = $this->factory()->term->create( array(
 				'taxonomy'    => AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG,
 				'description' => wp_json_encode( array( 'code' => 'test' ), compact( 'i' ) ),
@@ -1348,24 +1348,24 @@ public function test_render_post_filters() {
 
 		}
 
-		$correct_post_type             = AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG;
+		$correct_post_type             = AMP_Validated_URL_Post_Type::POST_TYPE_SLUG;
 		$wrong_post_type               = 'page';
 		$correct_which_second_argument = 'top';
 		$wrong_which_second_argument   = 'bottom';
 
 		// This has an incorrect post type as the first argument, so it should not output anything.
 		ob_start();
-		AMP_Invalid_URL_Post_Type::render_post_filters( $wrong_post_type, $correct_which_second_argument );
+		AMP_Validated_URL_Post_Type::render_post_filters( $wrong_post_type, $correct_which_second_argument );
 		$this->assertEmpty( ob_get_clean() );
 
 		// This has an incorrect second argument, so again it should not output anything.
 		ob_start();
-		AMP_Invalid_URL_Post_Type::render_post_filters( $correct_post_type, $wrong_which_second_argument );
+		AMP_Validated_URL_Post_Type::render_post_filters( $correct_post_type, $wrong_which_second_argument );
 		$this->assertEmpty( ob_get_clean() );
 
 		// This is now on the invalid URL post type edit.php screen, so it should output a <select> element.
 		ob_start();
-		AMP_Invalid_URL_Post_Type::render_post_filters( $correct_post_type, $correct_which_second_argument );
+		AMP_Validated_URL_Post_Type::render_post_filters( $correct_post_type, $correct_which_second_argument );
 		$output = ob_get_clean();
 		$this->assertContains(
 			sprintf( 'With New Errors <span class="count">(%d)</span>', $number_of_new_errors ),
@@ -1384,30 +1384,30 @@ public function test_render_post_filters() {
 	/**
 	 * Test for get_recheck_url()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::get_recheck_url()
+	 * @covers \AMP_Validated_URL_Post_Type::get_recheck_url()
 	 */
 	public function test_get_recheck_url() {
 		AMP_Validation_Manager::init();
 		wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
-		$post_id = AMP_Invalid_URL_Post_Type::store_validation_errors( $this->get_mock_errors(), home_url( '/' ) );
-		$link    = AMP_Invalid_URL_Post_Type::get_recheck_url( get_post( $post_id ) );
-		$this->assertContains( AMP_Invalid_URL_Post_Type::VALIDATE_ACTION, $link );
-		$this->assertContains( wp_create_nonce( AMP_Invalid_URL_Post_Type::NONCE_ACTION ), $link );
+		$post_id = AMP_Validated_URL_Post_Type::store_validation_errors( $this->get_mock_errors(), home_url( '/' ) );
+		$link    = AMP_Validated_URL_Post_Type::get_recheck_url( get_post( $post_id ) );
+		$this->assertContains( AMP_Validated_URL_Post_Type::VALIDATE_ACTION, $link );
+		$this->assertContains( wp_create_nonce( AMP_Validated_URL_Post_Type::NONCE_ACTION ), $link );
 	}
 
 	/**
 	 * Test for filter_dashboard_glance_items()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::filter_dashboard_glance_items()
+	 * @covers \AMP_Validated_URL_Post_Type::filter_dashboard_glance_items()
 	 */
 	public function test_filter_dashboard_glance_items() {
 
 		// There are no validation errors, so this should return the argument unchanged.
-		$this->assertEmpty( AMP_Invalid_URL_Post_Type::filter_dashboard_glance_items( array() ) );
+		$this->assertEmpty( AMP_Validated_URL_Post_Type::filter_dashboard_glance_items( array() ) );
 
 		// Create validation errors, so that the method returns items.
 		$post_id = $this->factory()->post->create();
-		AMP_Invalid_URL_Post_Type::store_validation_errors(
+		AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'accepted' ),
 				array( 'code' => 'rejected' ),
@@ -1415,41 +1415,41 @@ public function test_filter_dashboard_glance_items() {
 			),
 			get_permalink( $post_id )
 		);
-		$items = AMP_Invalid_URL_Post_Type::filter_dashboard_glance_items( array() );
+		$items = AMP_Validated_URL_Post_Type::filter_dashboard_glance_items( array() );
 		$this->assertContains( '1 URL w/ new AMP errors', $items[0] );
-		$this->assertContains( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, $items[0] );
+		$this->assertContains( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG, $items[0] );
 		$this->assertContains( AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_STATUS_QUERY_VAR, $items[0] );
 	}
 
 	/**
 	 * Test for get_single_url_page_heading()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::get_single_url_page_heading()
+	 * @covers \AMP_Validated_URL_Post_Type::get_single_url_page_heading()
 	 */
 	public function test_get_single_url_page_heading() {
 		global $post;
-		$meta_key             = '_amp_queried_object';
-		$test_post            = $this->factory()->post->create_and_get();
-		$amp_invalid_url_post = $this->factory()->post->create_and_get( array( 'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+		$meta_key               = '_amp_queried_object';
+		$test_post              = $this->factory()->post->create_and_get();
+		$amp_validated_url_post = $this->factory()->post->create_and_get( array( 'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 
 		// If $pagenow is not post.php, this should not filter the labels.
 		$GLOBALS['pagenow'] = 'edit.php'; // WPCS: Global override OK.
-		$this->assertEmpty( AMP_Invalid_URL_Post_Type::get_single_url_page_heading() );
+		$this->assertEmpty( AMP_Validated_URL_Post_Type::get_single_url_page_heading() );
 
 		// If $pagenow is correct, but $_GET['post'] and $_GET['action'] are not set, so this should not filter the labels.
 		$GLOBALS['pagenow'] = 'post.php'; // WPCS: Global override OK.
-		$this->assertEmpty( AMP_Invalid_URL_Post_Type::get_single_url_page_heading() );
+		$this->assertEmpty( AMP_Validated_URL_Post_Type::get_single_url_page_heading() );
 
 		// Though $_GET['post'] and $_GET['action'] are now set, but the post type is 'post', so this should not filter the labels.
 		$post           = $test_post;
 		$_GET['post']   = $test_post->ID;
 		$_GET['action'] = 'edit';
-		$this->assertEmpty( AMP_Invalid_URL_Post_Type::get_single_url_page_heading() );
+		$this->assertEmpty( AMP_Validated_URL_Post_Type::get_single_url_page_heading() );
 
-		$_GET['post'] = $amp_invalid_url_post->ID;
-		$post         = $amp_invalid_url_post;
+		$_GET['post'] = $amp_validated_url_post->ID;
+		$post         = $amp_validated_url_post;
 		update_post_meta(
-			$amp_invalid_url_post->ID,
+			$amp_validated_url_post->ID,
 			$meta_key,
 			array(
 				'type' => 'post',
@@ -1458,13 +1458,13 @@ public function test_get_single_url_page_heading() {
 		);
 		$this->assertEquals(
 			sprintf( 'Errors for: %s', $test_post->post_title ),
-			AMP_Invalid_URL_Post_Type::get_single_url_page_heading()
+			AMP_Validated_URL_Post_Type::get_single_url_page_heading()
 		);
 
 		// If the URL with validation error(s) is a term, this should return the term name.
 		$term = $this->factory()->term->create_and_get();
 		update_post_meta(
-			$amp_invalid_url_post->ID,
+			$amp_validated_url_post->ID,
 			$meta_key,
 			array(
 				'type' => 'term',
@@ -1473,13 +1473,13 @@ public function test_get_single_url_page_heading() {
 		);
 		$this->assertEquals(
 			sprintf( 'Errors for: %s', $term->name ),
-			AMP_Invalid_URL_Post_Type::get_single_url_page_heading()
+			AMP_Validated_URL_Post_Type::get_single_url_page_heading()
 		);
 
 		// If the URL with validation error(s) is for a user (author), this should return the author's name.
 		$user = $this->factory()->user->create_and_get();
 		update_post_meta(
-			$amp_invalid_url_post->ID,
+			$amp_validated_url_post->ID,
 			$meta_key,
 			array(
 				'type' => 'user',
@@ -1488,14 +1488,14 @@ public function test_get_single_url_page_heading() {
 		);
 		$this->assertEquals(
 			sprintf( 'Errors for: %s', $user->display_name ),
-			AMP_Invalid_URL_Post_Type::get_single_url_page_heading()
+			AMP_Validated_URL_Post_Type::get_single_url_page_heading()
 		);
 	}
 
 	/**
 	 * Test for filter_post_row_actions()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::filter_post_row_actions()
+	 * @covers \AMP_Validated_URL_Post_Type::filter_post_row_actions()
 	 */
 	public function test_filter_post_row_actions() {
 		wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
@@ -1503,7 +1503,7 @@ public function test_filter_post_row_actions() {
 		AMP_Validation_Manager::init();
 
 		$validated_url   = home_url( '/' );
-		$invalid_post_id = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$invalid_post_id = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'foo' ),
 			),
@@ -1514,18 +1514,18 @@ public function test_filter_post_row_actions() {
 			'trash' => sprintf( '<a href="%s" class="submitdelete" aria-label="Trash &#8220;%s&#8221;">Trash</a>', get_delete_post_link( $invalid_post_id ), $validated_url ),
 		);
 
-		$this->assertEquals( $initial_actions, AMP_Invalid_URL_Post_Type::filter_post_row_actions( $initial_actions, $this->factory()->post->create_and_get() ) );
+		$this->assertEquals( $initial_actions, AMP_Validated_URL_Post_Type::filter_post_row_actions( $initial_actions, $this->factory()->post->create_and_get() ) );
 
-		$actions = AMP_Invalid_URL_Post_Type::filter_post_row_actions( $initial_actions, get_post( $invalid_post_id ) );
+		$actions = AMP_Validated_URL_Post_Type::filter_post_row_actions( $initial_actions, get_post( $invalid_post_id ) );
 		$this->assertArrayNotHasKey( 'inline hide-if-no-js', $actions );
 		$this->assertArrayHasKey( 'view', $actions );
-		$this->assertArrayHasKey( AMP_Invalid_URL_Post_Type::VALIDATE_ACTION, $actions );
+		$this->assertArrayHasKey( AMP_Validated_URL_Post_Type::VALIDATE_ACTION, $actions );
 		$this->assertArrayNotHasKey( 'trash', $actions );
 		$this->assertArrayHasKey( 'delete', $actions );
 		$this->assertNotContains( 'Trash', $actions['delete'] );
 		$this->assertContains( 'Forget', $actions['delete'] );
 
-		$this->assertEquals( array(), AMP_Invalid_URL_Post_Type::filter_post_row_actions( array(), null ) );
+		$this->assertEquals( array(), AMP_Validated_URL_Post_Type::filter_post_row_actions( array(), null ) );
 
 		$actions = array(
 			'trash'  => '',
@@ -1533,11 +1533,11 @@ public function test_filter_post_row_actions() {
 		);
 
 		$post = $this->factory()->post->create_and_get( array(
-			'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 			'title'     => 'My Post',
 		) );
 
-		$filtered_actions = AMP_Invalid_URL_Post_Type::filter_post_row_actions( $actions, $post );
+		$filtered_actions = AMP_Validated_URL_Post_Type::filter_post_row_actions( $actions, $post );
 
 		$this->assertArrayNotHasKey( 'trash', $filtered_actions );
 		$this->assertArrayHasKey( 'delete', $filtered_actions );
@@ -1548,16 +1548,16 @@ public function test_filter_post_row_actions() {
 	/**
 	 * Test for filter_table_views()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::filter_table_views()
+	 * @covers \AMP_Validated_URL_Post_Type::filter_table_views()
 	 */
 	public function test_filter_table_views() {
-		$this->assertEquals( array(), AMP_Invalid_URL_Post_Type::filter_table_views( array() ) );
+		$this->assertEquals( array(), AMP_Validated_URL_Post_Type::filter_table_views( array() ) );
 
 		$views = array(
 			'trash' => 'Trash',
 		);
 
-		$filtered_views = AMP_Invalid_URL_Post_Type::filter_table_views( $views );
+		$filtered_views = AMP_Validated_URL_Post_Type::filter_table_views( $views );
 
 		$this->assertEquals( 'Forgotten', $filtered_views['trash'] );
 	}
@@ -1565,29 +1565,29 @@ public function test_filter_table_views() {
 	/**
 	 * Test for filter_bulk_post_updated_messages()
 	 *
-	 * @covers \AMP_Invalid_URL_Post_Type::filter_bulk_post_updated_messages()
+	 * @covers \AMP_Validated_URL_Post_Type::filter_bulk_post_updated_messages()
 	 */
 	public function test_filter_bulk_post_updated_messages() {
 		set_current_screen( 'index.php' );
 
-		$this->assertEquals( array(), AMP_Invalid_URL_Post_Type::filter_bulk_post_updated_messages( array(), array() ) );
+		$this->assertEquals( array(), AMP_Validated_URL_Post_Type::filter_bulk_post_updated_messages( array(), array() ) );
 
 		set_current_screen( 'edit.php' );
-		get_current_screen()->id = sprintf( 'edit-%s', AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG );
+		get_current_screen()->id = sprintf( 'edit-%s', AMP_Validated_URL_Post_Type::POST_TYPE_SLUG );
 
 		$messages = array(
 			'post' => array(),
 		);
 
-		$filtered_messages = AMP_Invalid_URL_Post_Type::filter_bulk_post_updated_messages( $messages, array(
+		$filtered_messages = AMP_Validated_URL_Post_Type::filter_bulk_post_updated_messages( $messages, array(
 			'deleted'   => 1,
 			'trashed'   => 99,
 			'untrashed' => 99,
 		) );
 
-		$this->assertEquals( '%s invalid URL forgotten.', $filtered_messages['post']['deleted'] );
-		$this->assertEquals( '%s invalid URLs forgotten.', $filtered_messages['post']['trashed'] );
-		$this->assertEquals( '%s invalid URLs unforgotten.', $filtered_messages['post']['untrashed'] );
+		$this->assertEquals( '%s validated URL forgotten.', $filtered_messages['post']['deleted'] );
+		$this->assertEquals( '%s validated URLs forgotten.', $filtered_messages['post']['trashed'] );
+		$this->assertEquals( '%s validated URLs unforgotten.', $filtered_messages['post']['untrashed'] );
 	}
 
 
diff --git a/tests/validation/test-class-amp-validation-error-taxonomy.php b/tests/validation/test-class-amp-validation-error-taxonomy.php
index fc415cb0a02..203c9fe274a 100644
--- a/tests/validation/test-class-amp-validation-error-taxonomy.php
+++ b/tests/validation/test-class-amp-validation-error-taxonomy.php
@@ -60,7 +60,7 @@ public function test_register() {
 		$this->assertFalse( $taxonomy_object->meta_box_cb );
 		$this->assertEquals( 'AMP Validation Error Index', $taxonomy_object->label );
 		$this->assertEquals( 'do_not_allow', $taxonomy_object->cap->assign_terms );
-		$this->assertEquals( array( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ), $taxonomy_object->object_type );
+		$this->assertEquals( array( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ), $taxonomy_object->object_type );
 
 		$labels = $taxonomy_object->labels;
 		$this->assertEquals( 'AMP Validation Error Index', $labels->name );
@@ -111,7 +111,7 @@ public function test_should_show_in_menu() {
 	public function test_get_term() {
 		$foo_error = array( 'code' => 'foo' );
 		$bar_error = array( 'code' => 'bar' );
-		AMP_Invalid_URL_Post_Type::store_validation_errors(
+		AMP_Validated_URL_Post_Type::store_validation_errors(
 			array( $foo_error, $bar_error ),
 			home_url( '/' )
 		);
@@ -131,7 +131,7 @@ public function test_delete_empty_terms() {
 		$this->assertEquals( 0, AMP_Validation_Error_Taxonomy::get_validation_error_count() );
 		$this->assertEquals( 0, AMP_Validation_Error_Taxonomy::delete_empty_terms() );
 
-		$post_id_1 = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$post_id_1 = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'foo' ),
 				array( 'code' => 'bar' ),
@@ -139,13 +139,13 @@ public function test_delete_empty_terms() {
 			),
 			home_url( '/1' )
 		);
-		$post_id_2 = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$post_id_2 = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'foo' ),
 			),
 			home_url( '/2' )
 		);
-		$post_id_3 = AMP_Invalid_URL_Post_Type::store_validation_errors(
+		$post_id_3 = AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array( 'code' => 'quux' ),
 			),
@@ -258,7 +258,7 @@ public function test_is_validation_error_sanitized_and_get_validation_error_sani
 			$this->get_mock_error(),
 			array( 'foo' => 1 )
 		);
-		AMP_Invalid_URL_Post_Type::store_validation_errors(
+		AMP_Validated_URL_Post_Type::store_validation_errors(
 			array( $error_foo ),
 			home_url( '/foo' )
 		);
@@ -278,7 +278,7 @@ public function test_is_validation_error_sanitized_and_get_validation_error_sani
 			$this->get_mock_error(),
 			array( 'bar' => 1 )
 		);
-		AMP_Invalid_URL_Post_Type::store_validation_errors(
+		AMP_Validated_URL_Post_Type::store_validation_errors(
 			array( $error_bar ),
 			home_url( '/bar' )
 		);
@@ -302,7 +302,7 @@ public function test_is_validation_error_sanitized_and_get_validation_error_sani
 			$this->get_mock_error(),
 			array( 'baz' => 1 )
 		);
-		AMP_Invalid_URL_Post_Type::store_validation_errors(
+		AMP_Validated_URL_Post_Type::store_validation_errors(
 			array( $error_baz ),
 			home_url( '/baz' )
 		);
@@ -472,7 +472,7 @@ public function test_filter_posts_where_for_validation_error_status() {
 		$this->assertEquals( $initial_where, AMP_Validation_Error_Taxonomy::filter_posts_where_for_validation_error_status( $initial_where, $wp_query ) );
 
 		// Only the first part of the conditional is met, so this still shouldn't filter the WHERE clause.
-		$wp_query->set( 'post_type', array( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+		$wp_query->set( 'post_type', array( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 		$this->assertEquals( $initial_where, AMP_Validation_Error_Taxonomy::filter_posts_where_for_validation_error_status( $initial_where, $wp_query ) );
 
 		// The entire conditional should now be true, so this should filter the WHERE clause.
@@ -568,7 +568,7 @@ public function test_add_admin_hooks() {
 		$this->assertEquals( 10, has_action( 'admin_menu', array( self::TESTED_CLASS, 'add_admin_menu_validation_error_item' ) ) );
 		$this->assertEquals( 10, has_filter( 'parse_term_query', array( self::TESTED_CLASS, 'parse_post_php_term_query' ) ) );
 		$this->assertEquals( 10, has_filter( 'manage_' . AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG . '_custom_column', array( self::TESTED_CLASS, 'filter_manage_custom_columns' ) ) );
-		$this->assertEquals( 10, has_filter( 'manage_' . AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG . '_sortable_columns', array( self::TESTED_CLASS, 'add_single_post_sortable_columns' ) ) );
+		$this->assertEquals( 10, has_filter( 'manage_' . AMP_Validated_URL_Post_Type::POST_TYPE_SLUG . '_sortable_columns', array( self::TESTED_CLASS, 'add_single_post_sortable_columns' ) ) );
 		$this->assertEquals( 10, has_filter( 'posts_where', array( self::TESTED_CLASS, 'filter_posts_where_for_validation_error_status' ) ) );
 		$this->assertEquals( 10, has_filter( 'post_action_' . AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_REJECT_ACTION, array( self::TESTED_CLASS, 'handle_single_url_page_bulk_and_inline_actions' ) ) );
 		$this->assertEquals( 10, has_filter( 'post_action_' . AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_REJECT_ACTION, array( self::TESTED_CLASS, 'handle_single_url_page_bulk_and_inline_actions' ) ) );
@@ -630,7 +630,7 @@ public function test_add_group_terms_clauses_filter() {
 	 */
 	public function test_add_term_filter_query_var() {
 		$initial_url      = admin_url( 'edit-tags.php' );
-		$correct_taxonomy = new WP_Taxonomy( AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG, AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG );
+		$correct_taxonomy = new WP_Taxonomy( AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG, AMP_Validated_URL_Post_Type::POST_TYPE_SLUG );
 		$wrong_taxonomy   = new WP_Taxonomy( 'category', 'post' );
 
 		// Because the VALIDATION_ERROR_TYPE_QUERY_VAR isn't present in the POST request, this should return the $initial_url unchanged, without adding the query var.
@@ -652,7 +652,7 @@ public function test_add_term_filter_query_var() {
 		$this->assertEquals( $initial_url, AMP_Validation_Error_Taxonomy::add_term_filter_query_var( $initial_url, $correct_taxonomy ) );
 
 		// The $_POST has correct 'post_type', so this should add the VALIDATION_ERROR_TYPE_QUERY_VAR to the $initial_url.
-		$_POST['post_type'] = AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG;
+		$_POST['post_type'] = AMP_Validated_URL_Post_Type::POST_TYPE_SLUG;
 		$expected_url       = add_query_arg(
 			AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_TYPE_QUERY_VAR,
 			$type_query_var_value,
@@ -758,11 +758,11 @@ public function test_render_link_to_invalid_urls_screen() {
 		ob_start();
 		AMP_Validation_Error_Taxonomy::render_link_to_invalid_urls_screen( AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG );
 		$output = ob_get_clean();
-		$this->assertContains( 'View Invalid URLs', $output );
+		$this->assertContains( 'View Validated URLs', $output );
 		$this->assertContains(
 			add_query_arg(
 				'post_type',
-				AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+				AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 				admin_url( 'edit.php' )
 			),
 			$output
@@ -786,7 +786,7 @@ public function test_render_error_status_filter() {
 		set_current_screen( 'edit.php' );
 		$number_of_errors = 10;
 		for ( $i = 0; $i < $number_of_errors; $i++ ) {
-			$invalid_url_post      = $this->factory()->post->create( array( 'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+			$invalid_url_post      = $this->factory()->post->create( array( 'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 			$validation_error_term = $this->factory()->term->create( array(
 				'taxonomy'    => AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG,
 				'description' => wp_json_encode( $this->get_mock_error() ),
@@ -880,7 +880,7 @@ public function test_render_clear_empty_button() {
 		$this->assertEmpty( ob_get_clean() );
 
 		ob_start();
-		$post_id = AMP_Invalid_URL_Post_Type::store_validation_errors( array( $this->get_mock_error() ), home_url( '/' ) );
+		$post_id = AMP_Validated_URL_Post_Type::store_validation_errors( array( $this->get_mock_error() ), home_url( '/' ) );
 		wp_delete_post( $post_id, true );
 		AMP_Validation_Error_Taxonomy::render_clear_empty_button();
 		$output = ob_get_clean();
@@ -1015,7 +1015,7 @@ public function test_add_admin_menu_validation_error_item() {
 		$expected_submenu = array(
 			'Error Index',
 			'manage_categories',
-			'edit-tags.php?taxonomy=amp_validation_error&amp;post_type=amp_invalid_url',
+			'edit-tags.php?taxonomy=amp_validation_error&amp;post_type=amp_validated_url',
 			'Error Index',
 		);
 		$amp_options      = $submenu[ AMP_Options_Manager::OPTION_NAME ];
@@ -1041,14 +1041,14 @@ public function test_parse_post_php_term_query() {
 		AMP_Validation_Error_Taxonomy::parse_post_php_term_query( $wp_term_query );
 		$this->assertEmpty( $wp_term_query->query_vars );
 
-		// Though $_GET['post'] has a post ID, it's not for the amp_invalid_url post type.
+		// Though $_GET['post'] has a post ID, it's not for the amp_validated_url post type.
 		$post_id_wrong_type = $this->factory()->post->create();
 		$_GET['post']       = $post_id_wrong_type;
 		AMP_Validation_Error_Taxonomy::parse_post_php_term_query( $wp_term_query );
 		$this->assertEmpty( $wp_term_query->query_vars );
 
 		// Now that $_GET['post'] has a post ID of the correct post type, it should be in the query var.
-		$post_id_correct_post_type = $this->factory()->post->create( array( 'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+		$post_id_correct_post_type = $this->factory()->post->create( array( 'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 		$_GET['post']              = $post_id_correct_post_type;
 		AMP_Validation_Error_Taxonomy::parse_post_php_term_query( $wp_term_query );
 		$this->assertEquals( $post_id_correct_post_type, $wp_term_query->query_vars['object_ids'] );
@@ -1102,7 +1102,7 @@ public function test_filter_manage_custom_columns() {
 
 		$url = admin_url( add_query_arg( array(
 			AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG => $term->name,
-			'post_type'                                  => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'post_type'                                  => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG,
 		), 'edit.php' ) );
 		// Test the 'error' block in the switch.
 		$filtered_content = AMP_Validation_Error_Taxonomy::filter_manage_custom_columns( $initial_content, 'error', $term_id );
@@ -1226,7 +1226,7 @@ public function test_handle_single_url_page_bulk_and_inline_actions() {
 		// Because the action is incorrect, the tested method should exit and not update the validation error term.
 		$_REQUEST['action']   = 'incorrect-action';
 		$_POST['delete_tags'] = array( $error_term->term_id );
-		$correct_post_type    = $this->factory()->post->create( array( 'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+		$correct_post_type    = $this->factory()->post->create( array( 'post_type' => AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 		$this->assertEquals( get_term( $error_term->term_id )->term_group, $initial_accepted_status );
 
 		// Because the post type is wrong, the tested method should again return without updating the term.
@@ -1294,7 +1294,7 @@ public function test_handle_clear_empty_terms_request() {
 		add_filter( 'wp_redirect', function() {
 			throw new Exception( 'redirected' );
 		} );
-		$post_id = AMP_Invalid_URL_Post_Type::store_validation_errors( array( $this->get_mock_error() ), home_url( '/' ) );
+		$post_id = AMP_Validated_URL_Post_Type::store_validation_errors( array( $this->get_mock_error() ), home_url( '/' ) );
 		wp_delete_post( $post_id, true );
 		$_REQUEST = &$_POST; // WPCS: csrf ok.
 
diff --git a/tests/validation/test-class-amp-validation-manager.php b/tests/validation/test-class-amp-validation-manager.php
index 3ba9e81c687..6a3de177bb1 100644
--- a/tests/validation/test-class-amp-validation-manager.php
+++ b/tests/validation/test-class-amp-validation-manager.php
@@ -116,7 +116,7 @@ public function test_init() {
 		add_theme_support( AMP_Theme_Support::SLUG );
 		AMP_Validation_Manager::init();
 
-		$this->assertTrue( post_type_exists( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+		$this->assertTrue( post_type_exists( AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ) );
 		$this->assertTrue( taxonomy_exists( AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG ) );
 
 		$this->assertEquals( 10, has_action( 'save_post', self::TESTED_CLASS . '::handle_save_post_prompting_validation' ) );
@@ -380,7 +380,7 @@ protected function assert_rest_api_field_present( $post_types ) {
 	 */
 	public function test_get_amp_validity_rest_field() {
 		AMP_Options_Manager::update_option( 'auto_accept_sanitization', false );
-		AMP_Invalid_URL_Post_Type::register();
+		AMP_Validated_URL_Post_Type::register();
 		AMP_Validation_Error_Taxonomy::register();
 
 		$id = $this->factory()->post->create();
@@ -547,7 +547,7 @@ public function test_reset_validation_results() {
 	public function test_print_edit_form_validation_status() {
 		add_theme_support( AMP_Theme_Support::SLUG );
 
-		AMP_Invalid_URL_Post_Type::register();
+		AMP_Validated_URL_Post_Type::register();
 		AMP_Validation_Error_Taxonomy::register();
 		$this->set_capability();
 		$post = $this->factory()->post->create_and_get();
@@ -557,7 +557,7 @@ public function test_print_edit_form_validation_status() {
 
 		$this->assertNotContains( 'notice notice-warning', $output );
 
-		AMP_Invalid_URL_Post_Type::store_validation_errors(
+		AMP_Validated_URL_Post_Type::store_validation_errors(
 			array(
 				array(
 					'code'            => AMP_Validation_Error_Taxonomy::INVALID_ELEMENT_CODE,
@@ -1425,6 +1425,6 @@ public function create_custom_post( $errors = array(), $url = null ) {
 			$url = home_url( '/' );
 		}
 
-		return AMP_Invalid_URL_Post_Type::store_validation_errors( $errors, $url );
+		return AMP_Validated_URL_Post_Type::store_validation_errors( $errors, $url );
 	}
 }