diff --git a/shacl12-rules/index.html b/shacl12-rules/index.html
index 7fb7fdb5..9a079d71 100644
--- a/shacl12-rules/index.html
+++ b/shacl12-rules/index.html
@@ -179,7 +179,7 @@
       <p>
         SHACL Rules provides inferencing with the generation of new RDF data from a
         combination of a set of rules and a base data graph. Rules can be expressed as RDF
-        or in the SHACL Rules Language (SRL).
+        or in the Shape Rules Language (SRL).
       </p>
       <p>
         This specification is published by the
@@ -317,13 +317,13 @@ <h3>Document Conventions</h3>
       <p>This specification defines conformance criteria for:</p>
       <ul>
         <li><a href="#rule-set-evaluation">SHACL Rule Set evaluation</a></li>
-        <li><a href="#shape-rules-syntax">Shapes Rule Language</a></li>
+        <li><a href="#shape-rules-syntax">Shape Rules Language</a></li>
       </ul>
 
       <p>A conforming 
         <dfn 
-          data-lt="shapes rules language document|shapes rules document|ruleset document"
-          >Shapes Rules Language Document</dfn> is an
+          data-lt="shape rules document|ruleset document"
+          >Shape Rules Language Document</dfn> is an
         <a data-cite="RDF12-CONCEPTS#dfn-rdf-string">RDF string</a> that
         conforms to the grammar, starting with the
         <a href="#rRuleSet"><code>RuleSet</code></a>
@@ -340,7 +340,7 @@ <h3>Document Conventions</h3>
         <h3>Version Labels</h3>
         <p>
           A <dfn>version label</dfn> is a string that identifies the syntax and semantics conformance
-          for the Shacl Rules Language.
+          for the Shapes Rules Language.
         </p>
 
         <table id="tab-version-labels" class="simple">
@@ -601,7 +601,7 @@ <h3>Assignment and Creating RDF Terms</h3>
           their [=rule head=] are [=run-once rules=].
           Such rules are run after all the rules that could produce data that they depend on,
           and before any rules that depend on the data they produce. 
-          Rules that involve blank node in the [=rule head=] are also creating new
+          Rules that involve blank nodes in the [=rule head=] also create new
           RDF terms and are run-once rules.
         </p>
         <p>
@@ -710,7 +710,7 @@ <h2>Shape Rules Abstract Syntax</h2>
       <p>
         The Shape Rules Abstract Syntax is the logical structure of SHACL Rules.
         It is used to define the execution algorithm of SHACL Rules.
-        Each of the two concrete syntax forms of SHACL Rules, the SHACL Rules Language (SRL)
+        Each of the two concrete syntax forms of SHACL Rules, the Shape Rules Language (SRL)
         and the RDF syntax (SRL/RDF), provides a way to express the abstract syntax.
       </p>
 
@@ -967,8 +967,8 @@ <h3>Rule Dependency</h3>
           either as a [=triple pattern element=] or inside a [=negation element=].
         </p>
         <p>
-          There are two kinds of dependencies: 
-          [=closed dependencies=] and an [=open dependencies=].
+          There are two kinds of dependency: 
+          [=closed dependencies=] and [=open dependencies=].
           A <em>closed dependency</em> ensures that rule `R2`
           has generated all its possible output before rule `R1` is executed.
           If a rule dependency is not closed, it is an <em>open dependency</em>
@@ -995,7 +995,7 @@ <h3>Rule Dependency</h3>
           <dd>
           <p>
             A [=triple pattern=] matches a [=triple template=] if 
-            the triple template may generate a triple that matches the triple pattern.
+            the triple template can generate a triple that matches the triple pattern.
           </p>
           </dd>
 
@@ -1057,7 +1057,7 @@ <h3>Rule Dependency</h3>
           <p>
             A [=triple template=] with components `tSubj`, `tPred`, `tObj`
             can possibly generate a triple with component RDF terms
-            `s`, `p`, `o` if
+            `s`, `p`, `o` if all of the following are true:
           </p>
           <ul>
             <li>`tSubj` is a variable, or `tSubj` is the
@@ -1260,7 +1260,7 @@ <h3>Stratification</h3>
               blank nodes in the [=rule head=]; these rules are each evaluated exactly
               once at the start of evaluation of the [=stratification layer=].
               `SL.general` contains the remaining rules, which are evaluated 
-              until no new triples are inferred.
+              repeatedly until no new triples are inferred.
             </p>
           </dd>
           <dt><dfn>Stratification</dfn></dt>
@@ -1387,11 +1387,11 @@ <h4>Stratification Algorithm</h4>
     </section>
 
     <section id="concrete-syntax">
-      <h2>Concrete Syntax forms for Shapes Rules</h2>
+      <h2>Concrete Syntax forms for the Shape Rules Language</h2>
       <p>There are two concrete syntaxes.</p>
       <ul>
         <li><a href="#shape-rules-syntax">Shape Rules Language syntax</a></li>
-        <li><a href="#rdf-rules-syntax">RDF Rules syntax</a></li>
+        <li><a href="#rdf-rules-syntax">RDF Rule syntax</a></li>
       </ul>
 
       <aside class="note">
@@ -1545,7 +1545,7 @@ <h3>RDF Rules Syntax</h3>
 RULE { ?x :q :o } WHERE { ?x :p :o }
 RULE { ?x :q :o } WHERE { ?x :p :o1 ; :p :o2 }
 RULE { ?x :q :o } WHERE { ?x :p ?o . FILTER (?o &lt; 18) }
-RULE { ?x :q ?o } WHERE { ?x :p :o . SET (18 AS ?o) }
+RULE { ?x :q ?o } WHERE { ?x :p :o . SET (?o := 18) }
 RULE { ?x :q ?o } WHERE { ?x :p :o . NOT { ?s :p ?o . FILTER(?o &lt; 18) } }
 </pre>
 <pre class="example-rules">
@@ -2038,9 +2038,9 @@ <h3>Evaluation of a Rule Set</h3>
     </section>
 
     <section id="shapes-rules-grammar">
-      <h2>Shapes Rules Language Grammar</h2>
+      <h2>Shape Rules Language Grammar</h2>
 
-      <p>A <a>Shapes Rules Language document</a> is an <a data-cite="RDF12-CONCEPTS#dfn-rdf-string">RDF string</a>
+      <p>A <a>Shape Rules Language document</a> is an <a data-cite="RDF12-CONCEPTS#dfn-rdf-string">RDF string</a>
         encoded in UTF-8 [[!RFC3629]].
         Only <a data-cite="I18N-GLOSSARY#dfn-scalar-value" class="lint-ignore">Unicode scalar values</a>,
         in the ranges <code class="codepoint">U+0000</code> to <code class="codepoint">U+D7FF</code> 
@@ -2059,7 +2059,7 @@ <h3>White Space</h3>
           to separate two terminals which would otherwise be (mis-)recognized as one
           terminal. Rule names below in capitals indicate where white space is
           significant; these form a possible choice of terminals for constructing a
-          Shapes Rules Language parser.
+          Shape Rules Language parser.
         </p>
 
         <p>
@@ -2106,7 +2106,7 @@ <h3>IRI References</h3>
           such as a SOAP envelope with an `xml:base` directive or a MIME multipart document with a
           `Content-Location` header.
           The "Retrieval URI" identified in <a data-cite="RFC3986#section-5.1.3">5.1.3, Base "URI from the Retrieval URI"</a>,
-          is the URL from which a particular <a>Shapes Rules Language document</a> was retrieved.
+          is the URL from which a particular <a>Shape Rules Language document</a> was retrieved.
           If none of the above specifies the Base URI, the default
           Base URI (<a data-cite="RFC3986#section-5.1.4">section 5.1.4, "Default Base URI"</a>) is used.
           Each <a href="#rBaseDecl"><code>BASE</code></a> directive sets a new In-Scope Base URI,
@@ -2117,7 +2117,10 @@ <h3>IRI References</h3>
       <section id="escapes">
         <h3>Escape Sequences</h3>
 
-        <p>There are three forms of escapes used in <a>Shapes Rules documents</a>:</p>
+        <p>
+          There are three forms of escapes used in 
+          <a href="#dfn-shape-rules-language-document">Shape Rules documents</a>:
+        </p>
 
         <ul>
           <li>
@@ -2310,7 +2313,7 @@ <h3>Grammar</h3>
               When tokenizing the input and choosing grammar rules, the longest match is chosen.
             </li>
             <li>
-              The Shapes Rules Language grammar is LL(1) and LALR(1) when the rules with uppercased names
+              The Shape Rules Language grammar is LL(1) and LALR(1) when the rules with uppercased names
               are used as terminals.
             </li>
             <li>
@@ -2373,11 +2376,11 @@ <h3>Selected Terminal Literal Strings</h3>
     </section>
 
     <section id="mediaType" class="appendix">
-      <h2>Internet Media Type, File Extension and Macintosh File Type</h2>
+      <h2>Internet Media Type and File Extension</h2>
 
       <p>
         The Internet Media Type (formerly known as MIME Type) for the
-        Shapes Rules Language is
+        Shape Rules Language is
         "<code>application/shape-rules</code>".
       </p>
 
@@ -2415,7 +2418,7 @@ <h2>Internet Media Type, File Extension and Macintosh File Type</h2>
 
           <dt>Encoding considerations:</dt>
           <dd>
-            The syntax of the SHACL Rules Language is expressed over code points in Unicode
+            The syntax of the Shape Rules Language is expressed over code points in Unicode
             [[UNICODE]]. The encoding is always UTF-8 [[RFC3629]].</dd>
           <dd>Unicode code points may also be expressed using an \uXXXX (U+0 to U+FFFF) or
             \UXXXXXXXX syntax (for U+10000 onwards) where X is a hexadecimal digit [0-9A-F]