diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index e717b2e553943..048a324cb9a22 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -23,9 +23,9 @@
 class WP_Directive_Processor extends Gutenberg_HTML_Tag_Processor_6_4 {
 
 	/**
-	 * An array of root blocks.
+	 * A string containing the main root block.
 	 *
-	 * @var array
+	 * @var string
 	 */
 	public static $root_block = null;
 
@@ -69,6 +69,76 @@ public static function has_root_block() {
 		return isset( self::$root_block );
 	}
 
+	/**
+	 * An array containing the main children of interactive.
+	 *
+	 * @var array
+	 */
+	public static $children_of_interactive_block = array();
+
+	/**
+	 * Add a root block to the variable.
+	 *
+	 * @param array $block The block to add.
+	 *
+	 * @return void
+	 */
+	public static function mark_children_of_interactive_block( $block ) {
+		self::$children_of_interactive_block[] = md5( serialize( $block ) );
+	}
+
+	/**
+	 * Remove a root block to the variable.
+	 *
+	 * @param array $block The block to remove.
+	 * @return void
+	 */
+	public static function unmark_children_of_interactive_block( $block ) {
+		self::$children_of_interactive_block = array_diff( self::$children_of_interactive_block, array( md5( serialize( $block ) ) ) );
+	}
+
+	/**
+	 * Check if block is a root block.
+	 *
+	 * @param array $block The block to check.
+	 *
+	 * @return bool True if block is a root block, false otherwise.
+	 */
+	public static function is_marked_as_children_of_interactive_block( $block ) {
+		return in_array( md5( serialize( $block ) ), self::$children_of_interactive_block, true );
+	}
+
+	/**
+	 * Stack of namespaces.
+	 *
+	 * @var string[]
+	 */
+	private $ns_stack = array();
+
+	/**
+	 * Push a new namespace onto the namespace stack.
+	 *
+	 * @param string $ns The new namespace.
+	 */
+	public function push_namespace( string $ns ) {
+		$this->ns_stack[] = $ns;
+	}
+
+	/**
+	 * Discard the current namespace.
+	 */
+	public function pop_namespace() {
+		array_pop( $this->ns_stack );
+	}
+
+	/**
+	 * Return the current namespace, or false if no namespace is set.
+	 *
+	 * @return string|bool
+	 */
+	public function get_namespace() {
+		return end( $this->ns_stack );
+	}
 
 	/**
 	 * Find the matching closing tag for an opening tag.
@@ -114,22 +184,25 @@ public function next_balanced_closer() {
 	 * Traverses the HTML searching for Interactivity API directives and processing
 	 * them.
 	 *
-	 * @param WP_Directive_Processor $tags An instance of the WP_Directive_Processor.
-	 * @param string                 $prefix Attribute prefix.
-	 * @param string[]               $directives Directives.
+	 * @param string   $prefix Attribute prefix.
+	 * @param string[] $directives Directives.
 	 *
 	 * @return WP_Directive_Processor The modified instance of the
 	 * WP_Directive_Processor.
 	 */
-	public function process_rendered_html( $tags, $prefix, $directives ) {
+	public function process_rendered_html( $prefix, $directives ) {
 		$context   = new WP_Directive_Context();
 		$tag_stack = array();
 
-		while ( $tags->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
-			$tag_name = $tags->get_tag();
+		// Extract all directive names. They'll be used later on.
+		$directive_names     = array_keys( $directives );
+		$directive_names_rev = array_reverse( $directive_names );
+
+		while ( $this->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
+			$tag_name = $this->get_tag();
 
 			// Is this a tag that closes the latest opening tag?
-			if ( $tags->is_tag_closer() ) {
+			if ( $this->is_tag_closer() ) {
 				if ( 0 === count( $tag_stack ) ) {
 					continue;
 				}
@@ -145,7 +218,7 @@ public function process_rendered_html( $tags, $prefix, $directives ) {
 				}
 			} else {
 				$attributes = array();
-				foreach ( $tags->get_attribute_names_with_prefix( $prefix ) as $name ) {
+				foreach ( $this->get_attribute_names_with_prefix( $prefix ) as $name ) {
 					/*
 					 * Removes the part after the double hyphen before looking for
 					 * the directive processor inside `$directives`, e.g., "wp-bind"
@@ -164,19 +237,32 @@ public function process_rendered_html( $tags, $prefix, $directives ) {
 				 * encounter the matching closing tag.
 				 */
 				if (
-				! WP_Directive_Processor::is_html_void_element( $tags->get_tag() ) &&
+				! WP_Directive_Processor::is_html_void_element( $this->get_tag() ) &&
 				( 0 !== count( $attributes ) || 0 !== count( $tag_stack ) )
 				) {
 					$tag_stack[] = array( $tag_name, $attributes );
 				}
 			}
 
-			foreach ( $attributes as $attribute ) {
-				call_user_func( $directives[ $attribute ], $tags, $context );
+			/*
+			 * Sort attributes by the order they appear in the `$directives`
+			 * argument, considering it as the priority order in which
+			 * directives should be processed. Note that the order is reversed
+			 * for tag closers.
+			 */
+			$sorted_attrs = array_intersect(
+				$this->is_tag_closer()
+					? $directive_names_rev
+					: $directive_names,
+				$attributes
+			);
+
+			foreach ( $sorted_attrs as $attribute ) {
+				call_user_func( $directives[ $attribute ], $this, $context );
 			}
 		}
 
-		return $tags;
+		return $this;
 	}
 
 	/**
@@ -312,4 +398,21 @@ public static function is_html_void_element( $tag_name ) {
 	public static function parse_attribute_name( $name ) {
 		return explode( '--', $name, 2 );
 	}
+
+	/**
+	 * Extract and return the namespace from the given directive value.
+	 *
+	 * @param string $value The directive value.
+	 * @return array The resulting array
+	 */
+	public static function parse_value_ns( $value ) {
+		$matches = array();
+		$has_ns  = preg_match( '/^([\w\-_\/]+)::(.+)$/', $value, $matches );
+
+		if ( $has_ns ) {
+			return array_slice( $matches, 1 );
+		} else {
+			return array( null, $value );
+		}
+	}
 }
diff --git a/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php b/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php
new file mode 100644
index 0000000000000..a1edbcff776fb
--- /dev/null
+++ b/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * WP_Interactivity_Initial_State class
+ *
+ * @package Gutenberg
+ * @subpackage Interactivity API
+ */
+
+if ( class_exists( 'WP_Interactivity_Initial_State' ) ) {
+	return;
+}
+
+/**
+ * Manages the initial state of the Interactivity API store in the server and
+ * its serialization so it can be restored in the browser upon hydration.
+ *
+ * @package Gutenberg
+ * @subpackage Interactivity API
+ */
+class WP_Interactivity_Initial_State {
+	/**
+	 * Map of initial state by namespace.
+	 *
+	 * @var array
+	 */
+	private static $initial_state = array();
+
+	/**
+	 * Get state from a given namespace.
+	 *
+	 * @param string $store_ns Namespace.
+	 *
+	 * @return array The requested state.
+	 */
+	public static function get_state( $store_ns = null ) {
+		if ( ! $store_ns ) {
+			return self::$initial_state;
+		}
+		return self::$initial_state[ $store_ns ] ?? array();
+	}
+
+	/**
+	 * Merge data into the state with the given namespace.
+	 *
+	 * @param string $store_ns Namespace.
+	 * @param array  $data      State to merge.
+	 *
+	 * @return void
+	 */
+	public static function merge_state( $store_ns, $data ) {
+		self::$initial_state[ $store_ns ] = array_replace_recursive(
+			self::get_state( $store_ns ),
+			$data
+		);
+	}
+
+	/**
+	 * Get store data.
+	 *
+	 * @return array
+	 */
+	public static function get_data() {
+		return self::$initial_state;
+	}
+
+	/**
+	 * Reset the initial state.
+	 */
+	public static function reset() {
+		self::$initial_state = array();
+	}
+
+	/**
+	 * Render the initial state.
+	 */
+	public static function render() {
+		if ( empty( self::$initial_state ) ) {
+			return;
+		}
+		echo sprintf(
+			'<script id="wp-interactivity-initial-state" type="application/json">%s</script>',
+			wp_json_encode( self::$initial_state, JSON_HEX_TAG | JSON_HEX_AMP )
+		);
+	}
+}
diff --git a/lib/experimental/interactivity-api/class-wp-interactivity-store.php b/lib/experimental/interactivity-api/class-wp-interactivity-store.php
deleted file mode 100644
index c53701b14e8af..0000000000000
--- a/lib/experimental/interactivity-api/class-wp-interactivity-store.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * WP_Interactivity_Store class
- *
- * Manages the initial state of the Interactivity API store in the server and
- * its serialization so it can be restored in the browser upon hydration.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-if ( class_exists( 'WP_Interactivity_Store' ) ) {
-	return;
-}
-
-/**
- * Manages the initial state of the Interactivity API store in the server and
- * its serialization so it can be restored in the browser upon hydration.
- *
- * It's a private class, exposed by other functions, like `wp_store`.
- *
- * @access private
- */
-class WP_Interactivity_Store {
-	/**
-	 * Store.
-	 *
-	 * @var array
-	 */
-	private static $store = array();
-
-	/**
-	 * Get store data.
-	 *
-	 * @return array
-	 */
-	public static function get_data() {
-		return self::$store;
-	}
-
-	/**
-	 * Merge data.
-	 *
-	 * @param array $data The data that will be merged with the existing store.
-	 */
-	public static function merge_data( $data ) {
-		self::$store = array_replace_recursive( self::$store, $data );
-	}
-
-	/**
-	 * Reset the store data.
-	 */
-	public static function reset() {
-		self::$store = array();
-	}
-
-	/**
-	 * Render the store data.
-	 */
-	public static function render() {
-		if ( empty( self::$store ) ) {
-			return;
-		}
-		echo sprintf(
-			'<script id="wp-interactivity-initial-state" type="application/json">%s</script>',
-			wp_json_encode( self::$store, JSON_HEX_TAG | JSON_HEX_AMP )
-		);
-	}
-}
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 064fc8ea62cbb..4a3ed4b4ed1ea 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -39,16 +39,18 @@ function gutenberg_process_directives_in_root_blocks( $block_content, $block ) {
 	if ( WP_Directive_Processor::is_marked_as_root_block( $block ) ) {
 		WP_Directive_Processor::unmark_root_block();
 		$directives = array(
-			'data-wp-bind'    => 'gutenberg_interactivity_process_wp_bind',
-			'data-wp-context' => 'gutenberg_interactivity_process_wp_context',
-			'data-wp-class'   => 'gutenberg_interactivity_process_wp_class',
-			'data-wp-style'   => 'gutenberg_interactivity_process_wp_style',
-			'data-wp-text'    => 'gutenberg_interactivity_process_wp_text',
+			'data-wp-interactive' => 'gutenberg_interactivity_process_wp_interactive',
+			'data-wp-context'     => 'gutenberg_interactivity_process_wp_context',
+			'data-wp-bind'        => 'gutenberg_interactivity_process_wp_bind',
+			'data-wp-class'       => 'gutenberg_interactivity_process_wp_class',
+			'data-wp-style'       => 'gutenberg_interactivity_process_wp_style',
+			'data-wp-text'        => 'gutenberg_interactivity_process_wp_text',
 		);
 
 		$tags = new WP_Directive_Processor( $block_content );
-		$tags = $tags->process_rendered_html( $tags, 'data-wp-', $directives );
-		return $tags->get_updated_html();
+		return $tags
+			->process_rendered_html( 'data-wp-', $directives )
+			->get_updated_html();
 
 	}
 
@@ -56,18 +58,84 @@ function gutenberg_process_directives_in_root_blocks( $block_content, $block ) {
 }
 add_filter( 'render_block', 'gutenberg_process_directives_in_root_blocks', 10, 2 );
 
+/**
+ * Creates a stack of interactive block children.
+ *
+ * @param array    $parsed_block The parsed block.
+ * @param array    $source_block The source block.
+ * @param WP_Block $parent_block The parent block.
+ */
+function gutenberg_mark_interactive_block_children( $parsed_block, $source_block, $parent_block ) {
+	if (
+			isset( $parent_block ) &&
+			isset( $parent_block->block_type->supports['interactivity'] ) &&
+			$parent_block->block_type->supports['interactivity']
+		) {
+		WP_Directive_Processor::mark_children_of_interactive_block( $source_block );
+	}
+	return $parsed_block;
+}
+add_filter( 'render_block_data', 'gutenberg_mark_interactive_block_children', 100, 3 );
+
+/**
+ * Add a marker indicating if the block is interactive or not.
+ * core/interactivity-wrapper if it is interactive.
+ * core/non-interactivity-wrapper if it is not interactive.
+ *
+ * @param string   $block_content The block content.
+ * @param array    $block The full block, including name and attributes.
+ * @param WP_Block $block_instance The block instance.
+ */
+function gutenberg_mark_block_interactivity( $block_content, $block, $block_instance ) {
+	if (
+		isset( $block_instance->block_type->supports['interactivity'] ) &&
+		$block_instance->block_type->supports['interactivity']
+	) {
+		// Mark interactive blocks so we can process them later.
+		return get_comment_delimited_block_content(
+			'core/interactivity-wrapper',
+			array(
+				'blockName' => $block['blockName'],
+			// We can put extra information about the block here.
+			),
+			$block_content
+		);
+	} elseif ( WP_Directive_Processor::is_marked_as_children_of_interactive_block( $block ) ) {
+		WP_Directive_Processor::unmark_children_of_interactive_block( $block );
+		// Mark children of interactive blocks that are not interactive themselves
+		// to so we can skip them later.
+		return get_comment_delimited_block_content(
+			'core/non-interactivity-wrapper',
+			array(
+				'blockName' => $block['blockName'],
+				// We can put extra information about the block here.
+			),
+			$block_content
+		);
+	}
+	return $block_content;
+}
+
+add_filter( 'render_block', 'gutenberg_mark_block_interactivity', 10, 3 );
 
 /**
  * Resolve the reference using the store and the context from the provided path.
  *
- * @param string $path Path.
+ * @param string $path    Path.
+ * @param string $ns      Current namespace.
  * @param array  $context Context data.
  * @return mixed
  */
-function gutenberg_interactivity_evaluate_reference( $path, array $context = array() ) {
-	$store = array_merge(
-		WP_Interactivity_Store::get_data(),
-		array( 'context' => $context )
+function gutenberg_interactivity_evaluate_reference( $path, $ns, array $context = array() ) {
+	// Separate the namespace from the path value (if present).
+	list( $path_ns, $path ) = WP_Directive_Processor::parse_value_ns( $path );
+
+	// Overwrite namespace if path value contains one.
+	$ns = $path_ns ?? $ns;
+
+	$store = array(
+		'state'   => WP_Interactivity_Initial_State::get_state( $ns ),
+		'context' => $context[ $ns ] ?? array(),
 	);
 
 	/*
@@ -76,10 +144,9 @@ function gutenberg_interactivity_evaluate_reference( $path, array $context = arr
 	 * passed context) using the subsequent path should be negated.
 	 */
 	$should_negate_value = '!' === $path[0];
-
-	$path          = $should_negate_value ? substr( $path, 1 ) : $path;
-	$path_segments = explode( '.', $path );
-	$current       = $store;
+	$path                = $should_negate_value ? substr( $path, 1 ) : $path;
+	$path_segments       = explode( '.', $path );
+	$current             = $store;
 	foreach ( $path_segments as $p ) {
 		if ( isset( $current[ $p ] ) ) {
 			$current = $current[ $p ];
diff --git a/lib/experimental/interactivity-api/directives/wp-bind.php b/lib/experimental/interactivity-api/directives/wp-bind.php
index 54be4a9faeb7d..bccd94f81f267 100644
--- a/lib/experimental/interactivity-api/directives/wp-bind.php
+++ b/lib/experimental/interactivity-api/directives/wp-bind.php
@@ -26,7 +26,7 @@ function gutenberg_interactivity_process_wp_bind( $tags, $context ) {
 		}
 
 		$expr  = $tags->get_attribute( $attr );
-		$value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
+		$value = gutenberg_interactivity_evaluate_reference( $expr, $tags->get_namespace(), $context->get_context() );
 		$tags->set_attribute( $bound_attr, $value );
 	}
 }
diff --git a/lib/experimental/interactivity-api/directives/wp-class.php b/lib/experimental/interactivity-api/directives/wp-class.php
index 741cc75b42c60..09750e426774f 100644
--- a/lib/experimental/interactivity-api/directives/wp-class.php
+++ b/lib/experimental/interactivity-api/directives/wp-class.php
@@ -26,7 +26,7 @@ function gutenberg_interactivity_process_wp_class( $tags, $context ) {
 		}
 
 		$expr      = $tags->get_attribute( $attr );
-		$add_class = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
+		$add_class = gutenberg_interactivity_evaluate_reference( $expr, $tags->get_namespace(), $context->get_context() );
 		if ( $add_class ) {
 			$tags->add_class( $class_name );
 		} else {
diff --git a/lib/experimental/interactivity-api/directives/wp-context.php b/lib/experimental/interactivity-api/directives/wp-context.php
index 7d92b0ac7b0c6..3d00bede43e7a 100644
--- a/lib/experimental/interactivity-api/directives/wp-context.php
+++ b/lib/experimental/interactivity-api/directives/wp-context.php
@@ -19,10 +19,17 @@ function gutenberg_interactivity_process_wp_context( $tags, $context ) {
 
 	$value = $tags->get_attribute( 'data-wp-context' );
 
-	$new_context = json_decode(
-		is_string( $value ) && ! empty( $value ) ? $value : '{}',
-		true
+	/**
+	 * Separate namespace and value from the context directive attribute. A
+	 * check to ensure it's a non-empty string in order to avoid exceptions.
+	 */
+	list( $ns, $value ) = WP_Directive_Processor::parse_value_ns(
+		is_string( $value ) && ! empty( $value ) ? $value : '{}'
 	);
 
-	$context->set_context( $new_context ?? array() );
+	// If there's no directive namespace, use the inherited one.
+	$ns = $ns ?? $tags->get_namespace();
+
+	$new_context = json_decode( $value, true );
+	$context->set_context( array( $ns => $new_context ?? array() ) );
 }
diff --git a/lib/experimental/interactivity-api/directives/wp-interactive.php b/lib/experimental/interactivity-api/directives/wp-interactive.php
new file mode 100644
index 0000000000000..a13451ef18c6f
--- /dev/null
+++ b/lib/experimental/interactivity-api/directives/wp-interactive.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Process wp-interactive directive attribute.
+ *
+ * @package wp-directives
+ */
+
+/**
+ * Process wp-interactive directive attribute.
+ *
+ * @param WP_Directive_Processor $tags Tags.
+ */
+function gutenberg_interactivity_process_wp_interactive( $tags ) {
+	if ( $tags->is_tag_closer() ) {
+		$tags->pop_namespace();
+		return;
+	}
+
+	$value  = $tags->get_attribute( 'data-wp-interactive' );
+	$island = json_decode( $value, true );
+
+	$tags->push_namespace( $island['namespace'] );
+}
diff --git a/lib/experimental/interactivity-api/directives/wp-style.php b/lib/experimental/interactivity-api/directives/wp-style.php
index 9c37f9082c2c0..ace690a4bf161 100644
--- a/lib/experimental/interactivity-api/directives/wp-style.php
+++ b/lib/experimental/interactivity-api/directives/wp-style.php
@@ -26,7 +26,7 @@ function gutenberg_interactivity_process_wp_style( $tags, $context ) {
 		}
 
 		$expr        = $tags->get_attribute( $attr );
-		$style_value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
+		$style_value = gutenberg_interactivity_evaluate_reference( $expr, $tags->get_namespace(), $context->get_context() );
 		if ( $style_value ) {
 			$style_attr = $tags->get_attribute( 'style' );
 			$style_attr = gutenberg_interactivity_set_style( $style_attr, $style_name, $style_value );
diff --git a/lib/experimental/interactivity-api/directives/wp-text.php b/lib/experimental/interactivity-api/directives/wp-text.php
index b0cfc98a74e70..ad1698006a9b5 100644
--- a/lib/experimental/interactivity-api/directives/wp-text.php
+++ b/lib/experimental/interactivity-api/directives/wp-text.php
@@ -22,6 +22,6 @@ function gutenberg_interactivity_process_wp_text( $tags, $context ) {
 		return;
 	}
 
-	$text = gutenberg_interactivity_evaluate_reference( $value, $context->get_context() );
+	$text = gutenberg_interactivity_evaluate_reference( $value, $tags->get_namespace(), $context->get_context() );
 	$tags->set_inner_html( esc_html( $text ) );
 }
diff --git a/lib/experimental/interactivity-api/initial-state.php b/lib/experimental/interactivity-api/initial-state.php
new file mode 100644
index 0000000000000..a38d0da631f3c
--- /dev/null
+++ b/lib/experimental/interactivity-api/initial-state.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Functions to expose the store of the WP_Interactivity_Initial_State class.
+ *
+ * @package Gutenberg
+ * @subpackage Interactivity API
+ */
+
+if ( ! function_exists( 'wp_initial_state' ) ) {
+	/**
+	 * Merge data into the state with the given namespace.
+	 *
+	 * @param string $store_ns  Namespace.
+	 * @param array  $data      State to merge.
+	 *
+	 * @return array The current state for the given namespace.
+	 */
+	function wp_initial_state( $store_ns, $data = null ) {
+		if ( $data ) {
+			WP_Interactivity_Initial_State::merge_state( $store_ns, $data );
+		}
+		return WP_Interactivity_Initial_State::get_state( $store_ns );
+	}
+
+	/**
+	 * Render the Interactivity API initial state in the frontend.
+	 */
+	add_action( 'wp_footer', array( 'WP_Interactivity_Initial_State', 'render' ), 8 );
+}
diff --git a/lib/experimental/interactivity-api/store.php b/lib/experimental/interactivity-api/store.php
deleted file mode 100644
index 05c8b35f780d4..0000000000000
--- a/lib/experimental/interactivity-api/store.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Functions to expose the store of the WP_Interactivity_Store class.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-if ( ! function_exists( 'wp_store' ) ) {
-	/**
-	 * Merge data with the existing store.
-	 *
-	 * @param array $data Data that will be merged with the existing store.
-	 *
-	 * @return $data The current store data.
-	 */
-	function wp_store( $data = null ) {
-		if ( $data ) {
-			WP_Interactivity_Store::merge_data( $data );
-		}
-		return WP_Interactivity_Store::get_data();
-	}
-}
-
-/**
- * Render the Interactivity API store in the frontend.
- */
-add_action( 'wp_footer', array( 'WP_Interactivity_Store', 'render' ), 8 );
diff --git a/lib/load.php b/lib/load.php
index 5da1a1126da26..4d88f892456f3 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -113,8 +113,8 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require __DIR__ . '/experimental/disable-tinymce.php';
 }
 
-require __DIR__ . '/experimental/interactivity-api/class-wp-interactivity-store.php';
-require __DIR__ . '/experimental/interactivity-api/store.php';
+require __DIR__ . '/experimental/interactivity-api/class-wp-interactivity-initial-state.php';
+require __DIR__ . '/experimental/interactivity-api/initial-state.php';
 require __DIR__ . '/experimental/interactivity-api/modules.php';
 require __DIR__ . '/experimental/interactivity-api/class-wp-directive-processor.php';
 require __DIR__ . '/experimental/interactivity-api/class-wp-directive-context.php';
@@ -124,6 +124,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/interactivity-api/directives/wp-class.php';
 require __DIR__ . '/experimental/interactivity-api/directives/wp-style.php';
 require __DIR__ . '/experimental/interactivity-api/directives/wp-text.php';
+require __DIR__ . '/experimental/interactivity-api/directives/wp-interactive.php';
 
 require __DIR__ . '/experimental/modules/class-gutenberg-modules.php';
 
diff --git a/phpunit/experimental/interactivity-api/class-wp-interactivity-initial-state-test.php b/phpunit/experimental/interactivity-api/class-wp-interactivity-initial-state-test.php
new file mode 100644
index 0000000000000..ece4ee9c39f01
--- /dev/null
+++ b/phpunit/experimental/interactivity-api/class-wp-interactivity-initial-state-test.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * `WP_Interactivity_Initial_State` class test.
+ *
+ * @package Gutenberg
+ * @subpackage Interactivity API
+ */
+
+/**
+ * Tests for the `WP_Interactivity_Initial_State` class.
+ *
+ * @group  interactivity-api
+ * @covers WP_Interactivity_Initial_State
+ */
+class WP_Interactivity_Initial_State_Test extends WP_UnitTestCase {
+	public function set_up() {
+		// Clear the state before each test.
+		WP_Interactivity_Initial_State::reset();
+	}
+
+	public function test_initial_state_should_be_empty() {
+		$this->assertEmpty( WP_Interactivity_Initial_State::get_data() );
+	}
+
+	public function test_initial_state_can_be_merged() {
+		$state = array(
+			'a'      => 1,
+			'b'      => 2,
+			'nested' => array(
+				'c' => 3,
+			),
+		);
+		WP_Interactivity_Initial_State::merge_state( 'core', $state );
+		$this->assertSame( $state, WP_Interactivity_Initial_State::get_state( 'core' ) );
+	}
+
+	public function test_initial_state_can_be_extended() {
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => 1 ) );
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'b' => 2 ) );
+		WP_Interactivity_Initial_State::merge_state( 'custom', array( 'c' => 3 ) );
+		$this->assertSame(
+			array(
+				'core'   => array(
+					'a' => 1,
+					'b' => 2,
+				),
+				'custom' => array(
+					'c' => 3,
+				),
+			),
+			WP_Interactivity_Initial_State::get_data()
+		);
+	}
+
+	public function test_initial_state_existing_props_should_be_overwritten() {
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => 1 ) );
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => 'overwritten' ) );
+		$this->assertSame(
+			array(
+				'core' => array(
+					'a' => 'overwritten',
+				),
+			),
+			WP_Interactivity_Initial_State::get_data()
+		);
+	}
+
+	public function test_initial_state_existing_indexed_arrays_should_be_replaced() {
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => array( 1, 2 ) ) );
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => array( 3, 4 ) ) );
+		$this->assertSame(
+			array(
+				'core' => array(
+					'a' => array( 3, 4 ),
+				),
+			),
+			WP_Interactivity_Initial_State::get_data()
+		);
+	}
+
+	public function test_initial_state_should_be_correctly_rendered() {
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => 1 ) );
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'b' => 2 ) );
+		WP_Interactivity_Initial_State::merge_state( 'custom', array( 'c' => 3 ) );
+
+		ob_start();
+		WP_Interactivity_Initial_State::render();
+		$rendered = ob_get_clean();
+		$this->assertSame(
+			'<script id="wp-interactivity-initial-state" type="application/json">{"core":{"a":1,"b":2},"custom":{"c":3}}</script>',
+			$rendered
+		);
+	}
+
+	public function test_initial_state_should_also_escape_tags_and_amps() {
+		WP_Interactivity_Initial_State::merge_state(
+			'test',
+			array(
+				'amps' => 'http://site.test/?foo=1&baz=2&bar=3',
+				'tags' => 'Do not do this: <!-- <script>',
+			)
+		);
+		ob_start();
+		WP_Interactivity_Initial_State::render();
+		$rendered = ob_get_clean();
+		$this->assertSame(
+			'<script id="wp-interactivity-initial-state" type="application/json">{"test":{"amps":"http:\/\/site.test\/?foo=1\u0026baz=2\u0026bar=3","tags":"Do not do this: \u003C!-- \u003Cscript\u003E"}}</script>',
+			$rendered
+		);
+	}
+}
diff --git a/phpunit/experimental/interactivity-api/class-wp-interactivity-store-test.php b/phpunit/experimental/interactivity-api/class-wp-interactivity-store-test.php
deleted file mode 100644
index 837d6fd50f193..0000000000000
--- a/phpunit/experimental/interactivity-api/class-wp-interactivity-store-test.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * `WP_Interactivity_Store` class test.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the `WP_Interactivity_Store` class.
- *
- * @group  interactivity-api
- * @covers WP_Interactivity_Store
- */
-class WP_Interactivity_Store_Test extends WP_UnitTestCase {
-	public function set_up() {
-		// Clear the state before each test.
-		WP_Interactivity_Store::reset();
-	}
-
-	public function test_store_should_be_empty() {
-		$this->assertEmpty( WP_Interactivity_Store::get_data() );
-	}
-
-	public function test_store_can_be_merged() {
-		$data = array(
-			'state' => array(
-				'core' => array(
-					'a'      => 1,
-					'b'      => 2,
-					'nested' => array(
-						'c' => 3,
-					),
-				),
-			),
-		);
-		WP_Interactivity_Store::merge_data( $data );
-		$this->assertSame( $data, WP_Interactivity_Store::get_data() );
-	}
-
-	public function test_store_can_be_extended() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 1,
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core'   => array(
-						'b' => 2,
-					),
-					'custom' => array(
-						'c' => 3,
-					),
-				),
-			)
-		);
-		$this->assertSame(
-			array(
-				'state' => array(
-					'core'   => array(
-						'a' => 1,
-						'b' => 2,
-					),
-					'custom' => array(
-						'c' => 3,
-					),
-				),
-			),
-			WP_Interactivity_Store::get_data()
-		);
-	}
-
-	public function test_store_existing_props_should_be_overwritten() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 1,
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 'overwritten',
-					),
-				),
-			)
-		);
-		$this->assertSame(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 'overwritten',
-					),
-				),
-			),
-			WP_Interactivity_Store::get_data()
-		);
-	}
-
-	public function test_store_existing_indexed_arrays_should_be_replaced() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => array( 1, 2 ),
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => array( 3, 4 ),
-					),
-				),
-			)
-		);
-		$this->assertSame(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => array( 3, 4 ),
-					),
-				),
-			),
-			WP_Interactivity_Store::get_data()
-		);
-	}
-
-	public function test_store_should_be_correctly_rendered() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 1,
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'b' => 2,
-					),
-				),
-			)
-		);
-		ob_start();
-		WP_Interactivity_Store::render();
-		$rendered = ob_get_clean();
-		$this->assertSame(
-			'<script id="wp-interactivity-initial-state" type="application/json">{"state":{"core":{"a":1,"b":2}}}</script>',
-			$rendered
-		);
-	}
-
-	public function test_store_should_also_escape_tags_and_amps() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'amps' => 'http://site.test/?foo=1&baz=2&bar=3',
-					'tags' => 'Do not do this: <!-- <script>',
-				),
-			)
-		);
-		ob_start();
-		WP_Interactivity_Store::render();
-		$rendered = ob_get_clean();
-		$this->assertSame(
-			'<script id="wp-interactivity-initial-state" type="application/json">{"state":{"amps":"http:\/\/site.test\/?foo=1\u0026baz=2\u0026bar=3","tags":"Do not do this: \u003C!-- \u003Cscript\u003E"}}</script>',
-			$rendered
-		);
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directive-processing-test.php b/phpunit/experimental/interactivity-api/directive-processing-test.php
index 46ef0284df15d..9ca40d0221bc8 100644
--- a/phpunit/experimental/interactivity-api/directive-processing-test.php
+++ b/phpunit/experimental/interactivity-api/directive-processing-test.php
@@ -60,7 +60,7 @@ function ( $p ) {
 
 		$markup = '<div>Example: <div foo-test="abc"><img><span>This is a test></span><div>Here is a nested div</div></div></div>';
 		$tags   = new WP_Directive_Processor( $markup );
-		$tags->process_rendered_html( $tags, 'foo-', $directives );
+		$tags->process_rendered_html( 'foo-', $directives );
 	}
 
 	public function test_directives_with_double_hyphen_processed_correctly() {
@@ -74,7 +74,7 @@ public function test_directives_with_double_hyphen_processed_correctly() {
 
 		$markup = '<div foo-test--value="abc"></div>';
 		$tags   = new WP_Directive_Processor( $markup );
-		$tags->process_rendered_html( $tags, 'foo-', $directives );
+		$tags->process_rendered_html( 'foo-', $directives );
 	}
 
 	public function test_interactivity_process_directives_in_root_blocks() {
@@ -129,28 +129,25 @@ public function test_interactivity_process_directives_in_root_blocks() {
 class Tests_Utils_Evaluate extends WP_UnitTestCase {
 	public function test_evaluate_function_should_access_state() {
 		// Init a simple store.
-		wp_store(
+		wp_initial_state(
+			'test',
 			array(
-				'state' => array(
-					'core' => array(
-						'number' => 1,
-						'bool'   => true,
-						'nested' => array(
-							'string' => 'hi',
-						),
-					),
+				'number' => 1,
+				'bool'   => true,
+				'nested' => array(
+					'string' => 'hi',
 				),
 			)
 		);
-		$this->assertSame( 1, gutenberg_interactivity_evaluate_reference( 'state.core.number' ) );
-		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'state.core.bool' ) );
-		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.core.nested.string' ) );
-		$this->assertFalse( gutenberg_interactivity_evaluate_reference( '!state.core.bool' ) );
+		$this->assertSame( 1, gutenberg_interactivity_evaluate_reference( 'state.number', 'test' ) );
+		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'state.bool', 'test' ) );
+		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.nested.string', 'test' ) );
+		$this->assertFalse( gutenberg_interactivity_evaluate_reference( '!state.bool', 'test' ) );
 	}
 
 	public function test_evaluate_function_should_access_passed_context() {
 		$context = array(
-			'local' => array(
+			'test' => array(
 				'number' => 2,
 				'bool'   => false,
 				'nested' => array(
@@ -158,58 +155,89 @@ public function test_evaluate_function_should_access_passed_context() {
 				),
 			),
 		);
-		$this->assertSame( 2, gutenberg_interactivity_evaluate_reference( 'context.local.number', $context ) );
-		$this->assertFalse( gutenberg_interactivity_evaluate_reference( 'context.local.bool', $context ) );
-		$this->assertTrue( gutenberg_interactivity_evaluate_reference( '!context.local.bool', $context ) );
-		$this->assertSame( 'bye', gutenberg_interactivity_evaluate_reference( 'context.local.nested.string', $context ) );
+		$this->assertSame( 2, gutenberg_interactivity_evaluate_reference( 'context.number', 'test', $context ) );
+		$this->assertFalse( gutenberg_interactivity_evaluate_reference( 'context.bool', 'test', $context ) );
+		$this->assertTrue( gutenberg_interactivity_evaluate_reference( '!context.bool', 'test', $context ) );
+		$this->assertSame( 'bye', gutenberg_interactivity_evaluate_reference( 'context.nested.string', 'test', $context ) );
 		// Previously defined state is also accessible.
-		$this->assertSame( 1, gutenberg_interactivity_evaluate_reference( 'state.core.number' ) );
-		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'state.core.bool' ) );
-		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.core.nested.string' ) );
+		$this->assertSame( 1, gutenberg_interactivity_evaluate_reference( 'state.number', 'test', $context ) );
+		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'state.bool', 'test', $context ) );
+		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.nested.string', 'test', $context ) );
+	}
+
+	public function test_evaluate_function_should_access_state_using_path_ns() {
+		// Add a new namespace to the store.
+		wp_initial_state(
+			'test/other',
+			array(
+				'number' => 3,
+				'bool'   => true,
+				'nested' => array(
+					'string' => 'bonjour',
+				),
+			)
+		);
+		$this->assertSame( 3, gutenberg_interactivity_evaluate_reference( 'test/other::state.number', 'test' ) );
+		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'test/other::state.bool', 'test' ) );
+		$this->assertFalse( gutenberg_interactivity_evaluate_reference( 'test/other::!state.bool', 'test' ) );
+		$this->assertSame( 'bonjour', gutenberg_interactivity_evaluate_reference( 'test/other::state.nested.string', 'test' ) );
+	}
+
+	public function test_evaluate_function_should_access_passed_context_using_path_ns() {
+		$context = array(
+			'test/other' => array(
+				'number' => 4,
+				'bool'   => false,
+				'nested' => array(
+					'string' => 'adieu',
+				),
+			),
+		);
+		$this->assertSame( 4, gutenberg_interactivity_evaluate_reference( 'test/other::context.number', 'test', $context ) );
+		$this->assertFalse( gutenberg_interactivity_evaluate_reference( 'test/other::context.bool', 'test', $context ) );
+		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'test/other::!context.bool', 'test', $context ) );
+		$this->assertSame( 'adieu', gutenberg_interactivity_evaluate_reference( 'test/other::context.nested.string', 'test', $context ) );
 	}
 
 	public function test_evaluate_function_should_return_null_for_unresolved_paths() {
-		$this->assertNull( gutenberg_interactivity_evaluate_reference( 'this.property.doesnt.exist' ) );
+		$this->assertNull( gutenberg_interactivity_evaluate_reference( 'this.property.doesnt.exist', 'test' ) );
 	}
 
 	public function test_evaluate_function_should_execute_anonymous_functions() {
-		$context = new WP_Directive_Context( array( 'count' => 2 ) );
+		$context = new WP_Directive_Context( array( 'test' => array( 'count' => 2 ) ) );
 		$helper  = new Helper_Class();
 
-		wp_store(
+		wp_initial_state(
+			'test',
 			array(
-				'state'     => array(
-					'count' => 3,
-				),
-				'selectors' => array(
-					'anonymous_function'           => function ( $store ) {
-						return $store['state']['count'] + $store['context']['count'];
-					},
-					// Other types of callables should not be executed.
-					'function_name'                => 'gutenberg_test_process_directives_helper_increment',
-					'class_method'                 => array( $helper, 'increment' ),
-					'class_static_method'          => 'Helper_Class::static_increment',
-					'class_static_method_as_array' => array( 'Helper_Class', 'static_increment' ),
-				),
+				'count'                        => 3,
+				'anonymous_function'           => function ( $store ) {
+					return $store['state']['count'] + $store['context']['count'];
+				},
+				// Other types of callables should not be executed.
+				'function_name'                => 'gutenberg_test_process_directives_helper_increment',
+				'class_method'                 => array( $helper, 'increment' ),
+				'class_static_method'          => 'Helper_Class::static_increment',
+				'class_static_method_as_array' => array( 'Helper_Class', 'static_increment' ),
 			)
 		);
 
-		$this->assertSame( 5, gutenberg_interactivity_evaluate_reference( 'selectors.anonymous_function', $context->get_context() ) );
+		$this->assertSame( 5, gutenberg_interactivity_evaluate_reference( 'state.anonymous_function', 'test', $context->get_context() ) );
 		$this->assertSame(
 			'gutenberg_test_process_directives_helper_increment',
-			gutenberg_interactivity_evaluate_reference( 'selectors.function_name', $context->get_context() )
+			gutenberg_interactivity_evaluate_reference( 'state.function_name', 'test', $context->get_context() )
 		);
 		$this->assertSame(
 			array( $helper, 'increment' ),
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_method', $context->get_context() )
+			gutenberg_interactivity_evaluate_reference( 'state.class_method', 'test', $context->get_context() )
 		);
 		$this->assertSame(
 			'Helper_Class::static_increment',
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_static_method', $context->get_context() )
+			gutenberg_interactivity_evaluate_reference( 'state.class_static_method', 'test', $context->get_context() )
 		);
 		$this->assertSame(
 			array( 'Helper_Class', 'static_increment' ),
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_static_method_as_array', $context->get_context() )
+			gutenberg_interactivity_evaluate_reference( 'state.class_static_method_as_array', 'test', $context->get_context() )
 		);
 	}
 }
diff --git a/phpunit/experimental/interactivity-api/directives/wp-bind-test.php b/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
index bfb4c428cd946..ed49cfa7b3f9c 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
@@ -14,8 +14,9 @@
  */
 class Tests_Directives_WpBind extends WP_UnitTestCase {
 	public function test_directive_sets_attribute() {
-		$markup = '<img data-wp-bind--src="context.myblock.imageSource" />';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<img data-wp-bind--src="context.imageSource" />';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'imageSource' => './wordpress.png' ) ) );
@@ -23,7 +24,7 @@ public function test_directive_sets_attribute() {
 		gutenberg_interactivity_process_wp_bind( $tags, $context );
 
 		$this->assertSame(
-			'<img src="./wordpress.png" data-wp-bind--src="context.myblock.imageSource" />',
+			'<img src="./wordpress.png" data-wp-bind--src="context.imageSource" />',
 			$tags->get_updated_html()
 		);
 		$this->assertSame( './wordpress.png', $tags->get_attribute( 'src' ) );
@@ -31,8 +32,9 @@ public function test_directive_sets_attribute() {
 	}
 
 	public function test_directive_ignores_empty_bound_attribute() {
-		$markup = '<img data-wp-bind.="context.myblock.imageSource" />';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<img data-wp-bind="context.imageSource" />';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'imageSource' => './wordpress.png' ) ) );
diff --git a/phpunit/experimental/interactivity-api/directives/wp-class-test.php b/phpunit/experimental/interactivity-api/directives/wp-class-test.php
index 419546c6d9ef8..a8edf543902f2 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-class-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-class-test.php
@@ -14,8 +14,9 @@
  */
 class Tests_Directives_WpClass extends WP_UnitTestCase {
 	public function test_directive_adds_class() {
-		$markup = '<div data-wp-class--red="context.myblock.isRed" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-class--red="context.isRed" class="blue">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isRed' => true ) ) );
@@ -23,7 +24,7 @@ public function test_directive_adds_class() {
 		gutenberg_interactivity_process_wp_class( $tags, $context );
 
 		$this->assertSame(
-			'<div data-wp-class--red="context.myblock.isRed" class="blue red">Test</div>',
+			'<div data-wp-class--red="context.isRed" class="blue red">Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertStringContainsString( 'red', $tags->get_attribute( 'class' ) );
@@ -31,8 +32,9 @@ public function test_directive_adds_class() {
 	}
 
 	public function test_directive_removes_class() {
-		$markup = '<div data-wp-class--blue="context.myblock.isBlue" class="red blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-class--blue="context.isBlue" class="red blue">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
@@ -40,7 +42,7 @@ public function test_directive_removes_class() {
 		gutenberg_interactivity_process_wp_class( $tags, $context );
 
 		$this->assertSame(
-			'<div data-wp-class--blue="context.myblock.isBlue" class="red">Test</div>',
+			'<div data-wp-class--blue="context.isBlue" class="red">Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertStringNotContainsString( 'blue', $tags->get_attribute( 'class' ) );
@@ -48,8 +50,9 @@ public function test_directive_removes_class() {
 	}
 
 	public function test_directive_removes_empty_class_attribute() {
-		$markup = '<div data-wp-class--blue="context.myblock.isBlue" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-class--blue="context.isBlue" class="blue">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
@@ -57,8 +60,8 @@ public function test_directive_removes_empty_class_attribute() {
 		gutenberg_interactivity_process_wp_class( $tags, $context );
 
 		$this->assertSame(
-			// WP_HTML_Tag_Processor has a TODO note to prune whitespace after classname removal.
-			'<div data-wp-class--blue="context.myblock.isBlue" >Test</div>',
+			// WP_Directive_Processor has a TODO note to prune whitespace after classname removal.
+			'<div data-wp-class--blue="context.isBlue" >Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertNull( $tags->get_attribute( 'class' ) );
@@ -66,8 +69,9 @@ public function test_directive_removes_empty_class_attribute() {
 	}
 
 	public function test_directive_does_not_remove_non_existant_class() {
-		$markup = '<div data-wp-class--blue="context.myblock.isBlue" class="green red">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-class--blue="context.isBlue" class="green red">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
@@ -75,7 +79,7 @@ public function test_directive_does_not_remove_non_existant_class() {
 		gutenberg_interactivity_process_wp_class( $tags, $context );
 
 		$this->assertSame(
-			'<div data-wp-class--blue="context.myblock.isBlue" class="green red">Test</div>',
+			'<div data-wp-class--blue="context.isBlue" class="green red">Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertSame( 'green red', $tags->get_attribute( 'class' ) );
@@ -83,8 +87,9 @@ public function test_directive_does_not_remove_non_existant_class() {
 	}
 
 	public function test_directive_ignores_empty_class_name() {
-		$markup = '<div data-wp-class.="context.myblock.isRed" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-class="context.isRed" class="blue">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isRed' => true ) ) );
diff --git a/phpunit/experimental/interactivity-api/directives/wp-context-test.php b/phpunit/experimental/interactivity-api/directives/wp-context-test.php
index 1277b016848cc..a6a63f6303726 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-context-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-context-test.php
@@ -21,8 +21,9 @@ public function test_directive_merges_context_correctly_upon_wp_context_attribut
 			)
 		);
 
-		$markup = '<div data-wp-context=\'{ "myblock": { "open": true } }\'>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-context=\'{ "open": true }\'>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		gutenberg_interactivity_process_wp_context( $tags, $context );
@@ -38,38 +39,40 @@ public function test_directive_merges_context_correctly_upon_wp_context_attribut
 
 	public function test_directive_resets_context_correctly_upon_closing_tag() {
 		$context = new WP_Directive_Context(
-			array( 'my-key' => 'original-value' )
+			array( 'myblock' => array( 'my-key' => 'original-value' ) )
 		);
 
 		$context->set_context(
-			array( 'my-key' => 'new-value' )
+			array( 'myblock' => array( 'my-key' => 'new-value' ) )
 		);
 
 		$markup = '</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
+		$tags->push_namespace( 'myblock' );
 
 		gutenberg_interactivity_process_wp_context( $tags, $context );
 
 		$this->assertSame(
-			array( 'my-key' => 'original-value' ),
+			array( 'myblock' => array( 'my-key' => 'original-value' ) ),
 			$context->get_context()
 		);
 	}
 
 	public function test_directive_doesnt_throw_on_malformed_context_objects() {
 		$context = new WP_Directive_Context(
-			array( 'my-key' => 'some-value' )
+			array( 'myblock' => array( 'my-key' => 'some-value' ) )
 		);
 
 		$markup = '<div data-wp-context=\'{ "wrong_json_object: }\'>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
 		$tags->next_tag();
+		$tags->push_namespace( 'myblock' );
 
 		gutenberg_interactivity_process_wp_context( $tags, $context );
 
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 	}
@@ -83,14 +86,15 @@ public function test_directive_keeps_working_after_malformed_context_objects() {
 				</div>
 			</div>
 		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
 
 		// Parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
+		$tags->push_namespace( 'myblock' );
 		gutenberg_interactivity_process_wp_context( $tags, $context );
 
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -100,7 +104,7 @@ public function test_directive_keeps_working_after_malformed_context_objects() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -110,7 +114,7 @@ public function test_directive_keeps_working_after_malformed_context_objects() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -134,14 +138,15 @@ public function test_directive_keeps_working_with_a_directive_without_value() {
 				</div>
 			</div>
 		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 
 		// Parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
 		gutenberg_interactivity_process_wp_context( $tags, $context );
 
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -151,7 +156,7 @@ public function test_directive_keeps_working_with_a_directive_without_value() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -161,7 +166,7 @@ public function test_directive_keeps_working_with_a_directive_without_value() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -185,14 +190,15 @@ public function test_directive_keeps_working_with_an_empty_directive() {
 				</div>
 			</div>
 		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 
 		// Parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
 		gutenberg_interactivity_process_wp_context( $tags, $context );
 
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -202,7 +208,7 @@ public function test_directive_keeps_working_with_an_empty_directive() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -212,7 +218,7 @@ public function test_directive_keeps_working_with_an_empty_directive() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
diff --git a/phpunit/experimental/interactivity-api/directives/wp-style-test.php b/phpunit/experimental/interactivity-api/directives/wp-style-test.php
index 8942559b2fe89..18d4e285e2f72 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-style-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-style-test.php
@@ -14,8 +14,9 @@
  */
 class Tests_Directives_WpStyle extends WP_UnitTestCase {
 	public function test_directive_adds_style() {
-		$markup = '<div data-wp-style--color="context.myblock.color" style="background: blue;">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-style--color="context.color" style="background: blue;">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
@@ -23,7 +24,7 @@ public function test_directive_adds_style() {
 		gutenberg_interactivity_process_wp_style( $tags, $context );
 
 		$this->assertSame(
-			'<div data-wp-style--color="context.myblock.color" style="background: blue;color: green;">Test</div>',
+			'<div data-wp-style--color="context.color" style="background: blue;color: green;">Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertStringContainsString( 'color: green;', $tags->get_attribute( 'style' ) );
@@ -31,8 +32,9 @@ public function test_directive_adds_style() {
 	}
 
 	public function test_directive_ignores_empty_style() {
-		$markup = '<div data-wp-style.="context.myblock.color" style="background: blue;">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-style="context.color" style="background: blue;">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
diff --git a/phpunit/experimental/interactivity-api/directives/wp-text-test.php b/phpunit/experimental/interactivity-api/directives/wp-text-test.php
index 81d2d0f370a64..6ba00a5127d4f 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-text-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-text-test.php
@@ -14,31 +14,33 @@
  */
 class Tests_Directives_WpText extends WP_UnitTestCase {
 	public function test_directive_sets_inner_html_based_on_attribute_value_and_escapes_html() {
-		$markup = '<div data-wp-text="context.myblock.someText"></div>';
+		$markup = '<div data-wp-text="context.someText"></div>';
 
 		$tags = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'someText' => 'The HTML tag <br> produces a line break.' ) ) );
 		$context        = clone $context_before;
 		gutenberg_interactivity_process_wp_text( $tags, $context );
 
-		$expected_markup = '<div data-wp-text="context.myblock.someText">The HTML tag &lt;br&gt; produces a line break.</div>';
+		$expected_markup = '<div data-wp-text="context.someText">The HTML tag &lt;br&gt; produces a line break.</div>';
 		$this->assertSame( $expected_markup, $tags->get_updated_html() );
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-text directive changed context' );
 	}
 
 	public function test_directive_overwrites_inner_html_based_on_attribute_value() {
-		$markup = '<div data-wp-text="context.myblock.someText">Lorem ipsum dolor sit.</div>';
+		$markup = '<div data-wp-text="context.someText">Lorem ipsum dolor sit.</div>';
 
 		$tags = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'someText' => 'Honi soit qui mal y pense.' ) ) );
 		$context        = clone $context_before;
 		gutenberg_interactivity_process_wp_text( $tags, $context );
 
-		$expected_markup = '<div data-wp-text="context.myblock.someText">Honi soit qui mal y pense.</div>';
+		$expected_markup = '<div data-wp-text="context.someText">Honi soit qui mal y pense.</div>';
 		$this->assertSame( $expected_markup, $tags->get_updated_html() );
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-text directive changed context' );
 	}