diff --git a/shacl12-test-suite/tests/sparql-rl/syntax/manifest.ttl b/shacl12-test-suite/tests/sparql-rl/syntax/manifest.ttl
index c5556dd72..4ec24d5b9 100644
--- a/shacl12-test-suite/tests/sparql-rl/syntax/manifest.ttl
+++ b/shacl12-test-suite/tests/sparql-rl/syntax/manifest.ttl
@@ -149,6 +149,8 @@ PREFIX srlt:   <http://www.w3.org/ns/sparql-rl-tests#>
         :test_137
         :test_138
         :test_139
+        :test_140
+        :test_141
     ) .
 
 :test_1 rdf:type   srlt:RulesPositiveSyntaxTest ;
@@ -182,666 +184,676 @@ PREFIX srlt:   <http://www.w3.org/ns/sparql-rl-tests#>
    .
 
 :test_7 rdf:type   srlt:RulesPositiveSyntaxTest ;
+   mf:name    "syntax-ruleset-structure-07.srl" ;
+   mf:action  <syntax-ruleset-structure-07.srl> ;
+   .
+
+:test_8 rdf:type   srlt:RulesPositiveSyntaxTest ;
+   mf:name    "syntax-ruleset-structure-08.srl" ;
+   mf:action  <syntax-ruleset-structure-08.srl> ;
+   .
+
+:test_9 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-terms-07.srl" ;
    mf:action  <syntax-rule-terms-07.srl> ;
    .
 
-:test_8 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_10 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-terms-08.srl" ;
    mf:action  <syntax-rule-terms-08.srl> ;
    .
 
-:test_9 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_11 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-terms-09.srl" ;
    mf:action  <syntax-rule-terms-09.srl> ;
    .
 
-:test_10 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_12 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-terms-10.srl" ;
    mf:action  <syntax-rule-terms-10.srl> ;
    .
 
-:test_11 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_13 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-terms-11.srl" ;
    mf:action  <syntax-rule-terms-11.srl> ;
    .
 
-:test_12 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_14 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-terms-12.srl" ;
    mf:action  <syntax-rule-terms-12.srl> ;
    .
 
-:test_13 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_15 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-terms-13.srl" ;
    mf:action  <syntax-rule-terms-13.srl> ;
    .
 
-:test_14 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_16 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-terms-14.srl" ;
    mf:action  <syntax-rule-terms-14.srl> ;
    .
 
-:test_15 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_17 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-terms-15.srl" ;
    mf:action  <syntax-rule-terms-15.srl> ;
    .
 
-:test_16 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_18 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-terms-16.srl" ;
    mf:action  <syntax-rule-terms-16.srl> ;
    .
 
-:test_17 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_19 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-paths-01.srl" ;
    mf:action  <syntax-rule-paths-01.srl> ;
    .
 
-:test_18 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_20 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-paths-02.srl" ;
    mf:action  <syntax-rule-paths-02.srl> ;
    .
 
-:test_19 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_21 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-paths-03.srl" ;
    mf:action  <syntax-rule-paths-03.srl> ;
    .
 
-:test_20 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_22 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-elements-filter-01.srl" ;
    mf:action  <syntax-rule-elements-filter-01.srl> ;
    .
 
-:test_21 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_23 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-elements-filter-02.srl" ;
    mf:action  <syntax-rule-elements-filter-02.srl> ;
    .
 
-:test_22 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_24 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-elements-filter-03.srl" ;
    mf:action  <syntax-rule-elements-filter-03.srl> ;
    .
 
-:test_23 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_25 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-elements-not-01.srl" ;
    mf:action  <syntax-rule-elements-not-01.srl> ;
    .
 
-:test_24 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_26 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-elements-not-02.srl" ;
    mf:action  <syntax-rule-elements-not-02.srl> ;
    .
 
-:test_25 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_27 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-elements-not-03.srl" ;
    mf:action  <syntax-rule-elements-not-03.srl> ;
    .
 
-:test_26 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_28 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-rule-elements-not-04.srl" ;
    mf:action  <syntax-rule-elements-not-04.srl> ;
    .
 
-:test_27 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_29 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-reification-01.srl" ;
    mf:action  <syntax-reification-01.srl> ;
    .
 
-:test_28 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_30 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-reification-02.srl" ;
    mf:action  <syntax-reification-02.srl> ;
    .
 
-:test_29 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_31 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-reification-03.srl" ;
    mf:action  <syntax-reification-03.srl> ;
    .
 
-:test_30 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_32 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-reification-04.srl" ;
    mf:action  <syntax-reification-04.srl> ;
    .
 
-:test_31 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_33 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-reification-05.srl" ;
    mf:action  <syntax-reification-05.srl> ;
    .
 
-:test_32 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_34 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-reification-06.srl" ;
    mf:action  <syntax-reification-06.srl> ;
    .
 
-:test_33 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_35 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-reification-07.srl" ;
    mf:action  <syntax-reification-07.srl> ;
    .
 
-:test_34 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_36 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-reification-08.srl" ;
    mf:action  <syntax-reification-08.srl> ;
    .
 
-:test_35 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_37 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-01.srl" ;
    mf:action  <syntax-data-01.srl> ;
    .
 
-:test_36 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_38 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-02.srl" ;
    mf:action  <syntax-data-02.srl> ;
    .
 
-:test_37 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_39 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-03.srl" ;
    mf:action  <syntax-data-03.srl> ;
    .
 
-:test_38 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_40 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-04.srl" ;
    mf:action  <syntax-data-04.srl> ;
    .
 
-:test_39 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_41 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-05.srl" ;
    mf:action  <syntax-data-05.srl> ;
    .
 
-:test_40 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_42 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-06.srl" ;
    mf:action  <syntax-data-06.srl> ;
    .
 
-:test_41 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_43 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-07.srl" ;
    mf:action  <syntax-data-07.srl> ;
    .
 
-:test_42 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_44 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-08.srl" ;
    mf:action  <syntax-data-08.srl> ;
    .
 
-:test_43 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_45 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-09.srl" ;
    mf:action  <syntax-data-09.srl> ;
    .
 
-:test_44 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_46 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-10.srl" ;
    mf:action  <syntax-data-10.srl> ;
    .
 
-:test_45 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_47 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-11.srl" ;
    mf:action  <syntax-data-11.srl> ;
    .
 
-:test_46 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_48 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-12.srl" ;
    mf:action  <syntax-data-12.srl> ;
    .
 
-:test_47 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_49 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-13.srl" ;
    mf:action  <syntax-data-13.srl> ;
    .
 
-:test_48 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_50 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-14.srl" ;
    mf:action  <syntax-data-14.srl> ;
    .
 
-:test_49 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_51 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-15.srl" ;
    mf:action  <syntax-data-15.srl> ;
    .
 
-:test_50 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_52 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-16.srl" ;
    mf:action  <syntax-data-16.srl> ;
    .
 
-:test_51 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_53 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-17.srl" ;
    mf:action  <syntax-data-17.srl> ;
    .
 
-:test_52 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_54 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-18.srl" ;
    mf:action  <syntax-data-18.srl> ;
    .
 
-:test_53 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_55 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-19.srl" ;
    mf:action  <syntax-data-19.srl> ;
    .
 
-:test_54 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_56 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-20.srl" ;
    mf:action  <syntax-data-20.srl> ;
    .
 
-:test_55 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_57 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-data-21.srl" ;
    mf:action  <syntax-data-21.srl> ;
    .
 
-:test_56 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_58 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-01.srl" ;
    mf:action  <syntax-template-01.srl> ;
    .
 
-:test_57 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_59 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-02.srl" ;
    mf:action  <syntax-template-02.srl> ;
    .
 
-:test_58 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_60 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-03.srl" ;
    mf:action  <syntax-template-03.srl> ;
    .
 
-:test_59 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_61 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-04.srl" ;
    mf:action  <syntax-template-04.srl> ;
    .
 
-:test_60 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_62 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-05.srl" ;
    mf:action  <syntax-template-05.srl> ;
    .
 
-:test_61 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_63 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-06.srl" ;
    mf:action  <syntax-template-06.srl> ;
    .
 
-:test_62 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_64 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-07.srl" ;
    mf:action  <syntax-template-07.srl> ;
    .
 
-:test_63 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_65 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-08.srl" ;
    mf:action  <syntax-template-08.srl> ;
    .
 
-:test_64 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_66 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-09.srl" ;
    mf:action  <syntax-template-09.srl> ;
    .
 
-:test_65 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_67 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-10.srl" ;
    mf:action  <syntax-template-10.srl> ;
    .
 
-:test_66 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_68 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-11.srl" ;
    mf:action  <syntax-template-11.srl> ;
    .
 
-:test_67 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_69 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-12.srl" ;
    mf:action  <syntax-template-12.srl> ;
    .
 
-:test_68 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_70 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-13.srl" ;
    mf:action  <syntax-template-13.srl> ;
    .
 
-:test_69 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_71 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-14.srl" ;
    mf:action  <syntax-template-14.srl> ;
    .
 
-:test_70 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_72 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-15.srl" ;
    mf:action  <syntax-template-15.srl> ;
    .
 
-:test_71 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_73 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-16.srl" ;
    mf:action  <syntax-template-16.srl> ;
    .
 
-:test_72 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_74 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-17.srl" ;
    mf:action  <syntax-template-17.srl> ;
    .
 
-:test_73 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_75 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-18.srl" ;
    mf:action  <syntax-template-18.srl> ;
    .
 
-:test_74 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_76 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-19.srl" ;
    mf:action  <syntax-template-19.srl> ;
    .
 
-:test_75 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_77 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-20.srl" ;
    mf:action  <syntax-template-20.srl> ;
    .
 
-:test_76 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_78 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-21.srl" ;
    mf:action  <syntax-template-21.srl> ;
    .
 
-:test_77 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_79 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-22.srl" ;
    mf:action  <syntax-template-22.srl> ;
    .
 
-:test_78 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_80 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-23.srl" ;
    mf:action  <syntax-template-23.srl> ;
    .
 
-:test_79 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_81 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-24.srl" ;
    mf:action  <syntax-template-24.srl> ;
    .
 
-:test_80 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_82 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-25.srl" ;
    mf:action  <syntax-template-25.srl> ;
    .
 
-:test_81 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_83 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-26.srl" ;
    mf:action  <syntax-template-26.srl> ;
    .
 
-:test_82 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_84 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-template-27.srl" ;
    mf:action  <syntax-template-27.srl> ;
    .
 
-:test_83 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_85 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-01.srl" ;
    mf:action  <syntax-pattern-01.srl> ;
    .
 
-:test_84 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_86 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-02.srl" ;
    mf:action  <syntax-pattern-02.srl> ;
    .
 
-:test_85 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_87 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-03.srl" ;
    mf:action  <syntax-pattern-03.srl> ;
    .
 
-:test_86 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_88 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-04.srl" ;
    mf:action  <syntax-pattern-04.srl> ;
    .
 
-:test_87 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_89 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-05.srl" ;
    mf:action  <syntax-pattern-05.srl> ;
    .
 
-:test_88 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_90 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-06.srl" ;
    mf:action  <syntax-pattern-06.srl> ;
    .
 
-:test_89 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_91 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-07.srl" ;
    mf:action  <syntax-pattern-07.srl> ;
    .
 
-:test_90 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_92 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-08.srl" ;
    mf:action  <syntax-pattern-08.srl> ;
    .
 
-:test_91 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_93 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-09.srl" ;
    mf:action  <syntax-pattern-09.srl> ;
    .
 
-:test_92 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_94 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-10.srl" ;
    mf:action  <syntax-pattern-10.srl> ;
    .
 
-:test_93 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_95 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-11.srl" ;
    mf:action  <syntax-pattern-11.srl> ;
    .
 
-:test_94 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_96 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-12.srl" ;
    mf:action  <syntax-pattern-12.srl> ;
    .
 
-:test_95 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_97 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-13.srl" ;
    mf:action  <syntax-pattern-13.srl> ;
    .
 
-:test_96 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_98 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-14.srl" ;
    mf:action  <syntax-pattern-14.srl> ;
    .
 
-:test_97 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_99 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-15.srl" ;
    mf:action  <syntax-pattern-15.srl> ;
    .
 
-:test_98 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_100 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-16.srl" ;
    mf:action  <syntax-pattern-16.srl> ;
    .
 
-:test_99 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_101 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-17.srl" ;
    mf:action  <syntax-pattern-17.srl> ;
    .
 
-:test_100 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_102 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-18.srl" ;
    mf:action  <syntax-pattern-18.srl> ;
    .
 
-:test_101 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_103 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-19.srl" ;
    mf:action  <syntax-pattern-19.srl> ;
    .
 
-:test_102 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_104 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-20.srl" ;
    mf:action  <syntax-pattern-20.srl> ;
    .
 
-:test_103 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_105 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-21.srl" ;
    mf:action  <syntax-pattern-21.srl> ;
    .
 
-:test_104 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_106 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-22.srl" ;
    mf:action  <syntax-pattern-22.srl> ;
    .
 
-:test_105 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_107 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-23.srl" ;
    mf:action  <syntax-pattern-23.srl> ;
    .
 
-:test_106 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_108 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-24.srl" ;
    mf:action  <syntax-pattern-24.srl> ;
    .
 
-:test_107 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_109 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-25.srl" ;
    mf:action  <syntax-pattern-25.srl> ;
    .
 
-:test_108 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_110 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-26.srl" ;
    mf:action  <syntax-pattern-26.srl> ;
    .
 
-:test_109 rdf:type   srlt:RulesPositiveSyntaxTest ;
+:test_111 rdf:type   srlt:RulesPositiveSyntaxTest ;
    mf:name    "syntax-pattern-27.srl" ;
    mf:action  <syntax-pattern-27.srl> ;
    .
 
-:test_110 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_112 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-rule-bad-01.srl" ;
    mf:action  <syntax-rule-bad-01.srl> ;
    .
 
-:test_111 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_113 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-rule-bad-02.srl" ;
    mf:action  <syntax-rule-bad-02.srl> ;
    .
 
-:test_112 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_114 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-rule-bad-03.srl" ;
    mf:action  <syntax-rule-bad-03.srl> ;
    .
 
-:test_113 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_115 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-rule-bad-04.srl" ;
    mf:action  <syntax-rule-bad-04.srl> ;
    .
 
-:test_114 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_116 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-rule-bad-05.srl" ;
    mf:action  <syntax-rule-bad-05.srl> ;
    .
 
-:test_115 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_117 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-rule-bad-06.srl" ;
    mf:action  <syntax-rule-bad-06.srl> ;
    .
 
-:test_116 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_118 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-rule-terms-bad-01.srl" ;
    mf:action  <syntax-rule-terms-bad-01.srl> ;
    .
 
-:test_117 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_119 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-rule-terms-bad-02.srl" ;
    mf:action  <syntax-rule-terms-bad-02.srl> ;
    .
 
-:test_118 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_120 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-rule-terms-bad-03.srl" ;
    mf:action  <syntax-rule-terms-bad-03.srl> ;
    .
 
-:test_119 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_121 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-01.srl" ;
    mf:action  <syntax-data-bad-01.srl> ;
    .
 
-:test_120 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_122 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-02.srl" ;
    mf:action  <syntax-data-bad-02.srl> ;
    .
 
-:test_121 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_123 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-03.srl" ;
    mf:action  <syntax-data-bad-03.srl> ;
    .
 
-:test_122 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_124 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-04.srl" ;
    mf:action  <syntax-data-bad-04.srl> ;
    .
 
-:test_123 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_125 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-05.srl" ;
    mf:action  <syntax-data-bad-05.srl> ;
    .
 
-:test_124 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_126 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-06.srl" ;
    mf:action  <syntax-data-bad-06.srl> ;
    .
 
-:test_125 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_127 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-07.srl" ;
    mf:action  <syntax-data-bad-07.srl> ;
    .
 
-:test_126 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_128 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-08.srl" ;
    mf:action  <syntax-data-bad-08.srl> ;
    .
 
-:test_127 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_129 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-09.srl" ;
    mf:action  <syntax-data-bad-09.srl> ;
    .
 
-:test_128 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_130 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-10.srl" ;
    mf:action  <syntax-data-bad-10.srl> ;
    .
 
-:test_129 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_131 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-data-bad-11.srl" ;
    mf:action  <syntax-data-bad-11.srl> ;
    .
 
-:test_130 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_132 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-template-bad-01.srl" ;
    mf:action  <syntax-template-bad-01.srl> ;
    .
 
-:test_131 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_133 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-template-bad-02.srl" ;
    mf:action  <syntax-template-bad-02.srl> ;
    .
 
-:test_132 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_134 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-template-bad-03.srl" ;
    mf:action  <syntax-template-bad-03.srl> ;
    .
 
-:test_133 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_135 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-template-bad-04.srl" ;
    mf:action  <syntax-template-bad-04.srl> ;
    .
 
-:test_134 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_136 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-template-bad-05.srl" ;
    mf:action  <syntax-template-bad-05.srl> ;
    .
 
-:test_135 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_137 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-template-bad-06.srl" ;
    mf:action  <syntax-template-bad-06.srl> ;
    .
 
-:test_136 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_138 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-pattern-bad-01.srl" ;
    mf:action  <syntax-pattern-bad-01.srl> ;
    .
 
-:test_137 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_139 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-pattern-bad-02.srl" ;
    mf:action  <syntax-pattern-bad-02.srl> ;
    .
 
-:test_138 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_140 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-pattern-bad-03.srl" ;
    mf:action  <syntax-pattern-bad-03.srl> ;
    .
 
-:test_139 rdf:type   srlt:RulesNegativeSyntaxTest ;
+:test_141 rdf:type   srlt:RulesNegativeSyntaxTest ;
    mf:name    "syntax-pattern-bad-04.srl" ;
    mf:action  <syntax-pattern-bad-04.srl> ;
    .
diff --git a/shacl12-test-suite/tests/sparql-rl/syntax/syntax-ruleset-structure-06.srl b/shacl12-test-suite/tests/sparql-rl/syntax/syntax-ruleset-structure-06.srl
index 6d7d7d41c..51747901a 100644
--- a/shacl12-test-suite/tests/sparql-rl/syntax/syntax-ruleset-structure-06.srl
+++ b/shacl12-test-suite/tests/sparql-rl/syntax/syntax-ruleset-structure-06.srl
@@ -1,5 +1,7 @@
 PREFIX : <http://example/>
+RULE {} WHERE { }
 
-RULE :ruleLN {}
-WHERE
-{ }
+PREFIX ns1: <http://example/ns#>
+PREFIX ns2: <http://example/ns#>
+
+RULE {} WHERE { :x :p ns1:o }
diff --git a/shacl12-test-suite/tests/sparql-rl/syntax/syntax-ruleset-structure-07.srl b/shacl12-test-suite/tests/sparql-rl/syntax/syntax-ruleset-structure-07.srl
new file mode 100644
index 000000000..6552c80ee
--- /dev/null
+++ b/shacl12-test-suite/tests/sparql-rl/syntax/syntax-ruleset-structure-07.srl
@@ -0,0 +1,6 @@
+PREFIX : <http://example/>
+RULE {} WHERE { }
+
+BASE <http://example/otherbase/>
+PREFIX ns1: <http://example/ns#>
+PREFIX ns2: <http://example/ns#>
diff --git a/shacl12-test-suite/tests/sparql-rl/syntax/syntax-ruleset-structure-08.srl b/shacl12-test-suite/tests/sparql-rl/syntax/syntax-ruleset-structure-08.srl
new file mode 100644
index 000000000..6d7d7d41c
--- /dev/null
+++ b/shacl12-test-suite/tests/sparql-rl/syntax/syntax-ruleset-structure-08.srl
@@ -0,0 +1,5 @@
+PREFIX : <http://example/>
+
+RULE :ruleLN {}
+WHERE
+{ }
diff --git a/sparql12-rl/sparql-rl-grammar.bnf b/sparql12-rl/sparql-rl-grammar.bnf
index e060651f2..79ac8e1a0 100644
--- a/sparql12-rl/sparql-rl-grammar.bnf
+++ b/sparql12-rl/sparql-rl-grammar.bnf
@@ -1,5 +1,5 @@
 [1]    RuleSet                   ::= RuleOrDataBlock
-[2]    RuleOrDataBlock           ::= Prologue ( RuleOrData+ ( Prologue1 RuleOrData? )* )?
+[2]    RuleOrDataBlock           ::= Prologue ( RuleOrData+ ( Prologue1 RuleOrData* )* )?
 [3]    RuleOrData                ::= Rule | Data
 [4]    Prologue                  ::= Prologue1*
 [5]    Prologue1                 ::= BaseDecl | PrefixDecl | VersionDecl | ImportsDecl
diff --git a/sparql12-rl/sparql-rl-grammar.html b/sparql12-rl/sparql-rl-grammar.html
index a522e4adf..035d5f097 100644
--- a/sparql12-rl/sparql-rl-grammar.html
+++ b/sparql12-rl/sparql-rl-grammar.html
@@ -13,7 +13,7 @@
         <td><code>[2]</code></td>
         <td><code><span class="doc-ref" id="rRuleOrDataBlock">RuleOrDataBlock</span></code></td>
         <td>::=</td>
-        <td><code class="gRuleBody"><a href="#rPrologue">Prologue</a> ( <a href="#rRuleOrData">RuleOrData</a>+ ( <a href="#rPrologue1">Prologue1</a> <a href="#rRuleOrData">RuleOrData</a>? )* )?</code></td>
+        <td><code class="gRuleBody"><a href="#rPrologue">Prologue</a> ( <a href="#rRuleOrData">RuleOrData</a>+ ( <a href="#rPrologue1">Prologue1</a> <a href="#rRuleOrData">RuleOrData</a>* )* )?</code></td>
       </tr>
 
       <tr style="vertical-align: baseline">