diff --git a/radix-engine-tests/assets/blueprints/auth_scenarios/src/lib.rs b/radix-engine-tests/assets/blueprints/auth_scenarios/src/lib.rs
index 8b5014c281d..16de8b9d5f0 100644
--- a/radix-engine-tests/assets/blueprints/auth_scenarios/src/lib.rs
+++ b/radix-engine-tests/assets/blueprints/auth_scenarios/src/lib.rs
@@ -295,7 +295,7 @@ mod swappy {
 #[blueprint]
 mod count_of_zero {
     enable_function_auth! {
-        hi => AccessRule::Protected(AccessRuleNode::ProofRule(ProofRule::CountOf(0, vec![ResourceOrNonFungible::Resource(XRD)])));
+        hi => AccessRule::Protected(CompositeRequirement::BasicRequirement(ExplicitRequirement::CountOf(0, vec![ResourceOrNonFungible::Resource(XRD)])));
     }
 
     struct CountOfZero {}
diff --git a/radix-engine-tests/assets/blueprints/deep_sbor/src/deep_authrules_on_create.rs b/radix-engine-tests/assets/blueprints/deep_sbor/src/deep_authrules_on_create.rs
index 1c33732c601..f6adbf40fab 100644
--- a/radix-engine-tests/assets/blueprints/deep_sbor/src/deep_authrules_on_create.rs
+++ b/radix-engine-tests/assets/blueprints/deep_sbor/src/deep_authrules_on_create.rs
@@ -23,16 +23,16 @@ fn generate_deep_access_rules(
     resource_address: ResourceAddress,
     exceed_depth: usize,
 ) -> RoleAssignmentInit {
-    let mut access_rule_node = AccessRuleNode::ProofRule(ProofRule::Require(
+    let mut composite_requirement = CompositeRequirement::BasicRequirement(ExplicitRequirement::Require(
         ResourceOrNonFungible::Resource(resource_address),
     ));
     let mut curr_depth = 6; // The inner bit and the outer mapping
     while curr_depth < exceed_depth {
-        access_rule_node = AccessRuleNode::AllOf(vec![access_rule_node]);
+        composite_requirement = CompositeRequirement::AllOf(vec![composite_requirement]);
         curr_depth += 2;
     }
 
     roles2! {
-        "test" => AccessRule::Protected(access_rule_node.clone()), updatable;
+        "test" => AccessRule::Protected(composite_requirement.clone()), updatable;
     }
 }
diff --git a/radix-engine-tests/assets/blueprints/deep_sbor/src/deep_struct.rs b/radix-engine-tests/assets/blueprints/deep_sbor/src/deep_struct.rs
index 225a54c89f3..d56cd9c0d5d 100644
--- a/radix-engine-tests/assets/blueprints/deep_sbor/src/deep_struct.rs
+++ b/radix-engine-tests/assets/blueprints/deep_sbor/src/deep_struct.rs
@@ -24,16 +24,16 @@ fn generate_deep_access_rules(
     resource_address: ResourceAddress,
     exceed_depth: usize,
 ) -> RoleAssignmentInit {
-    let mut access_rule_node = AccessRuleNode::ProofRule(ProofRule::Require(
+    let mut composite_requirement = CompositeRequirement::BasicRequirement(ExplicitRequirement::Require(
         ResourceOrNonFungible::Resource(resource_address),
     ));
     let mut curr_depth = 6; // The inner bit and the outer mapping
     while curr_depth < exceed_depth {
-        access_rule_node = AccessRuleNode::AllOf(vec![access_rule_node]);
+        composite_requirement = CompositeRequirement::AllOf(vec![composite_requirement]);
         curr_depth += 2;
     }
 
     roles2! {
-        "test" => AccessRule::Protected(access_rule_node.clone()), updatable;
+        "test" => AccessRule::Protected(composite_requirement.clone()), updatable;
     }
 }