final spec changes

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/spec/src/main/asciidoc/appA-references.adoc b/spec/src/main/asciidoc/appA-references.adoc
index a6837a1..4f258a8 100644
--- a/spec/src/main/asciidoc/appA-references.adoc
+++ b/spec/src/main/asciidoc/appA-references.adoc
@@ -44,23 +44,26 @@
 W3C Recommendation 2 May 2001 +
 Available at _http://www.w3.org/TR/xmlschema-0/_.
 
-[BLOCH] Joshua Bloch, Effective Java, Chapter
-3, Typesafe Enums +
+[BLOCH] Joshua Bloch, Effective Java, +
+Chapter 3, Typesafe Enums +
 _http://developer.java.sun.com/developer/Books/shiftintojavapage1.html#replaceenum_.
 
-[BLOCH_2] Joshua Bloch, Effective Java,
+[BLOCH_2] Joshua Bloch, Effective Java, +
 Chapter 1, Item 1: Consider factory methods over constructors
 
 [RFC2396] Uniform Resource Identifiers (URI):
 Generic Syntax, +
 _http://www.ietf.org/rfc/rfc2396.txt._
 
-[JAX-RPC] Jakarta XML RPC, +
+[XML-RPC] Jakarta XML RPC, +
 _https://jakarta.ee/specifications/xml-rpc/_.
 
-[JAX-WS] Jakarta XML Web Services, +
+[XML-WS] Jakarta XML Web Services, +
 _https://jakarta.ee/specifications/xml-web-services/_.
 
+[JAXB 1.0] XML Data Binding Specification, +
+_https://jcp.org/en/jsr/detail?id=31_
+
 [JLS] or [JLS3] The Java Language
 Specification, 3rd Edition, Gosling, Joy, Steele, Bracha. +
 Available at
diff --git a/spec/src/main/asciidoc/appB-runtime_processing.adoc b/spec/src/main/asciidoc/appB-runtime_processing.adoc
index 3fbd1e8..1209086 100644
--- a/spec/src/main/asciidoc/appB-runtime_processing.adoc
+++ b/spec/src/main/asciidoc/appB-runtime_processing.adoc
@@ -7,26 +7,26 @@
 
 === Introduction
 
-Two of the important goals of JAXB 2.0 are
-portability (for inclusion in J2SE) and handling of invalid XML content
-(for e.g. schema evolution). These goals imply that a JAXB Provider must
-be capable of marshalling and unmarshalling XML instances using JAXB
-annotated classes derived using another JAXB Provider. To ensure
-portable behavior of JAXB mapped classes across JAXB Providers requires
-a specification of runtime processing model of the JAXB 2.0 binding
+Two of the important goals of Jakarta XML Binding specification are
+portability and handling of invalid XML content
+(for e.g. schema evolution). These goals imply that a Jakarta XML Binding Provider must
+be capable of marshalling and unmarshalling XML instances using Jakarta XML Binding
+annotated classes derived using another Jakarta XML Binding Provider. To ensure
+portable behavior of Jakarta XML Binding mapped classes across JAXB Providers requires
+a specification of runtime processing model of the Jakarta XML Binding binding
 framework.
 
 This appendix specifies the runtime
-processing model of XML instances and requirements on JAXB 2.0
+processing model of XML instances and requirements on Jakarta XML Binding
 Provider's runtime. It differs from the documentation found elsewhere in
 the specification/javadocs. Chapter 4,"Binding Framework" and the
-javadocs for the package jakarta.xml.bind do describe the JAXB 2.0 binding
-framework. But these are written from a JAXB 2.0 developer perspective
-rather than from a JAXB 2.0 Provider perspective and thus do not
-describe requirements on JAXB 2.0 Provider runtime. This was sufficient
+javadocs for the package jakarta.xml.bind do describe the Jakarta XML Binding binding
+framework. But these are written from a Jakarta XML Binding developer perspective
+rather than from a Jakarta XML Binding Provider perspective and thus do not
+describe requirements on Jakarta XML Binding Provider runtime. This was sufficient
 for JAXB 1.0 since portability was not a goal for JAXB 1.0 and schema
 derived implementation classes were coupled to the JAXB 1.0 Provider
-runtime. However, this is insufficient for JAXB 2.0, where portability
+runtime. However, this is insufficient for Jakarta XML Binding, where portability
 and handling invalid XML content are goals.
 
 === Scope and Conventions
diff --git a/spec/src/main/asciidoc/appG-deprecated.adoc b/spec/src/main/asciidoc/appG-deprecated.adoc
index 4f620b1..bee31a1 100644
--- a/spec/src/main/asciidoc/appG-deprecated.adoc
+++ b/spec/src/main/asciidoc/appG-deprecated.adoc
@@ -7,21 +7,17 @@
 
 === Overview
 
-Due to significant re-architecture in JAXB
-2.0 to improve efficiency, usability, schema-derived footprint and
+Due to significant re-architecture in Jakarta XML Binding
+to improve efficiency, usability, schema-derived footprint and
 binding framework runtime footprint, certain JAXB 1.0 operations are no
-longer required to be implemented in JAXB 2.0. These deprecated
-operations do still need to be supported by a JAXB 2.0 binding runtime
-for JAXB 1.0 schema-derived classes.
+longer required to be implemented in Jakarta XML Binding.
 
 === On-demand Validation
 
-It is optional for a JAXB 2.0 implementation
-to implement on-demand validation for JAXB 2.0 mapped classes. There is
-no reasonable way to implement this functionality of JAXB 2.0 annotated
-classes and leverage JAXP 1.3 validation facility. For backwards
-compatibility, an implementation is required to support this
-functionality for JAXB 1.0 schema-derived classes.
+It is optional for a Jakarta XML Binding implementation
+to implement on-demand validation for Jakarta XML Binding mapped classes. There is
+no reasonable way to implement this functionality of Jakarta XML Binding annotated
+classes and leverage JAXP validation facility.
 
 ==== Validator for JAXB 1.0 schema-derived classes
 
diff --git a/spec/src/main/asciidoc/appH-binary_data.adoc b/spec/src/main/asciidoc/appH-binary_data.adoc
index 6f4a313..9f2c2e8 100644
--- a/spec/src/main/asciidoc/appH-binary_data.adoc
+++ b/spec/src/main/asciidoc/appH-binary_data.adoc
@@ -14,7 +14,7 @@
 message passing environment, link:jaxb.html#a5149[See
 jakarta.xml.bind.attachments]“specifies an API that allows for an
 integrated, cooperative implementation of these standards between a
-MIME-based package processor and the JAXB 2.0 unmarshal/marshal
+MIME-based package processor and the Jakarta XML Binding unmarshal/marshal
 processes. An enhanced binding of MIME content to Java representation is
 specified in link:jaxb.html#a5113[See Binding MIME Binary
 Data].
@@ -28,12 +28,12 @@
 MIME content-type(s) for element content whose type derives from the xsd
 binary datatypes, `xs:base64Binary` or `xs:hexBinary`.
 
-JAXB 2.0 databinding recognizes this schema
+Jakarta XML Binding databinding recognizes this schema
 constraint to improve the binding of MIME type constrained binary data
 to Java representation. The `xmime:expectedContentType` attribute is
 allowed on type definitions deriving from binary datatypes and on
 element declarations with types that derive from binary datatypes. For
-JAXB 2.0 binding purposes, the schema annotation,
+Jakarta XML Binding binding purposes, the schema annotation,
 `xmime:expectedContentTypes` is evaluated for binding purposes for all
 cases EXCEPT when the annotation is on an element declaration with a
 named complex type definition. For that case, the
@@ -81,7 +81,7 @@
 </xs:schema>
 ----
 
-.JAXB 2.0 binding of Example 8-1
+.Jakarta XML Binding binding of Example 8-1
 [source,java,indent="4"]
 ----
 import java.awt.Image;
@@ -94,7 +94,7 @@
 ----
 
 The `@XmlMimeType` annotation provides the
-MIME content type needed by JAXB 2.0 Marshaller to specify the mime type
+MIME content type needed by Jakarta XML Binding Marshaller to specify the mime type
 to set `DataHandler.setContentType(String)`.
 
 .Schema for local element declaration annotated with known media type
@@ -165,7 +165,7 @@
 MIME-based package processor provides access to package-level
 information that is outside the scope of the JAXB unmarshal process. A
 MIME-based package processor registers its processing context with a
-JAXB 2.0 processor using the method
+Jakarta XML Binding processor using the method
 `setAttachmentUnmarshaller(AttachmentUnmarshaller)` of
 `jakarta.xml.bind.Unmarshaller`.
 
diff --git a/spec/src/main/asciidoc/appI-changelog.adoc b/spec/src/main/asciidoc/appI-changelog.adoc
index b568478..0cfa1c6 100644
--- a/spec/src/main/asciidoc/appI-changelog.adoc
+++ b/spec/src/main/asciidoc/appI-changelog.adoc
@@ -5,6 +5,39 @@
 [appendix]
 == Change Log
 
+=== Changes in Version 3
+
+* Changed specification version and license.
+* Package namespace changed to `jakarta.xml.bind.*`.
+* Customization schema namespace changed to `https://jakarta.ee/xml/ns/jaxb`,
+minimal supported version set to `3.0`.
+* Relaxed requirements tight to JAXB 1.0
+* Removed inclusion in Java SE from specification goals
+
+=== Changes since Maintenance Release 2
+
+* Section 4.2 added note related to Java Platform Module System.
+* Added section 4.9 Implementation discovery.
+* Added change logs for MR1 and MR2.
+
+=== Changes since Maintenance Release 1
+
+Details can be found at:
+_https://jcp.org/aboutJava/communityprocess/maintenance/jsr222/222mr2.zip_
+
+* Section 8.9.1.1 @XmlElement target extended for type PARAMETER
+* Section 8.9.3.1 added required annotation element to @XmlElementRef
+
+=== Changes since Final Draft
+
+Details can be found at:
+https://jcp.org/aboutJava/communityprocess/maintenance/jsr222/222changes.txt
+
+* Section 7.1.3 External Binding Declaration @schemaLocation and @node are optional.
+* Section E.2 3 and 3b updated.
+* Section 3.5.2.1 constraint violation updated JAXB 2.0 implementation
+delegate to the validation API in JAXP 1.3.
+
 === Changes since Proposed Final Draft
 
 * Section 7.6.1.2, nameXmlTransform: Apply
diff --git a/spec/src/main/asciidoc/ch01-introduction.adoc b/spec/src/main/asciidoc/ch01-introduction.adoc
index 1cead14..065b0bd 100644
--- a/spec/src/main/asciidoc/ch01-introduction.adoc
+++ b/spec/src/main/asciidoc/ch01-introduction.adoc
@@ -154,7 +154,7 @@
 
 === Goals
 
-The JAXB architecture is designed with the
+The Jakarta XML Binding architecture is designed with the
 goals outlined here in mind.
 
 * [[a25]]Full W3C XML Schema support +
@@ -194,8 +194,8 @@
 generation of artifacts such as derived classes or derived schema at
 either development or deployment time.
 Any requirements related to the deployment of
-components using JAXB in a container managed environment will be
-addressed.
+components using Jakarta XML Binding in a container managed environment
+will be addressed.
 
 * Schema evolution +
  +
@@ -227,20 +227,19 @@
 * Relationship to XML related specifications +
  +
 XML related specifications will be surveyed to
-determine their relationship to JAXB.
+determine their relationship to Jakarta XML Binding.
 
-* Portability of JAXB mapped classes +
+* Portability of Jakarta XML Binding mapped classes +
  +
 An architecture that provides for a fully
-portable JAXB 2.0 applications written to the J2SE platform will be
-defined. JAXB 2.0 is targeted for inclusion in a future version of J2SE.
-Application portability is a key requirement for inclusion in J2SE. +
+portable Jakarta XML Binding applications written to the Java SE platform
+will be defined. +
  +
-JAXB annotated classes must be source level
-and binary compatible with any other JAXB 2.0 binding framework
-implementation. As in JAXB 1.0, schema-derived interfaces/implementation
-classes are only required to be source code compatible with other JAXB
-implementations of the same version.
+Jakarta XML Binding annotated classes must be source level
+and binary compatible with any other Jakarta XML Binding binding framework
+implementation. Schema-derived interfaces/implementation
+classes are only required to be source code compatible with other
+Jakarta XML Binding implementations of the same version.
 
 * Preserving equivalence - Round tripping (Java to XML to Java) +
  +
@@ -253,8 +252,8 @@
 While JAXB 1.0 specification did not require
 the preservation of the XML information set when round tripping from XML
 document to Java representation and back to XML document again, it did
-not forbid the preservation either. The same applies to this version of
-the specification.
+not forbid the preservation either. The same applies to Jakarta XML Binding
+specification.
 
 * Unmarshalling invalid XML content +
  +
@@ -317,9 +316,9 @@
 
 * Support for Java versions prior to J2SE 5.0 +
  +
-JAXB 2.0 relies on many of the Java language
-features added in J2SE 5.0. It is not a goal to support JAXB 2.0 on Java
-versions prior to J2SE 5.0.
+Jakarta XML Binding relies on many of the Java language
+features added in J2SE 5.0. It is not a goal to support Jakarta XML Binding
+on Java versions prior to J2SE 5.0.
 
 * Explicit support for specifying the binding of DTD to a Java representation. +
  +
@@ -327,15 +326,15 @@
 binding DTD to a Java representation, it became impractical to describe
 both XML Schema binding and DTD binding. The existence of several
 conversion tools that automate the conversion of a DTD to XML Schema
-allows DTD users to be able to take advantage of JAXB technology by
-converting their existing DTDs to XML Schema.
+allows DTD users to be able to take advantage of Jakarta XML Binding
+technology by converting their existing DTDs to XML Schema.
 
 * XML Schema Extensions +
  +
 XML Schema specification allows the annotation
 of schemas and schema components with appinfo elements. JAXB 1.0
 specifies the use of appinfo elements to customize the generated code.
-For this version of the specification, use of appinfo elements for
+For Jakarta XML Binding specification, use of appinfo elements for
 customization of generated code continues to be in scope. However, use
 of appinfo element to introduce validation constraints beyond those
 already described in XML Schema 1.0 specification is out of scope.
@@ -352,17 +351,17 @@
 corresponding to an XML document it is often necessary to validate the
 tree against the constraints in the source schema. JAXB 1.0 made it
 possible to do this at any time, without the user having to first
-marshal the tree into XML. However it is a non goal in JAXB 2.0, which
-leverages the JAXP 1.3 validation API.
+marshal the tree into XML. However it is a non goal in Jakarta XML Binding
+specification, which leverages the JAXP validation API.
 
 * Object graph traversal +
  +
 Portable mechanisms to traverse a graph of
-JavaBean objects will not be addressed in JAXB 2.0.
+JavaBean objects will not be addressed in Jakarta XML Binding specification.
 
 * Mapping any existing Java classes to any existing XML schema +
  +
-The JAXB annotation mechanism is not
+The Jakarta XML Binding annotation mechanism is not
 sophisticated enough to enable mapping an arbitrary class to all XML
 schema concepts.
 
@@ -378,12 +377,13 @@
 Conforming implementations are required to behave as described;
 otherwise they are in error.
 
-Throughout the document, the XML namespace
+Throughout the document, references to JAXB refer to the Jakarta XML Binding
+unless otherwise noted. The XML namespace
 prefix `xs:` and `xsd:` refers to schema components in W3C XML Schema
 namespace as specified in [XSD Part 1] and [XSD Part 2]. The XML
 namespace prefix `xsi:` refers to the XML instance namespace defined in
 [XSD Part 1]. Additionally, the XML namespace prefix `jaxb:` refers to
-the JAXB namespace, `https://jakarta.ee/xml/ns/jaxb`. The XML
+the Jakarta XML Binding namespace, `https://jakarta.ee/xml/ns/jaxb`. The XML
 namespace prefix `ref:` refers to the namespace
 `http://ws-i.org/profiles/basic/1.1/xsd` as defined in [WSIBP] and
 [WSIAP].
@@ -480,8 +480,8 @@
 This document is a derivative work of concepts
 and an initial draft initially led by Mark Reinhold of Sun Microsystems.
 Our thanks to all who were involved in pioneering that initial effort.
-The feedback from the Java User community on the initial JAXB technology
-prototype greatly assisted in identifying requirements and directions.
+The feedback from the Java User community on the initial Jakarta XML Binding
+technology prototype greatly assisted in identifying requirements and directions.
 
 The data binding experiences of the expert
 group members have been instrumental in identifying the proper blend of
@@ -491,9 +491,9 @@
 
 Kohsuke Kawaguchi and Ryan Shoemaker have
 directly contributed content to the specification and wrote the
-companion javadoc. The following JAXB technology team members have been
-invaluable in keeping the specification effort on the right track: Tom
-Amiro, Leonid Arbouzov, Evgueni Astigueevitch, Jennifer Ball, Carla
+companion javadoc. The following Jakarta XML Binding technology team members
+have been invaluable in keeping the specification effort on the right track:
+Tom Amiro, Leonid Arbouzov, Evgueni Astigueevitch, Jennifer Ball, Carla
 Carlson, Patrick Curran, Scott Fordin, Omar Fung, Peter Kacandes, Dmitry
 Khukhro, Tom Kincaid, K. Ari Krupnikov, Ramesh Mandava, Bhakti Mehta, Ed
 Mooney, Ilya Neverov, Oleg Oleinik, Brian Ogata, Vivek Pandey, Cecilia
@@ -502,13 +502,13 @@
 Roberto Chinnici, Chris Ferris, Mark Hapner, Eve Maler, Farrukh Najmi,
 Eduardo Pelegri-llopart, Bill Shannon and Rahul Sharma.
 
-The JAXB TCK software team would like to
+The Jakarta XML Binding TCK software team would like to
 acknowledge that the NIST XML Schema test suite [NIST] has greatly
 assisted the conformance testing of this specification.
 
-=== Acknowledgements for JAXB 2.0
+=== Acknowledgements for Jakarta XML Binding
 
-Version 2.0 of this specification was created
+Original version of this specification was created
 under the Java Community Process as JSR-222. This specification is
 shaped by valuable input from expert group members, people with Sun, and
 Java User community feedback based on their experience with JAXB 1.0.
@@ -532,7 +532,7 @@
 Eduardo Pelegri-Llopart, Graham Hamilton, Mark Hapner, Bill Shannon.
 
 
-The JAXB TCK software team would like to
+The Jakarta XML Binding TCK software team would like to
 acknowledge that the NIST XML Schema test suite [NIST] has greatly
 assisted the conformance testing of this specification.
 
diff --git a/spec/src/main/asciidoc/ch03-architecture.adoc b/spec/src/main/asciidoc/ch03-architecture.adoc
index 8079c98..c207912 100644
--- a/spec/src/main/asciidoc/ch03-architecture.adoc
+++ b/spec/src/main/asciidoc/ch03-architecture.adoc
@@ -44,10 +44,10 @@
 As used in this specification, the term
 _schema_ includes the W3C XML Schema as defined in the XML Schema 1.0
 Recommendation[XSD Part 1][XSD Part 2]. link:jaxb.html#a210[See
-Non-Normative JAXB 2.0 Architecture diagram] illustrates relationships
+Non-Normative Jakarta XML Binding Architecture diagram] illustrates relationships
 between concepts introduced in this section.
 
-.[[a210]]Non-Normative JAXB 2.0 Architecture diagram
+.[[a210]]Non-Normative Jakarta XML Binding Architecture diagram
 image::images/xmlb-3.png[image]
 
 JAXB-annotated classes are common to both
@@ -110,9 +110,9 @@
 *_Interface_* JAXB 1.0 bound schema components
 (XML content) to schema derived content interfaces and implementation
 classes. The interface/implementation classes tightly couple the schema
-derived implementation classes to the JAXB implementation runtime
-framework and are thus not portable. The binding of schema components to
-schema derived interfaces continues to be supported in JAXB 2.0.
+derived implementation classes to the Jakarta XML Binding implementation
+runtime framework and are thus not portable. The binding of schema components to
+schema derived interfaces continues to be supported in Jakarta XML Binding.
 
 [NOTE]
 .Note
@@ -341,11 +341,11 @@
 ===== Validation Re architecture
 
 The detection of complex schema constraint
-violations has been redesigned to have a JAXB 2.0 implementation to
-delegate to the validation API in JAXP 1.3. JAXP 1.3 defines a standard
+violations has been redesigned to have a Jakarta XML Binding implementation to
+delegate to the validation API in JAXP. JAXP defines a standard
 validation API (`javax.xml.validation` package) for validating XML
-content against constraints within a schema. Furthermore, JAXP 1.3 has
-been incorporated into J2SE 5.0 platform. Any JAXB 2.0 implementation
+content against constraints within a schema. Furthermore, JAXP has
+been incorporated into J2SE 5.0 platform. Any Jakarta XML Binding implementation
 that takes advantage of the validation API will result in a smaller
 footprint.
 
@@ -368,7 +368,7 @@
 ===== Marshal Validation
 
 Validation may also be optionally performed
-at marshal time. This is new for JAXB 2.0. Validation of object graph
+at marshal time. This is new for Jakarta XML Binding. Validation of object graph
 while marshalling is useful in web services where the marshalled output
 must conform to schema constraints specified in a WSDL document. This
 could provide a valuable debugging aid for dealing with any
@@ -471,7 +471,7 @@
 
 Binding of purchase order schema to a Java
 representationfootnote:[In the interest of
-terseness, JAXB 2.0 program annotations have been ommitted.]:
+terseness, Jakarta XML Binding program annotations have been ommitted.]:
 
 [source,java,subs="+macros"]
 ----
diff --git a/spec/src/main/asciidoc/ch04-binding_framework.adoc b/spec/src/main/asciidoc/ch04-binding_framework.adoc
index b548dac..9b41d53 100644
--- a/spec/src/main/asciidoc/ch04-binding_framework.adoc
+++ b/spec/src/main/asciidoc/ch04-binding_framework.adoc
@@ -52,7 +52,7 @@
 Binding XML Schema to Java
 Representations]". All binding runtime frameworks are required
 to be able to marshal and unmarshal portable JAXB-annotated classes
-generated by other JAXB 2.0 schema binding compiler.
+generated by other Jakarta XML Binding schema binding compiler.
 
 It is not possible to require portability of
 the interface/implementation binding from JAXB 1.0. For backwards
@@ -192,8 +192,8 @@
 this feature.
 
 *  *On-demand validation* +
-This mode of validation is deprecated in JAXB
-2.0. See link:jaxb.html#a5094[See On-demand Validation]” for the
+This mode of validation is deprecated in Jakarta XML Binding.
+See link:jaxb.html#a5094[See On-demand Validation] for the
 JAXB 1.0 description of this functionality.
 
 *  *Fail-fast validation* +
@@ -423,7 +423,7 @@
 unable to recover from, it should abort the unmarshal process by
 throwing `UnmarshalException`.
 
-For example, it was valid for a JAXB
+For example, it was valid for a Jakarta XML Binding
 implementation to rigidly give up unmarshalling an invalid XML document
 once it came across an unexpected element/attribute or missed a required
 element or attribute. This mode appeals to users who prefer to be
@@ -475,7 +475,7 @@
 annotation driven. This process is specified in
 link:jaxb.html#a3855[See Appendix],
 link:jaxb.html#a3856[See Runtime Processing]”. Flexible
-unmarshalling is required for JAXB annotated classes.
+unmarshalling is required for Jakarta XML Binding annotated classes.
 
 === Marshalling
 
@@ -652,7 +652,7 @@
 }
 ----
 
-The JAXB 2.0 architecture has two uniquely
+The Jakarta XML Binding architecture has two uniquely
 different ways to represent an XML element.The XML Schema to Java
 binding for an XML element declaration is described in
 link:jaxb.html#a642[See Java Element Representation]”. The Java
diff --git a/spec/src/main/asciidoc/ch05-java_representation.adoc b/spec/src/main/asciidoc/ch05-java_representation.adoc
index a9b81c0..5b6c6ad 100644
--- a/spec/src/main/asciidoc/ch05-java_representation.adoc
+++ b/spec/src/main/asciidoc/ch05-java_representation.adoc
@@ -235,8 +235,7 @@
 
 ==== Java Content Interface
 
-JAXB 1.0 bound a complex type definition to a
-content interface. This binding is similar to the value class binding
+This binding is similar to the value class binding
 with the following differences.
 
 * A content interface is a public interface
@@ -871,8 +870,8 @@
 
 ==== Java Element Representation Summary
 
-Element declaration binding evolved in JAXB
-v2.0 to support XML Schema type substitution. The following diagrams
+Element declaration binding evolved inJakarta XML Binding
+to support XML Schema type substitution. The following diagrams
 illustrate the binding changes for the following schema fragment:
 
 [source,xml,indent=8]
@@ -883,14 +882,14 @@
 .JAXB 1.0: isA Relationship between generated element interface and its type
 image::images/xmlb-9.png[image]
 
-.JAXB 2.0: hasA Relationship between element instance and its type as described in link:jaxb.html#a645[See Named Java Element instance]”
+.Jakarta XML Binding: hasA Relationship between element instance and its type as described in link:jaxb.html#a645[See Named Java Element instance]”
 image::images/xmlb-10.png[image]
 
-.JAXB 2.0: hasA Relationship between generated element class and its type as described in link:jaxb.html#a657[See Java Element Class]”
+.Jakarta XML Binding: hasA Relationship between generated element class and its type as described in link:jaxb.html#a657[See Java Element Class]”
 image::images/xmlb-11.png[image]
 
-While a JAXB v1.0 Element interface
-implemented its type’s interface, a JAXB v2.0 Element instance has a
+While a JAXB 1.0 Element interface implemented its type’s interface,
+a Jakarta XML Binding Element instance has a
 composition relationship to the value of the element declaration’s type,
 accessible via the `jakarta.xml.bind.JAXBElement<T>` property `Value` .
 This change reflects the relationship that type substitution allows an
diff --git a/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc b/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc
index c2f1758..bbd106a 100644
--- a/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc
+++ b/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc
@@ -1077,10 +1077,10 @@
 link:jaxb.html#a1012[See Deriving Class Names for Named Model
 Group Descendants]."
 
-To meet the JAXB goal of predictable
+To meet the Jakarta XML Binding goal of predictable
 unmarshalling of invalid XML content, the JAXB 1.0 customization for
 binding a model group to a JAXB mapped class is no longer supported.
-link:jaxb.html#a386[See Flexible Unmarshalling]“details the
+link:jaxb.html#a386[See Flexible Unmarshalling] details the
 rationale behind this change.
 
 ==== Bind to a set of properties
diff --git a/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc b/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc
index 13cfc93..6c17526 100644
--- a/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc
+++ b/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc
@@ -167,7 +167,7 @@
 binding declarations. For example, a future version of this
 specification may use the version attribute to specify backward
 compatibility. To indicate this version of the specification, the
-`version should` be `"3.0"`. It is also valid for @version to be “1.0”.
+`version should` be `"3.0"`.
 If any other version is specified, it must result in an invalid
 customization as specified in link:jaxb.html#a1544[See Invalid
 Customizations].”
diff --git a/spec/src/main/asciidoc/ch09-compatibility.adoc b/spec/src/main/asciidoc/ch09-compatibility.adoc
index e739f28..bfb46c8 100644
--- a/spec/src/main/asciidoc/ch09-compatibility.adoc
+++ b/spec/src/main/asciidoc/ch09-compatibility.adoc
@@ -65,21 +65,9 @@
 
 A schema compiler MUST be able to generate
 Java classes that are able to run on at least one Sun's Reference
-Implementation of the J2SE Java Runtime Environment that is Java SE 5 or
+Implementation of the J2SE Java Runtime Environment that is J2SE 5 or
 higher.
 
 A schema generator MAY support non-default
 operating modes for mapping Java types to schema languages other than
 XML Schema.
-
-A Java platform configured with any JAXB 2.0
-implementation MUST allow any JAXB 1.0 application, packaged as
-specified by the JAXB 1.0 implementation used by the application, to run
-as specified by the JAXB 1.0 specification. A JAXB 1.0 application uses
-schema-derived classes generated by a JAXB 1.0 compliant schema compiler
-and is distributed with the compatible JAXB 1.0 runtime implementation.
-Unlike JAXB 2.0, JAXB 1.0 specified a tight coupling between a JAXB 1.0
-implementation’s schema-derived code and the JAXB 1.0 implementation of
-package `jakarta.xml.bind`. The required processing model for a JAXB 1.0
-schema compiler generated package is specified in
-`jakarta.xml.bind.JAXBContext` class javadoc under the heading *SPEC REQUIREMENT*.