sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 02/02: Documentation update: replace "gmd" prefix from legacy ISO 19139 specification by the prefixes used in new ISO 19115-3 specification.
Date Sat, 20 Oct 2018 13:58:19 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 3301523d66aa26deeaa2b691d7eac0e69cd748ee
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Sat Oct 20 15:38:28 2018 +0200

    Documentation update: replace "gmd" prefix from legacy ISO 19139 specification by the prefixes used in new ISO 19115-3 specification.
---
 .../java/org/apache/sis/internal/jaxb/gmi/package-info.java    |  2 +-
 .../main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java |  2 +-
 .../main/java/org/apache/sis/internal/jaxb/gml/Measure.java    |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/CI_Address.java |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/CI_Citation.java     |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/CI_Date.java    |  4 ++--
 .../apache/sis/internal/jaxb/metadata/CI_OnlineResource.java   |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/CI_Party.java   |  4 ++--
 .../apache/sis/internal/jaxb/metadata/CI_Responsibility.java   |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/CI_Series.java  |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/CI_Telephone.java    |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java  |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java |  4 ++--
 .../sis/internal/jaxb/metadata/DQ_PositionalAccuracy.java      |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java  |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java  |  4 ++--
 .../apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java |  4 ++--
 .../apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java   |  4 ++--
 .../apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java   |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java    |  4 ++--
 .../sis/internal/jaxb/metadata/LE_NominalResolution.java       |  4 ++--
 .../sis/internal/jaxb/metadata/LE_ProcessStepReport.java       |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/LE_Processing.java   |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java  |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/LI_Source.java  |  4 ++--
 .../jaxb/metadata/MD_ApplicationSchemaInformation.java         |  4 ++--
 .../sis/internal/jaxb/metadata/MD_AssociatedResource.java      |  4 ++--
 .../apache/sis/internal/jaxb/metadata/MD_AttributeGroup.java   |  4 ++--
 .../apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java    |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MD_Constraints.java  |  4 ++--
 .../sis/internal/jaxb/metadata/MD_ContentInformation.java      |  4 ++--
 .../sis/internal/jaxb/metadata/MD_DataIdentification.java      |  4 ++--
 .../sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java  |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MD_Dimension.java    |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MD_Distribution.java |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MD_Distributor.java  |  4 ++--
 .../internal/jaxb/metadata/MD_ExtendedElementInformation.java  |  4 ++--
 .../apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java  |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/MD_Format.java  |  4 ++--
 .../apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java |  4 ++--
 .../apache/sis/internal/jaxb/metadata/MD_Identification.java   |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MD_Identifier.java   |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MD_Keywords.java     |  4 ++--
 .../sis/internal/jaxb/metadata/MD_MaintenanceInformation.java  |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java  |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MD_Metadata.java     |  4 ++--
 .../jaxb/metadata/MD_MetadataExtensionInformation.java         |  4 ++--
 .../apache/sis/internal/jaxb/metadata/MD_MetadataScope.java    |  4 ++--
 .../internal/jaxb/metadata/MD_PortrayalCatalogueReference.java |  4 ++--
 .../apache/sis/internal/jaxb/metadata/MD_RangeDimension.java   |  4 ++--
 .../apache/sis/internal/jaxb/metadata/MD_Releasability.java    |  4 ++--
 .../sis/internal/jaxb/metadata/MD_RepresentativeFraction.java  |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MD_Resolution.java   |  4 ++--
 .../apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java |  4 ++--
 .../sis/internal/jaxb/metadata/MD_SpatialRepresentation.java   |  4 ++--
 .../sis/internal/jaxb/metadata/MD_StandardOrderProcess.java    |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java   |  4 ++--
 .../sis/internal/jaxb/metadata/MI_AcquisitionInformation.java  |  4 ++--
 .../sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java     |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/MI_Event.java   |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/MI_GCP.java     |  4 ++--
 .../sis/internal/jaxb/metadata/MI_GeolocationInformation.java  |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MI_Instrument.java   |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MI_Objective.java    |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MI_Operation.java    |  4 ++--
 .../java/org/apache/sis/internal/jaxb/metadata/MI_Plan.java    |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MI_Platform.java     |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MI_PlatformPass.java |  4 ++--
 .../sis/internal/jaxb/metadata/MI_RangeElementDescription.java |  4 ++--
 .../apache/sis/internal/jaxb/metadata/MI_RequestedDate.java    |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/MI_Requirement.java  |  4 ++--
 .../org/apache/sis/internal/jaxb/metadata/package-info.java    |  3 +--
 .../src/main/java/org/apache/sis/util/iso/Types.java           | 10 +++++-----
 .../src/main/java/org/apache/sis/xml/ReferenceResolver.java    |  8 ++++----
 77 files changed, 156 insertions(+), 157 deletions(-)

diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/package-info.java
index 482d7fb..0b6fc56 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/package-info.java
@@ -26,7 +26,7 @@
  * <p>In SIS implementation, users need to care only about the public classes defined in
  * the {@link org.apache.sis.metadata.iso} package. When marshalling, the adapters will
  * inspect the properties that are ISO 19115-2 extensions and copy automatically the
- * {@code "gmd"} metadata into a {@code "gmi"} metadata if any ISO 19115-2 property is
+ * {@code "MD_"} metadata into a {@code "MI_"} metadata if any ISO 19115-2 property is
  * non-null or non-empty. This work is performed by a {@code castOrCopy} static method
  * defined in each class of this package.</p>
  *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java
index a59b5d1..d73be7b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java
@@ -46,7 +46,7 @@ public abstract class GMLAdapter {
      * The period identifier, or {@code null} if undefined.
      * This element is part of GML 3.1.1 specification.
      *
-     * <div class="section">Difference between {@code gmd:uuid} and {@code gml:id}</div>
+     * <div class="section">Difference between {@code gco:uuid} and {@code gml:id}</div>
      * <ul>
      *   <li>{@code id} is a standard <strong>GML</strong> attribute available on every
      *       object-with-identity. It has type={@code "xs:ID"} - i.e. it is a fragment
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
index cda7664..e37aafa 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
@@ -47,9 +47,9 @@ import org.apache.sis.measure.Units;
  * (as a substitution for XML type {@code gco:Measure}):
  *
  * {@preformat xml
- *   <gmd:distance>
+ *   <mri:distance>
  *     <gco:Distance uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
- *   </gmd:distance>
+ *   </mri:distance>
  * }
  *
  * while GML will rather use a a syntax like below:
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java
index 6707543..10ac6c5 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java
@@ -60,7 +60,7 @@ public final class CI_Address extends PropertyType<CI_Address, Address> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:CI_Address>} XML element.
+     * in a {@code <cit:CI_Address>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class CI_Address extends PropertyType<CI_Address, Address> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:CI_Address>} XML element.
+     * inside the {@code <cit:CI_Address>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java
index 409c878..c2023d7 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java
@@ -60,7 +60,7 @@ public class CI_Citation extends PropertyType<CI_Citation, Citation> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:CI_Citation>} XML element.
+     * in a {@code <cit:CI_Citation>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public class CI_Citation extends PropertyType<CI_Citation, Citation> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:CI_Citation>} XML element.
+     * inside the {@code <cit:CI_Citation>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java
index efe6736..595730f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java
@@ -60,7 +60,7 @@ public final class CI_Contact extends PropertyType<CI_Contact, Contact> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:CI_Contact>} XML element.
+     * in a {@code <cit:CI_Contact>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class CI_Contact extends PropertyType<CI_Contact, Contact> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:CI_Contact>} XML element.
+     * inside the {@code <cit:CI_Contact>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java
index 9a8f225..e1b6aa3 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java
@@ -60,7 +60,7 @@ public final class CI_Date extends PropertyType<CI_Date, CitationDate> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:CI_Date>} XML element.
+     * in a {@code <cit:CI_Date>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class CI_Date extends PropertyType<CI_Date, CitationDate> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:CI_Date>} XML element.
+     * inside the {@code <cit:CI_Date>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java
index c789df4..ab8b83f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java
@@ -60,7 +60,7 @@ public class CI_OnlineResource extends PropertyType<CI_OnlineResource, OnlineRes
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:CI_OnlineResource>} XML element.
+     * in a {@code <cit:CI_OnlineResource>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public class CI_OnlineResource extends PropertyType<CI_OnlineResource, OnlineRes
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:CI_OnlineResource>} XML element.
+     * inside the {@code <cit:CI_OnlineResource>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Party.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Party.java
index 9bda4e9..f187585 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Party.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Party.java
@@ -59,7 +59,7 @@ public final class CI_Party extends PropertyType<CI_Party, Party> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:CI_Party>} XML element.
+     * in a {@code <cit:CI_Party>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -71,7 +71,7 @@ public final class CI_Party extends PropertyType<CI_Party, Party> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:CI_Party>} XML element.
+     * inside the {@code <cit:CI_Party>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
index d5fa16b..a59f728 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
@@ -63,7 +63,7 @@ public final class CI_Responsibility extends PropertyType<CI_Responsibility, Res
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:CI_Responsibility>} XML element.
+     * in a {@code <cit:CI_Responsibility>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -75,7 +75,7 @@ public final class CI_Responsibility extends PropertyType<CI_Responsibility, Res
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:CI_Responsibility>} XML element.
+     * inside the {@code <cit:CI_Responsibility>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java
index d2a7bb6..aa50b5d 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java
@@ -60,7 +60,7 @@ public final class CI_Series extends PropertyType<CI_Series, Series> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:CI_Series>} XML element.
+     * in a {@code <cit:CI_Series>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class CI_Series extends PropertyType<CI_Series, Series> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:CI_Series>} XML element.
+     * inside the {@code <cit:CI_Series>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java
index 8a26b44..4a6f09a 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java
@@ -60,7 +60,7 @@ public final class CI_Telephone extends PropertyType<CI_Telephone, Telephone> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:CI_Telephone>} XML element.
+     * in a {@code <cit:CI_Telephone>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class CI_Telephone extends PropertyType<CI_Telephone, Telephone> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:CI_Telephone>} XML element.
+     * inside the {@code <cit:CI_Telephone>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java
index c4125d9..5032c8b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java
@@ -60,7 +60,7 @@ public final class DQ_DataQuality extends PropertyType<DQ_DataQuality, DataQuali
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:DQ_DataQuality>} XML element.
+     * in a {@code <mdq:DQ_DataQuality>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class DQ_DataQuality extends PropertyType<DQ_DataQuality, DataQuali
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:DQ_DataQuality>} XML element.
+     * inside the {@code <mdq:DQ_DataQuality>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java
index f8ab742..97bbe6c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java
@@ -60,7 +60,7 @@ public final class DQ_Element extends PropertyType<DQ_Element, Element> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:DQ_Element>} XML element.
+     * in a {@code <mdq:DQ_Element>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class DQ_Element extends PropertyType<DQ_Element, Element> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:DQ_Element>} XML element.
+     * inside the {@code <mdq:DQ_Element>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_PositionalAccuracy.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_PositionalAccuracy.java
index 84110cc..6bcbd6b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_PositionalAccuracy.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_PositionalAccuracy.java
@@ -59,7 +59,7 @@ public final class DQ_PositionalAccuracy extends PropertyType<DQ_PositionalAccur
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:DQ_PositionalAccuracy>} XML element.
+     * in a {@code <mdq:DQ_PositionalAccuracy>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -71,7 +71,7 @@ public final class DQ_PositionalAccuracy extends PropertyType<DQ_PositionalAccur
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:DQ_PositionalAccuracy>} XML element.
+     * inside the {@code <mdq:DQ_PositionalAccuracy>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java
index 7f8dea7..af94a62 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java
@@ -60,7 +60,7 @@ public final class DQ_Result extends PropertyType<DQ_Result, Result> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:DQ_Result>} XML element.
+     * in a {@code <mdq:DQ_Result>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class DQ_Result extends PropertyType<DQ_Result, Result> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:DQ_Result>} XML element.
+     * inside the {@code <mdq:DQ_Result>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java
index 2501af7..97a0fd8 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java
@@ -60,7 +60,7 @@ public final class EX_Extent extends PropertyType<EX_Extent, Extent> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:EX_Extent>} XML element.
+     * in a {@code <gex:EX_Extent>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class EX_Extent extends PropertyType<EX_Extent, Extent> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:EX_Extent>} XML element.
+     * inside the {@code <gex:EX_Extent>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java
index d0da62b..affd0f5 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java
@@ -60,7 +60,7 @@ public final class EX_GeographicExtent extends PropertyType<EX_GeographicExtent,
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:EX_GeographicExtent>} XML element.
+     * in a {@code <gex:EX_GeographicExtent>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class EX_GeographicExtent extends PropertyType<EX_GeographicExtent,
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:EX_GeographicExtent>} XML element.
+     * inside the {@code <gex:EX_GeographicExtent>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java
index 50c72de..9fae516 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java
@@ -60,7 +60,7 @@ public final class EX_TemporalExtent extends PropertyType<EX_TemporalExtent, Tem
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:EX_TemporalExtent>} XML element.
+     * in a {@code <gex:EX_TemporalExtent>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class EX_TemporalExtent extends PropertyType<EX_TemporalExtent, Tem
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:EX_TemporalExtent>} XML element.
+     * inside the {@code <gex:EX_TemporalExtent>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java
index d297319..62b2928 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java
@@ -60,7 +60,7 @@ public final class EX_VerticalExtent extends PropertyType<EX_VerticalExtent, Ver
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:EX_VerticalExtent>} XML element.
+     * in a {@code <gex:EX_VerticalExtent>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class EX_VerticalExtent extends PropertyType<EX_VerticalExtent, Ver
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:EX_VerticalExtent>} XML element.
+     * inside the {@code <gex:EX_VerticalExtent>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java
index 6e0c5a4..5f17635 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java
@@ -61,7 +61,7 @@ public final class LE_Algorithm extends PropertyType<LE_Algorithm, Algorithm> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:LE_Algorithm>} XML element.
+     * in a {@code <mrl:LE_Algorithm>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -73,7 +73,7 @@ public final class LE_Algorithm extends PropertyType<LE_Algorithm, Algorithm> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:LE_Algorithm>} XML element.
+     * inside the {@code <mrl:LE_Algorithm>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java
index 6f5f7b0..5b135c7 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java
@@ -60,7 +60,7 @@ public final class LE_NominalResolution extends PropertyType<LE_NominalResolutio
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:LE_NominalResolution>} XML element.
+     * in a {@code <mrl:LE_NominalResolution>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class LE_NominalResolution extends PropertyType<LE_NominalResolutio
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:LE_NominalResolution>} XML element.
+     * inside the {@code <mrl:LE_NominalResolution>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java
index e287351..5aa29fb 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java
@@ -60,7 +60,7 @@ public final class LE_ProcessStepReport extends PropertyType<LE_ProcessStepRepor
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:LE_ProcessStepReport>} XML element.
+     * in a {@code <mrl:LE_ProcessStepReport>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class LE_ProcessStepReport extends PropertyType<LE_ProcessStepRepor
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:LE_ProcessStepReport>} XML element.
+     * inside the {@code <mrl:LE_ProcessStepReport>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java
index b6e8fef..86e575d 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java
@@ -60,7 +60,7 @@ public final class LE_Processing extends PropertyType<LE_Processing, Processing>
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:LE_Processing>} XML element.
+     * in a {@code <mrl:LE_Processing>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class LE_Processing extends PropertyType<LE_Processing, Processing>
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:LE_Processing>} XML element.
+     * inside the {@code <mrl:LE_Processing>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java
index 3a58fd4..f244b9f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java
@@ -60,7 +60,7 @@ public final class LI_Lineage extends PropertyType<LI_Lineage, Lineage> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:LI_Lineage>} XML element.
+     * in a {@code <mrl:LI_Lineage>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class LI_Lineage extends PropertyType<LI_Lineage, Lineage> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:LI_Lineage>} XML element.
+     * inside the {@code <mrl:LI_Lineage>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java
index fdbdc61..6d981aa 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java
@@ -61,7 +61,7 @@ public final class LI_ProcessStep extends PropertyType<LI_ProcessStep, ProcessSt
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:LI_ProcessStep>} XML element.
+     * in a {@code <mrl:LI_ProcessStep>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -73,7 +73,7 @@ public final class LI_ProcessStep extends PropertyType<LI_ProcessStep, ProcessSt
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:LI_ProcessStep>} XML element.
+     * inside the {@code <mrl:LI_ProcessStep>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java
index 0aabb2f..35d215c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java
@@ -61,7 +61,7 @@ public final class LI_Source extends PropertyType<LI_Source, Source> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:LI_Source>} XML element.
+     * in a {@code <mrl:LI_Source>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -73,7 +73,7 @@ public final class LI_Source extends PropertyType<LI_Source, Source> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:LI_Source>} XML element.
+     * inside the {@code <mrl:LI_Source>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java
index 6fab8bd..901f579 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java
@@ -62,7 +62,7 @@ public final class MD_ApplicationSchemaInformation extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_ApplicationSchemaInformation>} XML element.
+     * in a {@code <mas:MD_ApplicationSchemaInformation>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MD_ApplicationSchemaInformation extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_ApplicationSchemaInformation>} XML element.
+     * inside the {@code <mas:MD_ApplicationSchemaInformation>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AssociatedResource.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AssociatedResource.java
index 5d50419..e8e3377 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AssociatedResource.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AssociatedResource.java
@@ -59,7 +59,7 @@ public final class MD_AssociatedResource extends PropertyType<MD_AssociatedResou
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_AssociatedResource>} XML element.
+     * in a {@code <mri:MD_AssociatedResource>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -71,7 +71,7 @@ public final class MD_AssociatedResource extends PropertyType<MD_AssociatedResou
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_AssociatedResource>} XML element.
+     * inside the {@code <mri:MD_AssociatedResource>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AttributeGroup.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AttributeGroup.java
index 41a0ece..97d1983 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AttributeGroup.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AttributeGroup.java
@@ -59,7 +59,7 @@ public final class MD_AttributeGroup extends PropertyType<MD_AttributeGroup, Att
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_AttributeGroup>} XML element.
+     * in a {@code <mrc:MD_AttributeGroup>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -71,7 +71,7 @@ public final class MD_AttributeGroup extends PropertyType<MD_AttributeGroup, Att
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_AttributeGroup>} XML element.
+     * inside the {@code <mrc:MD_AttributeGroup>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java
index 683d4f8..298962e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java
@@ -60,7 +60,7 @@ public final class MD_BrowseGraphic extends PropertyType<MD_BrowseGraphic, Brows
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_BrowseGraphic>} XML element.
+     * in a {@code <mcc:MD_BrowseGraphic>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_BrowseGraphic extends PropertyType<MD_BrowseGraphic, Brows
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_BrowseGraphic>} XML element.
+     * inside the {@code <mcc:MD_BrowseGraphic>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java
index 79b1afc..339b1f8 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java
@@ -60,7 +60,7 @@ public final class MD_Constraints extends PropertyType<MD_Constraints, Constrain
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Constraints>} XML element.
+     * in a {@code <mco:MD_Constraints>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_Constraints extends PropertyType<MD_Constraints, Constrain
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Constraints>} XML element.
+     * inside the {@code <mco:MD_Constraints>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java
index cb65eb9..dab570c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java
@@ -66,7 +66,7 @@ public final class MD_ContentInformation extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_ContentInformation>} XML element.
+     * in a {@code <mrc:MD_ContentInformation>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -78,7 +78,7 @@ public final class MD_ContentInformation extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_ContentInformation>} XML element.
+     * inside the {@code <mrc:MD_ContentInformation>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java
index 56f3751..280e2c7 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java
@@ -62,7 +62,7 @@ public final class MD_DataIdentification extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_DataIdentification>} XML element.
+     * in a {@code <mri:MD_DataIdentification>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MD_DataIdentification extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_DataIdentification>} XML element.
+     * inside the {@code <mri:MD_DataIdentification>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java
index f2b3415..47c9cef 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java
@@ -62,7 +62,7 @@ public final class MD_DigitalTransferOptions extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_DigitalTransferOptions>} XML element.
+     * in a {@code <mrd:MD_DigitalTransferOptions>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MD_DigitalTransferOptions extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_DigitalTransferOptions>} XML element.
+     * inside the {@code <mrd:MD_DigitalTransferOptions>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java
index 8cbaec9..35e9fe0 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java
@@ -60,7 +60,7 @@ public final class MD_Dimension extends PropertyType<MD_Dimension, Dimension> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Dimension>} XML element.
+     * in a {@code <msr:MD_Dimension>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_Dimension extends PropertyType<MD_Dimension, Dimension> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Dimension>} XML element.
+     * inside the {@code <msr:MD_Dimension>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java
index dd73b1f..3ae147b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java
@@ -60,7 +60,7 @@ public final class MD_Distribution extends PropertyType<MD_Distribution, Distrib
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Distribution>} XML element.
+     * in a {@code <mrd:MD_Distribution>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_Distribution extends PropertyType<MD_Distribution, Distrib
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Distribution>} XML element.
+     * inside the {@code <mrd:MD_Distribution>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java
index d81c072..64f7b90 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java
@@ -60,7 +60,7 @@ public final class MD_Distributor extends PropertyType<MD_Distributor, Distribut
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Distributor>} XML element.
+     * in a {@code <mrd:MD_Distributor>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_Distributor extends PropertyType<MD_Distributor, Distribut
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Distributor>} XML element.
+     * inside the {@code <mrd:MD_Distributor>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java
index 4ba5681..d2758af 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java
@@ -62,7 +62,7 @@ public final class MD_ExtendedElementInformation extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_ExtendedElementInformation>} XML element.
+     * in a {@code <mex:MD_ExtendedElementInformation>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MD_ExtendedElementInformation extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_ExtendedElementInformation>} XML element.
+     * inside the {@code <mex:MD_ExtendedElementInformation>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java
index 8a3ac1a..a18d820 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java
@@ -60,7 +60,7 @@ public final class MD_FeatureTypeInfo extends PropertyType<MD_FeatureTypeInfo, F
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_FeatureTypeInfo>} XML element.
+     * in a {@code <mrc:MD_FeatureTypeInfo>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_FeatureTypeInfo extends PropertyType<MD_FeatureTypeInfo, F
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_FeatureTypeInfo>} XML element.
+     * inside the {@code <mrc:MD_FeatureTypeInfo>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java
index 63c581c..a07156e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java
@@ -60,7 +60,7 @@ public final class MD_Format extends PropertyType<MD_Format, Format> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Format>} XML element.
+     * in a {@code <mrd:MD_Format>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_Format extends PropertyType<MD_Format, Format> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Format>} XML element.
+     * inside the {@code <mrd:MD_Format>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java
index d793432..abb6c8f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java
@@ -60,7 +60,7 @@ public final class MD_GeometricObjects extends PropertyType<MD_GeometricObjects,
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_GeometricObjects>} XML element.
+     * in a {@code <msr:MD_GeometricObjects>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_GeometricObjects extends PropertyType<MD_GeometricObjects,
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_GeometricObjects>} XML element.
+     * inside the {@code <msr:MD_GeometricObjects>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java
index e4fb893..9209bba 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java
@@ -60,7 +60,7 @@ public final class MD_Identification extends PropertyType<MD_Identification, Ide
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Identification>} XML element.
+     * in a {@code <mri:MD_Identification>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_Identification extends PropertyType<MD_Identification, Ide
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Identification>} XML element.
+     * inside the {@code <mri:MD_Identification>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java
index c2f5d3a..b5f1f38 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java
@@ -63,7 +63,7 @@ public class MD_Identifier extends PropertyType<MD_Identifier, Identifier> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Identifier>} XML element.
+     * in a {@code <mcc:MD_Identifier>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -75,7 +75,7 @@ public class MD_Identifier extends PropertyType<MD_Identifier, Identifier> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Identifier>} or {@code RS_Identifier} XML element.
+     * inside the {@code <mcc:MD_Identifier>} or {@code RS_Identifier} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java
index 5731d05..127271f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java
@@ -59,7 +59,7 @@ public class MD_KeywordClass extends PropertyType<MD_KeywordClass, KeywordClass>
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_KeywordClass>} XML element.
+     * in a {@code <mri:MD_KeywordClass>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -71,7 +71,7 @@ public class MD_KeywordClass extends PropertyType<MD_KeywordClass, KeywordClass>
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_KeywordClass>} XML element.
+     * inside the {@code <mri:MD_KeywordClass>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java
index dc9882c..8bbca28 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java
@@ -60,7 +60,7 @@ public final class MD_Keywords extends PropertyType<MD_Keywords, Keywords> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Keywords>} XML element.
+     * in a {@code <mri:MD_Keywords>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_Keywords extends PropertyType<MD_Keywords, Keywords> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Keywords>} XML element.
+     * inside the {@code <mri:MD_Keywords>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java
index 5ba9782..9e0bc79 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java
@@ -62,7 +62,7 @@ public final class MD_MaintenanceInformation extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_MaintenanceInformation>} XML element.
+     * in a {@code <mmi:MD_MaintenanceInformation>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MD_MaintenanceInformation extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_MaintenanceInformation>} XML element.
+     * inside the {@code <mmi:MD_MaintenanceInformation>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java
index cd555c3..252d716 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java
@@ -60,7 +60,7 @@ public class MD_Medium extends PropertyType<MD_Medium, Medium> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Medium>} XML element.
+     * in a {@code <mrd:MD_Medium>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public class MD_Medium extends PropertyType<MD_Medium, Medium> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Medium>} XML element.
+     * inside the {@code <mrd:MD_Medium>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java
index f051b2a..ca43099 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java
@@ -59,7 +59,7 @@ public final class MD_Metadata extends PropertyType<MD_Metadata, Metadata> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Metadata>} XML element.
+     * in a {@code <mdb:MD_Metadata>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -71,7 +71,7 @@ public final class MD_Metadata extends PropertyType<MD_Metadata, Metadata> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Metadata>} XML element.
+     * inside the {@code <mdb:MD_Metadata>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java
index 4c792b1..46018fc 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java
@@ -62,7 +62,7 @@ public final class MD_MetadataExtensionInformation extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_MetadataExtensionInformation>} XML element.
+     * in a {@code <mex:MD_MetadataExtensionInformation>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MD_MetadataExtensionInformation extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_MetadataExtensionInformation>} XML element.
+     * inside the {@code <mex:MD_MetadataExtensionInformation>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataScope.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataScope.java
index 29c2a7a..4a2332d 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataScope.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataScope.java
@@ -59,7 +59,7 @@ public final class MD_MetadataScope extends PropertyType<MD_MetadataScope, Metad
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_MetadataScope>} XML element.
+     * in a {@code <mdb:MD_MetadataScope>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -71,7 +71,7 @@ public final class MD_MetadataScope extends PropertyType<MD_MetadataScope, Metad
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_MetadataScope>} XML element.
+     * inside the {@code <mdb:MD_MetadataScope>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java
index e81f702..1e78a74 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java
@@ -62,7 +62,7 @@ public final class MD_PortrayalCatalogueReference extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_PortrayalCatalogueReference>} XML element.
+     * in a {@code <mpc:MD_PortrayalCatalogueReference>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MD_PortrayalCatalogueReference extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_PortrayalCatalogueReference>} XML element.
+     * inside the {@code <mpc:MD_PortrayalCatalogueReference>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java
index 599ffe6..ad560a9 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java
@@ -62,7 +62,7 @@ public final class MD_RangeDimension extends PropertyType<MD_RangeDimension, Ran
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_RangeDimension>} XML element.
+     * in a {@code <mrc:MD_RangeDimension>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MD_RangeDimension extends PropertyType<MD_RangeDimension, Ran
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_RangeDimension>} XML element.
+     * inside the {@code <mrc:MD_RangeDimension>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java
index 64428f7..5f53ad2 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java
@@ -60,7 +60,7 @@ public class MD_Releasability extends PropertyType<MD_Releasability, Releasabili
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Releasability>} XML element.
+     * in a {@code <mco:MD_Releasability>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public class MD_Releasability extends PropertyType<MD_Releasability, Releasabili
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Releasability>} XML element.
+     * inside the {@code <mco:MD_Releasability>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java
index ba2f6ff..eb81fa7 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java
@@ -62,7 +62,7 @@ public final class MD_RepresentativeFraction extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_RepresentativeFraction>} XML element.
+     * in a {@code <mri:MD_RepresentativeFraction>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MD_RepresentativeFraction extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_RepresentativeFraction>} XML element.
+     * inside the {@code <mri:MD_RepresentativeFraction>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java
index b56890a..a59c2f8 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java
@@ -60,7 +60,7 @@ public class MD_Resolution extends PropertyType<MD_Resolution, Resolution> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Resolution>} XML element.
+     * in a {@code <mri:MD_Resolution>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public class MD_Resolution extends PropertyType<MD_Resolution, Resolution> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Resolution>} XML element.
+     * inside the {@code <mri:MD_Resolution>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java
index 0bb165c..5256cb3 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java
@@ -60,7 +60,7 @@ public final class MD_ScopeDescription extends PropertyType<MD_ScopeDescription,
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_ScopeDescription>} XML element.
+     * in a {@code <mcc:MD_ScopeDescription>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_ScopeDescription extends PropertyType<MD_ScopeDescription,
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_ScopeDescription>} XML element.
+     * inside the {@code <mcc:MD_ScopeDescription>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java
index 146b21d..d78c92f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java
@@ -66,7 +66,7 @@ public final class MD_SpatialRepresentation extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_SpatialRepresentation>} XML element.
+     * in a {@code <msr:MD_SpatialRepresentation>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -78,7 +78,7 @@ public final class MD_SpatialRepresentation extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_SpatialRepresentation>} XML element.
+     * inside the {@code <msr:MD_SpatialRepresentation>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java
index 50a2c1f..ffb84c9 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java
@@ -62,7 +62,7 @@ public final class MD_StandardOrderProcess extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_StandardOrderProcess>} XML element.
+     * in a {@code <mrd:MD_StandardOrderProcess>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MD_StandardOrderProcess extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_StandardOrderProcess>} XML element.
+     * inside the {@code <mrd:MD_StandardOrderProcess>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java
index 8fa5d37..0af42e3 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java
@@ -60,7 +60,7 @@ public final class MD_Usage extends PropertyType<MD_Usage, Usage> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmd:MD_Usage>} XML element.
+     * in a {@code <mri:MD_Usage>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MD_Usage extends PropertyType<MD_Usage, Usage> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmd:MD_Usage>} XML element.
+     * inside the {@code <mri:MD_Usage>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java
index c816920..8657a3b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java
@@ -62,7 +62,7 @@ public final class MI_AcquisitionInformation extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_AcquisitionInformation>} XML element.
+     * in a {@code <mac:MI_AcquisitionInformation>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MI_AcquisitionInformation extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_AcquisitionInformation>} XML element.
+     * inside the {@code <mac:MI_AcquisitionInformation>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java
index 21255f1..6d9d7c6 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java
@@ -62,7 +62,7 @@ public final class MI_EnvironmentalRecord extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_EnvironmentalRecord>} XML element.
+     * in a {@code <mac:MI_EnvironmentalRecord>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MI_EnvironmentalRecord extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_EnvironmentalRecord>} XML element.
+     * inside the {@code <mac:MI_EnvironmentalRecord>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Event.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Event.java
index 8d23205..4adb738 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Event.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Event.java
@@ -60,7 +60,7 @@ public final class MI_Event extends PropertyType<MI_Event, Event> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_Event>} XML element.
+     * in a {@code <mac:MI_Event>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MI_Event extends PropertyType<MI_Event, Event> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_Event>} XML element.
+     * inside the {@code <mac:MI_Event>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GCP.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GCP.java
index a161c51..76a5c8a 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GCP.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GCP.java
@@ -60,7 +60,7 @@ public final class MI_GCP extends PropertyType<MI_GCP, GCP> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_GCP>} XML element.
+     * in a {@code <msr:MI_GCP>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MI_GCP extends PropertyType<MI_GCP, GCP> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_GCP>} XML element.
+     * inside the {@code <msr:MI_GCP>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GeolocationInformation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GeolocationInformation.java
index 59a9707..17af27e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GeolocationInformation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GeolocationInformation.java
@@ -62,7 +62,7 @@ public final class MI_GeolocationInformation extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_GeolocationInformation>} XML element.
+     * in a {@code <msr:MI_GeolocationInformation>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MI_GeolocationInformation extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_GeolocationInformation>} XML element.
+     * inside the {@code <msr:MI_GeolocationInformation>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Instrument.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Instrument.java
index 884629b..64babe2 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Instrument.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Instrument.java
@@ -60,7 +60,7 @@ public final class MI_Instrument extends PropertyType<MI_Instrument, Instrument>
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_Instrument>} XML element.
+     * in a {@code <mac:MI_Instrument>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MI_Instrument extends PropertyType<MI_Instrument, Instrument>
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_Instrument>} XML element.
+     * inside the {@code <mac:MI_Instrument>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Objective.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Objective.java
index 284cf25..9206063 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Objective.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Objective.java
@@ -60,7 +60,7 @@ public final class MI_Objective extends PropertyType<MI_Objective, Objective> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_Objective>} XML element.
+     * in a {@code <mac:MI_Objective>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MI_Objective extends PropertyType<MI_Objective, Objective> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_Objective>} XML element.
+     * inside the {@code <mac:MI_Objective>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Operation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Operation.java
index 7f32222..5447b18 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Operation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Operation.java
@@ -60,7 +60,7 @@ public final class MI_Operation extends PropertyType<MI_Operation, Operation> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_Operation>} XML element.
+     * in a {@code <mac:MI_Operation>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MI_Operation extends PropertyType<MI_Operation, Operation> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_Operation>} XML element.
+     * inside the {@code <mac:MI_Operation>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Plan.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Plan.java
index ac3cc15..2104a82 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Plan.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Plan.java
@@ -60,7 +60,7 @@ public final class MI_Plan extends PropertyType<MI_Plan, Plan> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_Plan>} XML element.
+     * in a {@code <mac:MI_Plan>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MI_Plan extends PropertyType<MI_Plan, Plan> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_Plan>} XML element.
+     * inside the {@code <mac:MI_Plan>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Platform.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Platform.java
index 3ef0c01..212ccca 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Platform.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Platform.java
@@ -60,7 +60,7 @@ public final class MI_Platform extends PropertyType<MI_Platform, Platform> {
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_Platform>} XML element.
+     * in a {@code <mac:MI_Platform>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MI_Platform extends PropertyType<MI_Platform, Platform> {
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_Platform>} XML element.
+     * inside the {@code <mac:MI_Platform>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_PlatformPass.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_PlatformPass.java
index 154783b..e833c48 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_PlatformPass.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_PlatformPass.java
@@ -60,7 +60,7 @@ public final class MI_PlatformPass extends PropertyType<MI_PlatformPass, Platfor
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_PlatformPass>} XML element.
+     * in a {@code <mac:MI_PlatformPass>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MI_PlatformPass extends PropertyType<MI_PlatformPass, Platfor
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_PlatformPass>} XML element.
+     * inside the {@code <mac:MI_PlatformPass>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RangeElementDescription.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RangeElementDescription.java
index 72f395a..b840f87 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RangeElementDescription.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RangeElementDescription.java
@@ -62,7 +62,7 @@ public final class MI_RangeElementDescription extends
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_RangeElementDescription>} XML element.
+     * in a {@code <mrc:MI_RangeElementDescription>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -74,7 +74,7 @@ public final class MI_RangeElementDescription extends
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_RangeElementDescription>} XML element.
+     * inside the {@code <mrc:MI_RangeElementDescription>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RequestedDate.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RequestedDate.java
index 198e633..94ebb58 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RequestedDate.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RequestedDate.java
@@ -60,7 +60,7 @@ public final class MI_RequestedDate extends PropertyType<MI_RequestedDate, Reque
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_RequestedDate>} XML element.
+     * in a {@code <mac:MI_RequestedDate>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MI_RequestedDate extends PropertyType<MI_RequestedDate, Reque
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_RequestedDate>} XML element.
+     * inside the {@code <mac:MI_RequestedDate>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Requirement.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Requirement.java
index ca45de8..3a056b2 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Requirement.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Requirement.java
@@ -60,7 +60,7 @@ public final class MI_Requirement extends PropertyType<MI_Requirement, Requireme
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
-     * in a {@code <gmi:MI_Requirement>} XML element.
+     * in a {@code <mac:MI_Requirement>} XML element.
      *
      * @param  metadata  the metadata element to marshall.
      * @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MI_Requirement extends PropertyType<MI_Requirement, Requireme
 
     /**
      * Invoked by JAXB at marshalling time for getting the actual metadata to write
-     * inside the {@code <gmi:MI_Requirement>} XML element.
+     * inside the {@code <mac:MI_Requirement>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
      * @return the metadata to be marshalled.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
index 8e576e0..e06ca15 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
@@ -57,8 +57,7 @@
  * @since 0.3
  * @module
  */
-@XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, namespace = Namespaces.GMD, xmlns = {
-    @XmlNs(prefix = "gmd", namespaceURI = Namespaces.GMD),
+@XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, xmlns = {
     @XmlNs(prefix = "gco", namespaceURI = Namespaces.GCO),
     @XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI)
 })
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java
index 61ecfdf..a9edf8f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java
@@ -68,17 +68,17 @@ import org.apache.sis.internal.system.Loggers;
  * by a {@link CodeList} value.
  *
  * <div class="note"><b>Example:</b>
- * in the following XML fragment, the {@code <gmi:type>} value is normally a {@code <gco:CharacterString>}
+ * in the following XML fragment, the {@code <mac:type>} value is normally a {@code <gco:CharacterString>}
  * but has been replaced by a {@code SensorType} code below:
  *
  * {@preformat xml
- *   <gmi:MI_Instrument>
- *     <gmi:type>
+ *   <mac:MI_Instrument>
+ *     <mac:type>
  *       <gmi:MI_SensorTypeCode
  *           codeList="http://standards.iso.org/…snip…/codelists.xml#CI_SensorTypeCode"
  *           codeListValue="RADIOMETER">Radiometer</gmi:MI_SensorTypeCode>
- *     </gmi:type>
- *   </gmi:MI_Instrument>
+ *     </mac:type>
+ *   </mac:MI_Instrument>
  * }
  * </div>
  *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/ReferenceResolver.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/ReferenceResolver.java
index 0f9c327..ac14709 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/ReferenceResolver.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/ReferenceResolver.java
@@ -252,13 +252,13 @@ public class ReferenceResolver {
      *   <th>As {@code <gcx:Anchor>}</th>
      * </tr><tr>
      * <td>
-     *   <pre> &lt;gmd:country&gt;
+     *   <pre> &lt;cit:country&gt;
      *     &lt;gco:CharacterString&gt;France&lt;/gco:CharacterString&gt;
-     * &lt;/gmd:country&gt;</pre>
+     * &lt;/cit:country&gt;</pre>
      * </td><td>
-     *   <pre> &lt;gmd:country&gt;
+     *   <pre> &lt;cit:country&gt;
      *     &lt;gcx:Anchor xlink:href="SDN:C320:2:FR"&gt;France&lt;/gcx:Anchor&gt;
-     * &lt;/gmd:country&gt;</pre>
+     * &lt;/cit:country&gt;</pre>
      * </td></tr>
      * </table>
      *


Mime
View raw message