You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2021/09/22 10:52:43 UTC

[sis] 01/04: Rename the `metadata` parameter for avoiding confusion with the `metadata` field. They do not always have the same value because of the same class being used both as a `XmlAdapter` and a wrapper object.

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 d4b8541678e26f320f93277a16694de22ff5f545
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon Sep 20 10:56:05 2021 +0200

    Rename the `metadata` parameter for avoiding confusion with the `metadata` field.
    They do not always have the same value because of the same class being used both
    as a `XmlAdapter` and a wrapper object.
---
 .../sis/internal/jaxb/metadata/CI_Address.java     | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/CI_Citation.java    | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/CI_Contact.java     | 16 ++++++++--------
 .../apache/sis/internal/jaxb/metadata/CI_Date.java | 16 ++++++++--------
 .../internal/jaxb/metadata/CI_OnlineResource.java  | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/CI_Party.java       | 16 ++++++++--------
 .../internal/jaxb/metadata/CI_Responsibility.java  | 16 ++++++++--------
 .../jaxb/metadata/CI_ResponsibleParty.java         | 22 +++++++++++-----------
 .../sis/internal/jaxb/metadata/CI_Series.java      | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/CI_Telephone.java   | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/DQ_DataQuality.java | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/DQ_Element.java     | 16 ++++++++--------
 .../jaxb/metadata/DQ_PositionalAccuracy.java       | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/DQ_Result.java      | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/EX_Extent.java      | 16 ++++++++--------
 .../jaxb/metadata/EX_GeographicExtent.java         | 16 ++++++++--------
 .../internal/jaxb/metadata/EX_TemporalExtent.java  | 16 ++++++++--------
 .../internal/jaxb/metadata/EX_VerticalExtent.java  | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/LE_Algorithm.java   | 16 ++++++++--------
 .../jaxb/metadata/LE_NominalResolution.java        | 16 ++++++++--------
 .../jaxb/metadata/LE_ProcessStepReport.java        | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/LE_Processing.java  | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/LI_Lineage.java     | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/LI_ProcessStep.java | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/LI_Source.java      | 16 ++++++++--------
 .../jaxb/metadata/MD_AggregateInformation.java     | 16 ++++++++--------
 .../metadata/MD_ApplicationSchemaInformation.java  | 16 ++++++++--------
 .../jaxb/metadata/MD_AssociatedResource.java       | 16 ++++++++--------
 .../internal/jaxb/metadata/MD_AttributeGroup.java  | 16 ++++++++--------
 .../internal/jaxb/metadata/MD_BrowseGraphic.java   | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Constraints.java | 16 ++++++++--------
 .../jaxb/metadata/MD_ContentInformation.java       | 16 ++++++++--------
 .../jaxb/metadata/MD_DataIdentification.java       | 16 ++++++++--------
 .../jaxb/metadata/MD_DigitalTransferOptions.java   | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Dimension.java   | 16 ++++++++--------
 .../internal/jaxb/metadata/MD_Distribution.java    | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Distributor.java | 16 ++++++++--------
 .../metadata/MD_ExtendedElementInformation.java    | 16 ++++++++--------
 .../internal/jaxb/metadata/MD_FeatureTypeInfo.java | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Format.java      | 16 ++++++++--------
 .../jaxb/metadata/MD_GeometricObjects.java         | 16 ++++++++--------
 .../internal/jaxb/metadata/MD_Identification.java  | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Identifier.java  | 16 ++++++++--------
 .../internal/jaxb/metadata/MD_KeywordClass.java    | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Keywords.java    | 16 ++++++++--------
 .../jaxb/metadata/MD_MaintenanceInformation.java   | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Medium.java      | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Metadata.java    | 16 ++++++++--------
 .../metadata/MD_MetadataExtensionInformation.java  | 16 ++++++++--------
 .../internal/jaxb/metadata/MD_MetadataScope.java   | 16 ++++++++--------
 .../metadata/MD_PortrayalCatalogueReference.java   | 16 ++++++++--------
 .../internal/jaxb/metadata/MD_RangeDimension.java  | 16 ++++++++--------
 .../internal/jaxb/metadata/MD_Releasability.java   | 16 ++++++++--------
 .../jaxb/metadata/MD_RepresentativeFraction.java   | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Resolution.java  | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Scope.java       | 16 ++++++++--------
 .../jaxb/metadata/MD_ScopeDescription.java         | 16 ++++++++--------
 .../jaxb/metadata/MD_SpatialRepresentation.java    | 16 ++++++++--------
 .../jaxb/metadata/MD_StandardOrderProcess.java     | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MD_Usage.java       | 16 ++++++++--------
 .../jaxb/metadata/MI_AcquisitionInformation.java   | 16 ++++++++--------
 .../jaxb/metadata/MI_EnvironmentalRecord.java      | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MI_Event.java       | 16 ++++++++--------
 .../apache/sis/internal/jaxb/metadata/MI_GCP.java  | 16 ++++++++--------
 .../jaxb/metadata/MI_GeolocationInformation.java   | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MI_Instrument.java  | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MI_Objective.java   | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MI_Operation.java   | 16 ++++++++--------
 .../apache/sis/internal/jaxb/metadata/MI_Plan.java | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MI_Platform.java    | 16 ++++++++--------
 .../internal/jaxb/metadata/MI_PlatformPass.java    | 16 ++++++++--------
 .../jaxb/metadata/MI_RangeElementDescription.java  | 16 ++++++++--------
 .../internal/jaxb/metadata/MI_RequestedDate.java   | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MI_Requirement.java | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/MX_DataFile.java    | 16 ++++++++--------
 .../internal/jaxb/metadata/RS_ReferenceSystem.java | 18 +++++++++---------
 .../internal/jaxb/metadata/SV_CoupledResource.java | 16 ++++++++--------
 .../jaxb/metadata/SV_OperationChainMetadata.java   | 16 ++++++++--------
 .../jaxb/metadata/SV_OperationMetadata.java        | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/SV_Parameter.java   | 16 ++++++++--------
 .../sis/internal/jaxb/metadata/package-info.java   |  2 +-
 81 files changed, 645 insertions(+), 645 deletions(-)

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 19ec2ac..f0f13b3 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
@@ -54,20 +54,20 @@ public final class CI_Address extends PropertyType<CI_Address, Address> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private CI_Address(final Address metadata) {
-        super(metadata);
+    private CI_Address(final Address value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <cit:CI_Address>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected CI_Address wrap(final Address metadata) {
-        return new CI_Address(metadata);
+    protected CI_Address wrap(final Address value) {
+        return new CI_Address(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class CI_Address extends PropertyType<CI_Address, Address> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultAddress metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultAddress value) {
+        metadata = value;
     }
 }
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 c267f50..4f2afed 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
@@ -54,20 +54,20 @@ public class CI_Citation extends PropertyType<CI_Citation, Citation> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private CI_Citation(final Citation metadata) {
-        super(metadata);
+    private CI_Citation(final Citation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <cit:CI_Citation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected CI_Citation wrap(final Citation metadata) {
-        return new CI_Citation(metadata);
+    protected CI_Citation wrap(final Citation value) {
+        return new CI_Citation(value);
     }
 
     /**
@@ -85,10 +85,10 @@ public class CI_Citation extends PropertyType<CI_Citation, Citation> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public final void setElement(final DefaultCitation metadata) {
-        this.metadata = metadata;
+    public final void setElement(final DefaultCitation value) {
+        metadata = value;
     }
 
     /**
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 c7df7a4..e116d8c 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
@@ -54,20 +54,20 @@ public final class CI_Contact extends PropertyType<CI_Contact, Contact> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private CI_Contact(final Contact metadata) {
-        super(metadata);
+    private CI_Contact(final Contact value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <cit:CI_Contact>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected CI_Contact wrap(final Contact metadata) {
-        return new CI_Contact(metadata);
+    protected CI_Contact wrap(final Contact value) {
+        return new CI_Contact(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class CI_Contact extends PropertyType<CI_Contact, Contact> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultContact metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultContact value) {
+        metadata = value;
     }
 }
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 164711d..ae1e136 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
@@ -54,20 +54,20 @@ public final class CI_Date extends PropertyType<CI_Date, CitationDate> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private CI_Date(final CitationDate metadata) {
-        super(metadata);
+    private CI_Date(final CitationDate value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <cit:CI_Date>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected CI_Date wrap(final CitationDate metadata) {
-        return new CI_Date(metadata);
+    protected CI_Date wrap(final CitationDate value) {
+        return new CI_Date(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class CI_Date extends PropertyType<CI_Date, CitationDate> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultCitationDate metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultCitationDate value) {
+        metadata = value;
     }
 }
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 5537353..bf05fe9 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
@@ -54,20 +54,20 @@ public class CI_OnlineResource extends PropertyType<CI_OnlineResource, OnlineRes
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private CI_OnlineResource(final OnlineResource metadata) {
-        super(metadata);
+    private CI_OnlineResource(final OnlineResource value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <cit:CI_OnlineResource>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected CI_OnlineResource wrap(final OnlineResource metadata) {
-        return new CI_OnlineResource(metadata);
+    protected CI_OnlineResource wrap(final OnlineResource value) {
+        return new CI_OnlineResource(value);
     }
 
     /**
@@ -85,10 +85,10 @@ public class CI_OnlineResource extends PropertyType<CI_OnlineResource, OnlineRes
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public final void setElement(final DefaultOnlineResource metadata) {
-        this.metadata = metadata;
+    public final void setElement(final DefaultOnlineResource value) {
+        metadata = value;
     }
 
     /**
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 43edd8f..e7f6042 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
@@ -53,20 +53,20 @@ public final class CI_Party extends PropertyType<CI_Party, Party> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private CI_Party(final Party metadata) {
-        super(metadata);
+    private CI_Party(final Party value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <cit:CI_Party>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected CI_Party wrap(final Party metadata) {
-        return new CI_Party(metadata);
+    protected CI_Party wrap(final Party value) {
+        return new CI_Party(value);
     }
 
     /**
@@ -84,9 +84,9 @@ public final class CI_Party extends PropertyType<CI_Party, Party> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final AbstractParty metadata) {
-        this.metadata = metadata;
+    public void setElement(final AbstractParty value) {
+        metadata = value;
     }
 }
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 b767304..4de669b 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
@@ -57,20 +57,20 @@ public final class CI_Responsibility extends PropertyType<CI_Responsibility, Res
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private CI_Responsibility(final Responsibility metadata) {
-        super(metadata);
+    private CI_Responsibility(final Responsibility value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <cit:CI_Responsibility>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected CI_Responsibility wrap(final Responsibility metadata) {
-        return new CI_Responsibility(metadata);
+    protected CI_Responsibility wrap(final Responsibility value) {
+        return new CI_Responsibility(value);
     }
 
     /**
@@ -99,9 +99,9 @@ public final class CI_Responsibility extends PropertyType<CI_Responsibility, Res
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultResponsibility metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultResponsibility value) {
+        metadata = value;
     }
 }
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
index 7ab0978..0b04680 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
@@ -66,20 +66,20 @@ public final class CI_ResponsibleParty extends PropertyType<CI_ResponsibleParty,
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private CI_ResponsibleParty(final ResponsibleParty metadata) {
-        super(metadata);
+    private CI_ResponsibleParty(final ResponsibleParty value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <gmd:CI_ResponsibleParty>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected CI_ResponsibleParty wrap(final ResponsibleParty metadata) {
-        return new CI_ResponsibleParty(metadata);
+    protected CI_ResponsibleParty wrap(final ResponsibleParty value) {
+        return new CI_ResponsibleParty(value);
     }
 
     /**
@@ -120,13 +120,13 @@ public final class CI_ResponsibleParty extends PropertyType<CI_ResponsibleParty,
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  md  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultResponsibility md) {
-        if (md instanceof DefaultResponsibleParty) {
-            metadata = (DefaultResponsibleParty) md;
-        } else if (md != null) {
-            metadata = new DefaultResponsibleParty(md);
+    public void setElement(final DefaultResponsibility value) {
+        if (value instanceof DefaultResponsibleParty) {
+            metadata = (DefaultResponsibleParty) value;
+        } else if (value != null) {
+            metadata = new DefaultResponsibleParty(value);
         }
     }
 }
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 b0c761b..a3e9c00 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
@@ -54,20 +54,20 @@ public final class CI_Series extends PropertyType<CI_Series, Series> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private CI_Series(final Series metadata) {
-        super(metadata);
+    private CI_Series(final Series value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <cit:CI_Series>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected CI_Series wrap(final Series metadata) {
-        return new CI_Series(metadata);
+    protected CI_Series wrap(final Series value) {
+        return new CI_Series(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class CI_Series extends PropertyType<CI_Series, Series> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultSeries metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultSeries value) {
+        metadata = value;
     }
 }
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 80d4e6c..c08d681 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
@@ -54,20 +54,20 @@ public final class CI_Telephone extends PropertyType<CI_Telephone, Telephone> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private CI_Telephone(final Telephone metadata) {
-        super(metadata);
+    private CI_Telephone(final Telephone value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <cit:CI_Telephone>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected CI_Telephone wrap(final Telephone metadata) {
-        return new CI_Telephone(metadata);
+    protected CI_Telephone wrap(final Telephone value) {
+        return new CI_Telephone(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class CI_Telephone extends PropertyType<CI_Telephone, Telephone> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultTelephone metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultTelephone value) {
+        metadata = value;
     }
 }
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 4885de0..662ed82 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
@@ -54,20 +54,20 @@ public final class DQ_DataQuality extends PropertyType<DQ_DataQuality, DataQuali
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private DQ_DataQuality(final DataQuality metadata) {
-        super(metadata);
+    private DQ_DataQuality(final DataQuality value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mdq:DQ_DataQuality>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected DQ_DataQuality wrap(final DataQuality metadata) {
-        return new DQ_DataQuality(metadata);
+    protected DQ_DataQuality wrap(final DataQuality value) {
+        return new DQ_DataQuality(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class DQ_DataQuality extends PropertyType<DQ_DataQuality, DataQuali
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultDataQuality metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultDataQuality value) {
+        metadata = value;
     }
 }
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 057ead2..1618e16 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
@@ -54,20 +54,20 @@ public final class DQ_Element extends PropertyType<DQ_Element, Element> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private DQ_Element(final Element metadata) {
-        super(metadata);
+    private DQ_Element(final Element value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mdq:DQ_Element>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected DQ_Element wrap(final Element metadata) {
-        return new DQ_Element(metadata);
+    protected DQ_Element wrap(final Element value) {
+        return new DQ_Element(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class DQ_Element extends PropertyType<DQ_Element, Element> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final AbstractElement metadata) {
-        this.metadata = metadata;
+    public void setElement(final AbstractElement value) {
+        metadata = value;
     }
 }
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 80eecf8..321a062 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
@@ -53,20 +53,20 @@ public final class DQ_PositionalAccuracy extends PropertyType<DQ_PositionalAccur
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private DQ_PositionalAccuracy(final PositionalAccuracy metadata) {
-        super(metadata);
+    private DQ_PositionalAccuracy(final PositionalAccuracy value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mdq:DQ_PositionalAccuracy>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected DQ_PositionalAccuracy wrap(final PositionalAccuracy metadata) {
-        return new DQ_PositionalAccuracy(metadata);
+    protected DQ_PositionalAccuracy wrap(final PositionalAccuracy value) {
+        return new DQ_PositionalAccuracy(value);
     }
 
     /**
@@ -84,9 +84,9 @@ public final class DQ_PositionalAccuracy extends PropertyType<DQ_PositionalAccur
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final AbstractPositionalAccuracy metadata) {
-        this.metadata = metadata;
+    public void setElement(final AbstractPositionalAccuracy value) {
+        metadata = value;
     }
 }
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 1d79ab3..f6c392f 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
@@ -54,20 +54,20 @@ public final class DQ_Result extends PropertyType<DQ_Result, Result> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private DQ_Result(final Result metadata) {
-        super(metadata);
+    private DQ_Result(final Result value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mdq:DQ_Result>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected DQ_Result wrap(final Result metadata) {
-        return new DQ_Result(metadata);
+    protected DQ_Result wrap(final Result value) {
+        return new DQ_Result(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class DQ_Result extends PropertyType<DQ_Result, Result> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final AbstractResult metadata) {
-        this.metadata = metadata;
+    public void setElement(final AbstractResult value) {
+        metadata = value;
     }
 }
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 19244e4..c0a9b59 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
@@ -54,20 +54,20 @@ public final class EX_Extent extends PropertyType<EX_Extent, Extent> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private EX_Extent(final Extent metadata) {
-        super(metadata);
+    private EX_Extent(final Extent value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <gex:EX_Extent>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected EX_Extent wrap(final Extent metadata) {
-        return new EX_Extent(metadata);
+    protected EX_Extent wrap(final Extent value) {
+        return new EX_Extent(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class EX_Extent extends PropertyType<EX_Extent, Extent> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultExtent metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultExtent value) {
+        metadata = value;
     }
 }
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 7f12e75..6cddadd 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
@@ -54,20 +54,20 @@ public final class EX_GeographicExtent extends PropertyType<EX_GeographicExtent,
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private EX_GeographicExtent(final GeographicExtent metadata) {
-        super(metadata);
+    private EX_GeographicExtent(final GeographicExtent value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <gex:EX_GeographicExtent>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected EX_GeographicExtent wrap(final GeographicExtent metadata) {
-        return new EX_GeographicExtent(metadata);
+    protected EX_GeographicExtent wrap(final GeographicExtent value) {
+        return new EX_GeographicExtent(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class EX_GeographicExtent extends PropertyType<EX_GeographicExtent,
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final AbstractGeographicExtent metadata) {
-        this.metadata = metadata;
+    public void setElement(final AbstractGeographicExtent value) {
+        metadata = value;
     }
 }
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 7af1815..a59c43a 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
@@ -54,20 +54,20 @@ public final class EX_TemporalExtent extends PropertyType<EX_TemporalExtent, Tem
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private EX_TemporalExtent(final TemporalExtent metadata) {
-        super(metadata);
+    private EX_TemporalExtent(final TemporalExtent value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <gex:EX_TemporalExtent>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected EX_TemporalExtent wrap(final TemporalExtent metadata) {
-        return new EX_TemporalExtent(metadata);
+    protected EX_TemporalExtent wrap(final TemporalExtent value) {
+        return new EX_TemporalExtent(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class EX_TemporalExtent extends PropertyType<EX_TemporalExtent, Tem
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultTemporalExtent metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultTemporalExtent value) {
+        metadata = value;
     }
 }
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 4ee8167..5c78a2a 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
@@ -54,20 +54,20 @@ public final class EX_VerticalExtent extends PropertyType<EX_VerticalExtent, Ver
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private EX_VerticalExtent(final VerticalExtent metadata) {
-        super(metadata);
+    private EX_VerticalExtent(final VerticalExtent value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <gex:EX_VerticalExtent>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected EX_VerticalExtent wrap(final VerticalExtent metadata) {
-        return new EX_VerticalExtent(metadata);
+    protected EX_VerticalExtent wrap(final VerticalExtent value) {
+        return new EX_VerticalExtent(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class EX_VerticalExtent extends PropertyType<EX_VerticalExtent, Ver
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultVerticalExtent metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultVerticalExtent value) {
+        metadata = value;
     }
 }
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 0d7a968..c5175a1 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
@@ -55,20 +55,20 @@ public final class LE_Algorithm extends PropertyType<LE_Algorithm, Algorithm> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private LE_Algorithm(final Algorithm metadata) {
-        super(metadata);
+    private LE_Algorithm(final Algorithm value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrl:LE_Algorithm>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected LE_Algorithm wrap(final Algorithm metadata) {
-        return new LE_Algorithm(metadata);
+    protected LE_Algorithm wrap(final Algorithm value) {
+        return new LE_Algorithm(value);
     }
 
     /**
@@ -86,9 +86,9 @@ public final class LE_Algorithm extends PropertyType<LE_Algorithm, Algorithm> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultAlgorithm metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultAlgorithm value) {
+        metadata = value;
     }
 }
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 786473e..720c38e 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
@@ -54,20 +54,20 @@ public final class LE_NominalResolution extends PropertyType<LE_NominalResolutio
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private LE_NominalResolution(final NominalResolution metadata) {
-        super(metadata);
+    private LE_NominalResolution(final NominalResolution value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrl:LE_NominalResolution>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected LE_NominalResolution wrap(final NominalResolution metadata) {
-        return new LE_NominalResolution(metadata);
+    protected LE_NominalResolution wrap(final NominalResolution value) {
+        return new LE_NominalResolution(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class LE_NominalResolution extends PropertyType<LE_NominalResolutio
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultNominalResolution metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultNominalResolution value) {
+        metadata = value;
     }
 }
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 7e943df..f8e7c98 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
@@ -54,20 +54,20 @@ public final class LE_ProcessStepReport extends PropertyType<LE_ProcessStepRepor
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private LE_ProcessStepReport(final ProcessStepReport metadata) {
-        super(metadata);
+    private LE_ProcessStepReport(final ProcessStepReport value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrl:LE_ProcessStepReport>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected LE_ProcessStepReport wrap(final ProcessStepReport metadata) {
-        return new LE_ProcessStepReport(metadata);
+    protected LE_ProcessStepReport wrap(final ProcessStepReport value) {
+        return new LE_ProcessStepReport(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class LE_ProcessStepReport extends PropertyType<LE_ProcessStepRepor
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultProcessStepReport metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultProcessStepReport value) {
+        metadata = value;
     }
 }
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 abdf3d1..7126180 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
@@ -54,20 +54,20 @@ public final class LE_Processing extends PropertyType<LE_Processing, Processing>
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private LE_Processing(final Processing metadata) {
-        super(metadata);
+    private LE_Processing(final Processing value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrl:LE_Processing>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected LE_Processing wrap(final Processing metadata) {
-        return new LE_Processing(metadata);
+    protected LE_Processing wrap(final Processing value) {
+        return new LE_Processing(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class LE_Processing extends PropertyType<LE_Processing, Processing>
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultProcessing metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultProcessing value) {
+        metadata = value;
     }
 }
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 0ec3742d..b6c6f53 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
@@ -54,20 +54,20 @@ public final class LI_Lineage extends PropertyType<LI_Lineage, Lineage> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private LI_Lineage(final Lineage metadata) {
-        super(metadata);
+    private LI_Lineage(final Lineage value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrl:LI_Lineage>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected LI_Lineage wrap(final Lineage metadata) {
-        return new LI_Lineage(metadata);
+    protected LI_Lineage wrap(final Lineage value) {
+        return new LI_Lineage(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class LI_Lineage extends PropertyType<LI_Lineage, Lineage> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultLineage metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultLineage value) {
+        metadata = value;
     }
 }
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 f55b9a2..ff4672b 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
@@ -55,20 +55,20 @@ public final class LI_ProcessStep extends PropertyType<LI_ProcessStep, ProcessSt
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private LI_ProcessStep(final ProcessStep metadata) {
-        super(metadata);
+    private LI_ProcessStep(final ProcessStep value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrl:LI_ProcessStep>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected LI_ProcessStep wrap(final ProcessStep metadata) {
-        return new LI_ProcessStep(metadata);
+    protected LI_ProcessStep wrap(final ProcessStep value) {
+        return new LI_ProcessStep(value);
     }
 
     /**
@@ -86,9 +86,9 @@ public final class LI_ProcessStep extends PropertyType<LI_ProcessStep, ProcessSt
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultProcessStep metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultProcessStep value) {
+        metadata = value;
     }
 }
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 0e141d4..5041418 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
@@ -55,20 +55,20 @@ public final class LI_Source extends PropertyType<LI_Source, Source> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private LI_Source(final Source metadata) {
-        super(metadata);
+    private LI_Source(final Source value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrl:LI_Source>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected LI_Source wrap(final Source metadata) {
-        return new LI_Source(metadata);
+    protected LI_Source wrap(final Source value) {
+        return new LI_Source(value);
     }
 
     /**
@@ -86,9 +86,9 @@ public final class LI_Source extends PropertyType<LI_Source, Source> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultSource metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultSource value) {
+        metadata = value;
     }
 }
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java
index 9b15660..4128f00 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java
@@ -57,20 +57,20 @@ public final class MD_AggregateInformation extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_AggregateInformation(final AggregateInformation metadata) {
-        super(metadata);
+    private MD_AggregateInformation(final AggregateInformation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <gmd:MD_AggregateInformation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_AggregateInformation wrap(final AggregateInformation metadata) {
-        return new MD_AggregateInformation(metadata);
+    protected MD_AggregateInformation wrap(final AggregateInformation value) {
+        return new MD_AggregateInformation(value);
     }
 
     /**
@@ -88,9 +88,9 @@ public final class MD_AggregateInformation extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultAggregateInformation metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultAggregateInformation value) {
+        metadata = value;
     }
 }
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 a69c359..2996e8e 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
@@ -56,20 +56,20 @@ public final class MD_ApplicationSchemaInformation extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_ApplicationSchemaInformation(final ApplicationSchemaInformation metadata) {
-        super(metadata);
+    private MD_ApplicationSchemaInformation(final ApplicationSchemaInformation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mas:MD_ApplicationSchemaInformation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_ApplicationSchemaInformation wrap(final ApplicationSchemaInformation metadata) {
-        return new MD_ApplicationSchemaInformation(metadata);
+    protected MD_ApplicationSchemaInformation wrap(final ApplicationSchemaInformation value) {
+        return new MD_ApplicationSchemaInformation(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MD_ApplicationSchemaInformation extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultApplicationSchemaInformation metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultApplicationSchemaInformation value) {
+        metadata = value;
     }
 }
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 172d73f..cb59754 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
@@ -53,20 +53,20 @@ public final class MD_AssociatedResource extends PropertyType<MD_AssociatedResou
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_AssociatedResource(final AssociatedResource metadata) {
-        super(metadata);
+    private MD_AssociatedResource(final AssociatedResource value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mri:MD_AssociatedResource>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_AssociatedResource wrap(final AssociatedResource metadata) {
-        return new MD_AssociatedResource(metadata);
+    protected MD_AssociatedResource wrap(final AssociatedResource value) {
+        return new MD_AssociatedResource(value);
     }
 
     /**
@@ -84,9 +84,9 @@ public final class MD_AssociatedResource extends PropertyType<MD_AssociatedResou
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultAssociatedResource metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultAssociatedResource value) {
+        metadata = value;
     }
 }
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 e0f510b..0f2a149 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
@@ -53,20 +53,20 @@ public final class MD_AttributeGroup extends PropertyType<MD_AttributeGroup, Att
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_AttributeGroup(final AttributeGroup metadata) {
-        super(metadata);
+    private MD_AttributeGroup(final AttributeGroup value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrc:MD_AttributeGroup>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_AttributeGroup wrap(final AttributeGroup metadata) {
-        return new MD_AttributeGroup(metadata);
+    protected MD_AttributeGroup wrap(final AttributeGroup value) {
+        return new MD_AttributeGroup(value);
     }
 
     /**
@@ -84,9 +84,9 @@ public final class MD_AttributeGroup extends PropertyType<MD_AttributeGroup, Att
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultAttributeGroup metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultAttributeGroup value) {
+        metadata = value;
     }
 }
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 9010a33..a67055c 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
@@ -54,20 +54,20 @@ public final class MD_BrowseGraphic extends PropertyType<MD_BrowseGraphic, Brows
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_BrowseGraphic(final BrowseGraphic metadata) {
-        super(metadata);
+    private MD_BrowseGraphic(final BrowseGraphic value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mcc:MD_BrowseGraphic>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_BrowseGraphic wrap(final BrowseGraphic metadata) {
-        return new MD_BrowseGraphic(metadata);
+    protected MD_BrowseGraphic wrap(final BrowseGraphic value) {
+        return new MD_BrowseGraphic(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_BrowseGraphic extends PropertyType<MD_BrowseGraphic, Brows
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultBrowseGraphic metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultBrowseGraphic value) {
+        metadata = value;
     }
 }
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 3f16e51..cbb92d9 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
@@ -54,20 +54,20 @@ public final class MD_Constraints extends PropertyType<MD_Constraints, Constrain
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Constraints(final Constraints metadata) {
-        super(metadata);
+    private MD_Constraints(final Constraints value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mco:MD_Constraints>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Constraints wrap(final Constraints metadata) {
-        return new MD_Constraints(metadata);
+    protected MD_Constraints wrap(final Constraints value) {
+        return new MD_Constraints(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_Constraints extends PropertyType<MD_Constraints, Constrain
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultConstraints metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultConstraints value) {
+        metadata = value;
     }
 }
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 7d0653e..488a041 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
@@ -60,20 +60,20 @@ public final class MD_ContentInformation extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_ContentInformation(final ContentInformation metadata) {
-        super(metadata);
+    private MD_ContentInformation(final ContentInformation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrc:MD_ContentInformation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_ContentInformation wrap(final ContentInformation metadata) {
-        return new MD_ContentInformation(metadata);
+    protected MD_ContentInformation wrap(final ContentInformation value) {
+        return new MD_ContentInformation(value);
     }
 
     /**
@@ -98,9 +98,9 @@ public final class MD_ContentInformation extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final AbstractContentInformation metadata) {
-        this.metadata = metadata;
+    public void setElement(final AbstractContentInformation value) {
+        metadata = value;
     }
 }
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 a00b190..5dfa77f 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
@@ -56,20 +56,20 @@ public final class MD_DataIdentification extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_DataIdentification(final DataIdentification metadata) {
-        super(metadata);
+    private MD_DataIdentification(final DataIdentification value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mri:MD_DataIdentification>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_DataIdentification wrap(final DataIdentification metadata) {
-        return new MD_DataIdentification(metadata);
+    protected MD_DataIdentification wrap(final DataIdentification value) {
+        return new MD_DataIdentification(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MD_DataIdentification extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultDataIdentification metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultDataIdentification value) {
+        metadata = value;
     }
 }
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 09232ca..df80ca1 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
@@ -56,20 +56,20 @@ public final class MD_DigitalTransferOptions extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_DigitalTransferOptions(final DigitalTransferOptions metadata) {
-        super(metadata);
+    private MD_DigitalTransferOptions(final DigitalTransferOptions value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrd:MD_DigitalTransferOptions>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_DigitalTransferOptions wrap(final DigitalTransferOptions metadata) {
-        return new MD_DigitalTransferOptions(metadata);
+    protected MD_DigitalTransferOptions wrap(final DigitalTransferOptions value) {
+        return new MD_DigitalTransferOptions(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MD_DigitalTransferOptions extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultDigitalTransferOptions metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultDigitalTransferOptions value) {
+        metadata = value;
     }
 }
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 d9b4d5e..1bcd28d 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
@@ -54,20 +54,20 @@ public final class MD_Dimension extends PropertyType<MD_Dimension, Dimension> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Dimension(final Dimension metadata) {
-        super(metadata);
+    private MD_Dimension(final Dimension value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <msr:MD_Dimension>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Dimension wrap(final Dimension metadata) {
-        return new MD_Dimension(metadata);
+    protected MD_Dimension wrap(final Dimension value) {
+        return new MD_Dimension(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_Dimension extends PropertyType<MD_Dimension, Dimension> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultDimension metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultDimension value) {
+        metadata = value;
     }
 }
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 c1040ab..ef5c7ec 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
@@ -54,20 +54,20 @@ public final class MD_Distribution extends PropertyType<MD_Distribution, Distrib
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Distribution(final Distribution metadata) {
-        super(metadata);
+    private MD_Distribution(final Distribution value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrd:MD_Distribution>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Distribution wrap(final Distribution metadata) {
-        return new MD_Distribution(metadata);
+    protected MD_Distribution wrap(final Distribution value) {
+        return new MD_Distribution(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_Distribution extends PropertyType<MD_Distribution, Distrib
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultDistribution metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultDistribution value) {
+        metadata = value;
     }
 }
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 66c6a2b..18f65f7 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
@@ -54,20 +54,20 @@ public final class MD_Distributor extends PropertyType<MD_Distributor, Distribut
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Distributor(final Distributor metadata) {
-        super(metadata);
+    private MD_Distributor(final Distributor value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrd:MD_Distributor>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Distributor wrap(final Distributor metadata) {
-        return new MD_Distributor(metadata);
+    protected MD_Distributor wrap(final Distributor value) {
+        return new MD_Distributor(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_Distributor extends PropertyType<MD_Distributor, Distribut
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultDistributor metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultDistributor value) {
+        metadata = value;
     }
 }
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 2923559..ab42921 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
@@ -56,20 +56,20 @@ public final class MD_ExtendedElementInformation extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_ExtendedElementInformation(final ExtendedElementInformation metadata) {
-        super(metadata);
+    private MD_ExtendedElementInformation(final ExtendedElementInformation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mex:MD_ExtendedElementInformation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_ExtendedElementInformation wrap(final ExtendedElementInformation metadata) {
-        return new MD_ExtendedElementInformation(metadata);
+    protected MD_ExtendedElementInformation wrap(final ExtendedElementInformation value) {
+        return new MD_ExtendedElementInformation(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MD_ExtendedElementInformation extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultExtendedElementInformation metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultExtendedElementInformation value) {
+        metadata = value;
     }
 }
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 86292dc..6faa790 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
@@ -54,20 +54,20 @@ public final class MD_FeatureTypeInfo extends PropertyType<MD_FeatureTypeInfo, F
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_FeatureTypeInfo(final FeatureTypeInfo metadata) {
-        super(metadata);
+    private MD_FeatureTypeInfo(final FeatureTypeInfo value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrc:MD_FeatureTypeInfo>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_FeatureTypeInfo wrap(final FeatureTypeInfo metadata) {
-        return new MD_FeatureTypeInfo(metadata);
+    protected MD_FeatureTypeInfo wrap(final FeatureTypeInfo value) {
+        return new MD_FeatureTypeInfo(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_FeatureTypeInfo extends PropertyType<MD_FeatureTypeInfo, F
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultFeatureTypeInfo metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultFeatureTypeInfo value) {
+        metadata = value;
     }
 }
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 23ae2e6..f31f437 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
@@ -54,20 +54,20 @@ public final class MD_Format extends PropertyType<MD_Format, Format> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Format(final Format metadata) {
-        super(metadata);
+    private MD_Format(final Format value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrd:MD_Format>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Format wrap(final Format metadata) {
-        return new MD_Format(metadata);
+    protected MD_Format wrap(final Format value) {
+        return new MD_Format(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_Format extends PropertyType<MD_Format, Format> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultFormat metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultFormat value) {
+        metadata = value;
     }
 }
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 34f66a1..46593eb 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
@@ -54,20 +54,20 @@ public final class MD_GeometricObjects extends PropertyType<MD_GeometricObjects,
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_GeometricObjects(final GeometricObjects metadata) {
-        super(metadata);
+    private MD_GeometricObjects(final GeometricObjects value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <msr:MD_GeometricObjects>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_GeometricObjects wrap(final GeometricObjects metadata) {
-        return new MD_GeometricObjects(metadata);
+    protected MD_GeometricObjects wrap(final GeometricObjects value) {
+        return new MD_GeometricObjects(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_GeometricObjects extends PropertyType<MD_GeometricObjects,
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultGeometricObjects metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultGeometricObjects value) {
+        metadata = value;
     }
 }
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 f7eef42..72503dc 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
@@ -54,20 +54,20 @@ public final class MD_Identification extends PropertyType<MD_Identification, Ide
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Identification(final Identification metadata) {
-        super(metadata);
+    private MD_Identification(final Identification value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mri:MD_Identification>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Identification wrap(final Identification metadata) {
-        return new MD_Identification(metadata);
+    protected MD_Identification wrap(final Identification value) {
+        return new MD_Identification(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_Identification extends PropertyType<MD_Identification, Ide
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final AbstractIdentification metadata) {
-        this.metadata = metadata;
+    public void setElement(final AbstractIdentification value) {
+        metadata = value;
     }
 }
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 6188848..a94754a 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
@@ -56,20 +56,20 @@ public class MD_Identifier extends PropertyType<MD_Identifier, Identifier> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Identifier(final Identifier metadata) {
-        super(metadata);
+    private MD_Identifier(final Identifier value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mcc:MD_Identifier>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Identifier wrap(final Identifier metadata) {
-        return new MD_Identifier(metadata);
+    protected MD_Identifier wrap(final Identifier value) {
+        return new MD_Identifier(value);
     }
 
     /**
@@ -97,10 +97,10 @@ public class MD_Identifier extends PropertyType<MD_Identifier, Identifier> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public final void setElement(final DefaultIdentifier metadata) {
-        this.metadata = metadata;
+    public final void setElement(final DefaultIdentifier value) {
+        metadata = value;
     }
 
     /**
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 a9df9a7..abafc74 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
@@ -53,20 +53,20 @@ public class MD_KeywordClass extends PropertyType<MD_KeywordClass, KeywordClass>
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_KeywordClass(final KeywordClass metadata) {
-        super(metadata);
+    private MD_KeywordClass(final KeywordClass value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mri:MD_KeywordClass>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_KeywordClass wrap(final KeywordClass metadata) {
-        return new MD_KeywordClass(metadata);
+    protected MD_KeywordClass wrap(final KeywordClass value) {
+        return new MD_KeywordClass(value);
     }
 
     /**
@@ -84,10 +84,10 @@ public class MD_KeywordClass extends PropertyType<MD_KeywordClass, KeywordClass>
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public final void setElement(final DefaultKeywordClass metadata) {
-        this.metadata = metadata;
+    public final void setElement(final DefaultKeywordClass value) {
+        metadata = value;
     }
 
     /**
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 ffacdde..d1ac2ec 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
@@ -54,20 +54,20 @@ public final class MD_Keywords extends PropertyType<MD_Keywords, Keywords> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Keywords(final Keywords metadata) {
-        super(metadata);
+    private MD_Keywords(final Keywords value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mri:MD_Keywords>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Keywords wrap(final Keywords metadata) {
-        return new MD_Keywords(metadata);
+    protected MD_Keywords wrap(final Keywords value) {
+        return new MD_Keywords(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_Keywords extends PropertyType<MD_Keywords, Keywords> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultKeywords metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultKeywords value) {
+        metadata = value;
     }
 }
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 d019abf..6a486f0 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
@@ -56,20 +56,20 @@ public final class MD_MaintenanceInformation extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_MaintenanceInformation(final MaintenanceInformation metadata) {
-        super(metadata);
+    private MD_MaintenanceInformation(final MaintenanceInformation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mmi:MD_MaintenanceInformation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_MaintenanceInformation wrap(final MaintenanceInformation metadata) {
-        return new MD_MaintenanceInformation(metadata);
+    protected MD_MaintenanceInformation wrap(final MaintenanceInformation value) {
+        return new MD_MaintenanceInformation(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MD_MaintenanceInformation extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultMaintenanceInformation metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultMaintenanceInformation value) {
+        metadata = value;
     }
 }
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 806b2a0..cd71824 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
@@ -54,20 +54,20 @@ public class MD_Medium extends PropertyType<MD_Medium, Medium> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Medium(final Medium metadata) {
-        super(metadata);
+    private MD_Medium(final Medium value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrd:MD_Medium>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Medium wrap(final Medium metadata) {
-        return new MD_Medium(metadata);
+    protected MD_Medium wrap(final Medium value) {
+        return new MD_Medium(value);
     }
 
     /**
@@ -85,10 +85,10 @@ public class MD_Medium extends PropertyType<MD_Medium, Medium> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public final void setElement(final DefaultMedium metadata) {
-        this.metadata = metadata;
+    public final void setElement(final DefaultMedium value) {
+        metadata = value;
     }
 
     /**
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 ee25b95..4b42108 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
@@ -53,20 +53,20 @@ public final class MD_Metadata extends PropertyType<MD_Metadata, Metadata> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Metadata(final Metadata metadata) {
-        super(metadata);
+    private MD_Metadata(final Metadata value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mdb:MD_Metadata>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Metadata wrap(final Metadata metadata) {
-        return new MD_Metadata(metadata);
+    protected MD_Metadata wrap(final Metadata value) {
+        return new MD_Metadata(value);
     }
 
     /**
@@ -84,9 +84,9 @@ public final class MD_Metadata extends PropertyType<MD_Metadata, Metadata> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultMetadata metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultMetadata value) {
+        metadata = value;
     }
 }
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 e242ba6..d76a9bd 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
@@ -56,20 +56,20 @@ public final class MD_MetadataExtensionInformation extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_MetadataExtensionInformation(final MetadataExtensionInformation metadata) {
-        super(metadata);
+    private MD_MetadataExtensionInformation(final MetadataExtensionInformation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mex:MD_MetadataExtensionInformation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_MetadataExtensionInformation wrap(final MetadataExtensionInformation metadata) {
-        return new MD_MetadataExtensionInformation(metadata);
+    protected MD_MetadataExtensionInformation wrap(final MetadataExtensionInformation value) {
+        return new MD_MetadataExtensionInformation(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MD_MetadataExtensionInformation extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultMetadataExtensionInformation metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultMetadataExtensionInformation value) {
+        metadata = value;
     }
 }
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 494ca1a..5bfaea6 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
@@ -53,20 +53,20 @@ public final class MD_MetadataScope extends PropertyType<MD_MetadataScope, Metad
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_MetadataScope(final MetadataScope metadata) {
-        super(metadata);
+    private MD_MetadataScope(final MetadataScope value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mdb:MD_MetadataScope>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_MetadataScope wrap(final MetadataScope metadata) {
-        return new MD_MetadataScope(metadata);
+    protected MD_MetadataScope wrap(final MetadataScope value) {
+        return new MD_MetadataScope(value);
     }
 
     /**
@@ -84,9 +84,9 @@ public final class MD_MetadataScope extends PropertyType<MD_MetadataScope, Metad
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultMetadataScope metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultMetadataScope value) {
+        metadata = value;
     }
 }
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 bd8f4fb..0881a20 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
@@ -56,20 +56,20 @@ public final class MD_PortrayalCatalogueReference extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_PortrayalCatalogueReference(final PortrayalCatalogueReference metadata) {
-        super(metadata);
+    private MD_PortrayalCatalogueReference(final PortrayalCatalogueReference value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mpc:MD_PortrayalCatalogueReference>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_PortrayalCatalogueReference wrap(final PortrayalCatalogueReference metadata) {
-        return new MD_PortrayalCatalogueReference(metadata);
+    protected MD_PortrayalCatalogueReference wrap(final PortrayalCatalogueReference value) {
+        return new MD_PortrayalCatalogueReference(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MD_PortrayalCatalogueReference extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultPortrayalCatalogueReference metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultPortrayalCatalogueReference value) {
+        metadata = value;
     }
 }
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 27ab5dd..125804f 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
@@ -56,20 +56,20 @@ public final class MD_RangeDimension extends PropertyType<MD_RangeDimension, Ran
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_RangeDimension(final RangeDimension metadata) {
-        super(metadata);
+    private MD_RangeDimension(final RangeDimension value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrc:MD_RangeDimension>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_RangeDimension wrap(final RangeDimension metadata) {
-        return new MD_RangeDimension(metadata);
+    protected MD_RangeDimension wrap(final RangeDimension value) {
+        return new MD_RangeDimension(value);
     }
 
     /**
@@ -91,9 +91,9 @@ public final class MD_RangeDimension extends PropertyType<MD_RangeDimension, Ran
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultRangeDimension metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultRangeDimension value) {
+        metadata = value;
     }
 }
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 d1d6504..2d240e8 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
@@ -54,20 +54,20 @@ public class MD_Releasability extends PropertyType<MD_Releasability, Releasabili
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Releasability(final Releasability metadata) {
-        super(metadata);
+    private MD_Releasability(final Releasability value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mco:MD_Releasability>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Releasability wrap(final Releasability metadata) {
-        return new MD_Releasability(metadata);
+    protected MD_Releasability wrap(final Releasability value) {
+        return new MD_Releasability(value);
     }
 
     /**
@@ -85,10 +85,10 @@ public class MD_Releasability extends PropertyType<MD_Releasability, Releasabili
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public final void setElement(final DefaultReleasability metadata) {
-        this.metadata = metadata;
+    public final void setElement(final DefaultReleasability value) {
+        metadata = value;
     }
 
     /**
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 17601ff..2dc833c 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
@@ -56,20 +56,20 @@ public final class MD_RepresentativeFraction extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_RepresentativeFraction(final RepresentativeFraction metadata) {
-        super(metadata);
+    private MD_RepresentativeFraction(final RepresentativeFraction value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mri:MD_RepresentativeFraction>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_RepresentativeFraction wrap(final RepresentativeFraction metadata) {
-        return new MD_RepresentativeFraction(metadata);
+    protected MD_RepresentativeFraction wrap(final RepresentativeFraction value) {
+        return new MD_RepresentativeFraction(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MD_RepresentativeFraction extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultRepresentativeFraction metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultRepresentativeFraction value) {
+        metadata = value;
     }
 }
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 cd50be5..86175c7 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
@@ -54,20 +54,20 @@ public class MD_Resolution extends PropertyType<MD_Resolution, Resolution> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Resolution(final Resolution metadata) {
-        super(metadata);
+    private MD_Resolution(final Resolution value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mri:MD_Resolution>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Resolution wrap(final Resolution metadata) {
-        return new MD_Resolution(metadata);
+    protected MD_Resolution wrap(final Resolution value) {
+        return new MD_Resolution(value);
     }
 
     /**
@@ -85,10 +85,10 @@ public class MD_Resolution extends PropertyType<MD_Resolution, Resolution> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public final void setElement(final DefaultResolution metadata) {
-        this.metadata = metadata;
+    public final void setElement(final DefaultResolution value) {
+        metadata = value;
     }
 
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java
index 0e8efd6..3dbcbd5 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java
@@ -54,20 +54,20 @@ public class MD_Scope extends PropertyType<MD_Scope, Scope> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Scope(final Scope metadata) {
-        super(metadata);
+    private MD_Scope(final Scope value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mcc:MD_Scope>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Scope wrap(final Scope metadata) {
-        return new MD_Scope(metadata);
+    protected MD_Scope wrap(final Scope value) {
+        return new MD_Scope(value);
     }
 
     /**
@@ -85,10 +85,10 @@ public class MD_Scope extends PropertyType<MD_Scope, Scope> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public final void setElement(final DefaultScope metadata) {
-        this.metadata = metadata;
+    public final void setElement(final DefaultScope value) {
+        metadata = value;
     }
 
     /**
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 60190f4..5e4c235 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
@@ -54,20 +54,20 @@ public final class MD_ScopeDescription extends PropertyType<MD_ScopeDescription,
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_ScopeDescription(final ScopeDescription metadata) {
-        super(metadata);
+    private MD_ScopeDescription(final ScopeDescription value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mcc:MD_ScopeDescription>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_ScopeDescription wrap(final ScopeDescription metadata) {
-        return new MD_ScopeDescription(metadata);
+    protected MD_ScopeDescription wrap(final ScopeDescription value) {
+        return new MD_ScopeDescription(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_ScopeDescription extends PropertyType<MD_ScopeDescription,
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultScopeDescription metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultScopeDescription value) {
+        metadata = value;
     }
 }
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 411025a..dfcacd0 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
@@ -60,20 +60,20 @@ public final class MD_SpatialRepresentation extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_SpatialRepresentation(final SpatialRepresentation metadata) {
-        super(metadata);
+    private MD_SpatialRepresentation(final SpatialRepresentation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <msr:MD_SpatialRepresentation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_SpatialRepresentation wrap(final SpatialRepresentation metadata) {
-        return new MD_SpatialRepresentation(metadata);
+    protected MD_SpatialRepresentation wrap(final SpatialRepresentation value) {
+        return new MD_SpatialRepresentation(value);
     }
 
     /**
@@ -98,9 +98,9 @@ public final class MD_SpatialRepresentation extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final AbstractSpatialRepresentation metadata) {
-        this.metadata = metadata;
+    public void setElement(final AbstractSpatialRepresentation value) {
+        metadata = value;
     }
 }
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 bead953..650c8e7 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
@@ -56,20 +56,20 @@ public final class MD_StandardOrderProcess extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_StandardOrderProcess(final StandardOrderProcess metadata) {
-        super(metadata);
+    private MD_StandardOrderProcess(final StandardOrderProcess value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrd:MD_StandardOrderProcess>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_StandardOrderProcess wrap(final StandardOrderProcess metadata) {
-        return new MD_StandardOrderProcess(metadata);
+    protected MD_StandardOrderProcess wrap(final StandardOrderProcess value) {
+        return new MD_StandardOrderProcess(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MD_StandardOrderProcess extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultStandardOrderProcess metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultStandardOrderProcess value) {
+        metadata = value;
     }
 }
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 8c0a313..5a3f9ff 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
@@ -54,20 +54,20 @@ public final class MD_Usage extends PropertyType<MD_Usage, Usage> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MD_Usage(final Usage metadata) {
-        super(metadata);
+    private MD_Usage(final Usage value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mri:MD_Usage>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MD_Usage wrap(final Usage metadata) {
-        return new MD_Usage(metadata);
+    protected MD_Usage wrap(final Usage value) {
+        return new MD_Usage(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MD_Usage extends PropertyType<MD_Usage, Usage> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultUsage metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultUsage value) {
+        metadata = value;
     }
 }
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 62b246e..c24f86a 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
@@ -56,20 +56,20 @@ public final class MI_AcquisitionInformation extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_AcquisitionInformation(final AcquisitionInformation metadata) {
-        super(metadata);
+    private MI_AcquisitionInformation(final AcquisitionInformation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_AcquisitionInformation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_AcquisitionInformation wrap(final AcquisitionInformation metadata) {
-        return new MI_AcquisitionInformation(metadata);
+    protected MI_AcquisitionInformation wrap(final AcquisitionInformation value) {
+        return new MI_AcquisitionInformation(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MI_AcquisitionInformation extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultAcquisitionInformation metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultAcquisitionInformation value) {
+        metadata = value;
     }
 }
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 00f3bce..d3dd782 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
@@ -56,20 +56,20 @@ public final class MI_EnvironmentalRecord extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_EnvironmentalRecord(final EnvironmentalRecord metadata) {
-        super(metadata);
+    private MI_EnvironmentalRecord(final EnvironmentalRecord value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_EnvironmentalRecord>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_EnvironmentalRecord wrap(final EnvironmentalRecord metadata) {
-        return new MI_EnvironmentalRecord(metadata);
+    protected MI_EnvironmentalRecord wrap(final EnvironmentalRecord value) {
+        return new MI_EnvironmentalRecord(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MI_EnvironmentalRecord extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultEnvironmentalRecord metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultEnvironmentalRecord value) {
+        metadata = value;
     }
 }
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 a59cd81..ed80068 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
@@ -54,20 +54,20 @@ public final class MI_Event extends PropertyType<MI_Event, Event> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_Event(final Event metadata) {
-        super(metadata);
+    private MI_Event(final Event value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_Event>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_Event wrap(final Event metadata) {
-        return new MI_Event(metadata);
+    protected MI_Event wrap(final Event value) {
+        return new MI_Event(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MI_Event extends PropertyType<MI_Event, Event> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultEvent metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultEvent value) {
+        metadata = value;
     }
 }
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 29d3c92..dcc9f29 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
@@ -54,20 +54,20 @@ public final class MI_GCP extends PropertyType<MI_GCP, GCP> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_GCP(final GCP metadata) {
-        super(metadata);
+    private MI_GCP(final GCP value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <msr:MI_GCP>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_GCP wrap(final GCP metadata) {
-        return new MI_GCP(metadata);
+    protected MI_GCP wrap(final GCP value) {
+        return new MI_GCP(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MI_GCP extends PropertyType<MI_GCP, GCP> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultGCP metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultGCP value) {
+        metadata = value;
     }
 }
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 0ed5059..e42f72f 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
@@ -56,20 +56,20 @@ public final class MI_GeolocationInformation extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_GeolocationInformation(final GeolocationInformation metadata) {
-        super(metadata);
+    private MI_GeolocationInformation(final GeolocationInformation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <msr:MI_GeolocationInformation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_GeolocationInformation wrap(final GeolocationInformation metadata) {
-        return new MI_GeolocationInformation(metadata);
+    protected MI_GeolocationInformation wrap(final GeolocationInformation value) {
+        return new MI_GeolocationInformation(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MI_GeolocationInformation extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final AbstractGeolocationInformation metadata) {
-        this.metadata = metadata;
+    public void setElement(final AbstractGeolocationInformation value) {
+        metadata = value;
     }
 }
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 57e1fa3..20f1a2b 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
@@ -54,20 +54,20 @@ public final class MI_Instrument extends PropertyType<MI_Instrument, Instrument>
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_Instrument(final Instrument metadata) {
-        super(metadata);
+    private MI_Instrument(final Instrument value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_Instrument>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_Instrument wrap(final Instrument metadata) {
-        return new MI_Instrument(metadata);
+    protected MI_Instrument wrap(final Instrument value) {
+        return new MI_Instrument(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MI_Instrument extends PropertyType<MI_Instrument, Instrument>
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultInstrument metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultInstrument value) {
+        metadata = value;
     }
 }
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 77fe293..f85f44b 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
@@ -54,20 +54,20 @@ public final class MI_Objective extends PropertyType<MI_Objective, Objective> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_Objective(final Objective metadata) {
-        super(metadata);
+    private MI_Objective(final Objective value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_Objective>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_Objective wrap(final Objective metadata) {
-        return new MI_Objective(metadata);
+    protected MI_Objective wrap(final Objective value) {
+        return new MI_Objective(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MI_Objective extends PropertyType<MI_Objective, Objective> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultObjective metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultObjective value) {
+        metadata = value;
     }
 }
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 419b28a..cbb6c56 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
@@ -54,20 +54,20 @@ public final class MI_Operation extends PropertyType<MI_Operation, Operation> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_Operation(final Operation metadata) {
-        super(metadata);
+    private MI_Operation(final Operation value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_Operation>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_Operation wrap(final Operation metadata) {
-        return new MI_Operation(metadata);
+    protected MI_Operation wrap(final Operation value) {
+        return new MI_Operation(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MI_Operation extends PropertyType<MI_Operation, Operation> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultOperation metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultOperation value) {
+        metadata = value;
     }
 }
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 6e184ae..11bcad9 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
@@ -54,20 +54,20 @@ public final class MI_Plan extends PropertyType<MI_Plan, Plan> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_Plan(final Plan metadata) {
-        super(metadata);
+    private MI_Plan(final Plan value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_Plan>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_Plan wrap(final Plan metadata) {
-        return new MI_Plan(metadata);
+    protected MI_Plan wrap(final Plan value) {
+        return new MI_Plan(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MI_Plan extends PropertyType<MI_Plan, Plan> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultPlan metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultPlan value) {
+        metadata = value;
     }
 }
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 15721ed..b0d3348 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
@@ -54,20 +54,20 @@ public final class MI_Platform extends PropertyType<MI_Platform, Platform> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_Platform(final Platform metadata) {
-        super(metadata);
+    private MI_Platform(final Platform value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_Platform>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_Platform wrap(final Platform metadata) {
-        return new MI_Platform(metadata);
+    protected MI_Platform wrap(final Platform value) {
+        return new MI_Platform(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MI_Platform extends PropertyType<MI_Platform, Platform> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultPlatform metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultPlatform value) {
+        metadata = value;
     }
 }
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 05ecb37..0d71633 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
@@ -54,20 +54,20 @@ public final class MI_PlatformPass extends PropertyType<MI_PlatformPass, Platfor
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_PlatformPass(final PlatformPass metadata) {
-        super(metadata);
+    private MI_PlatformPass(final PlatformPass value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_PlatformPass>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_PlatformPass wrap(final PlatformPass metadata) {
-        return new MI_PlatformPass(metadata);
+    protected MI_PlatformPass wrap(final PlatformPass value) {
+        return new MI_PlatformPass(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MI_PlatformPass extends PropertyType<MI_PlatformPass, Platfor
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultPlatformPass metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultPlatformPass value) {
+        metadata = value;
     }
 }
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 b9898ce..225b295 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
@@ -56,20 +56,20 @@ public final class MI_RangeElementDescription extends
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_RangeElementDescription(final RangeElementDescription metadata) {
-        super(metadata);
+    private MI_RangeElementDescription(final RangeElementDescription value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mrc:MI_RangeElementDescription>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_RangeElementDescription wrap(final RangeElementDescription metadata) {
-        return new MI_RangeElementDescription(metadata);
+    protected MI_RangeElementDescription wrap(final RangeElementDescription value) {
+        return new MI_RangeElementDescription(value);
     }
 
     /**
@@ -87,9 +87,9 @@ public final class MI_RangeElementDescription extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultRangeElementDescription metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultRangeElementDescription value) {
+        metadata = value;
     }
 }
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 41ca475..9954a05 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
@@ -54,20 +54,20 @@ public final class MI_RequestedDate extends PropertyType<MI_RequestedDate, Reque
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_RequestedDate(final RequestedDate metadata) {
-        super(metadata);
+    private MI_RequestedDate(final RequestedDate value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_RequestedDate>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_RequestedDate wrap(final RequestedDate metadata) {
-        return new MI_RequestedDate(metadata);
+    protected MI_RequestedDate wrap(final RequestedDate value) {
+        return new MI_RequestedDate(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MI_RequestedDate extends PropertyType<MI_RequestedDate, Reque
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultRequestedDate metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultRequestedDate value) {
+        metadata = value;
     }
 }
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 004403b..ade1f6f 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
@@ -54,20 +54,20 @@ public final class MI_Requirement extends PropertyType<MI_Requirement, Requireme
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MI_Requirement(final Requirement metadata) {
-        super(metadata);
+    private MI_Requirement(final Requirement value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <mac:MI_Requirement>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MI_Requirement wrap(final Requirement metadata) {
-        return new MI_Requirement(metadata);
+    protected MI_Requirement wrap(final Requirement value) {
+        return new MI_Requirement(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MI_Requirement extends PropertyType<MI_Requirement, Requireme
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultRequirement metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultRequirement value) {
+        metadata = value;
     }
 }
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
index bc46223..4b42eba 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
@@ -54,20 +54,20 @@ public final class MX_DataFile extends PropertyType<MX_DataFile, DataFile> {
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private MX_DataFile(final DataFile metadata) {
-        super(metadata);
+    private MX_DataFile(final DataFile value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <gcx:MX_DataFile>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected MX_DataFile wrap(final DataFile metadata) {
-        return new MX_DataFile(metadata);
+    protected MX_DataFile wrap(final DataFile value) {
+        return new MX_DataFile(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class MX_DataFile extends PropertyType<MX_DataFile, DataFile> {
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultDataFile metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultDataFile value) {
+        metadata = value;
     }
 }
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
index aa9c599..e412b3f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
@@ -72,22 +72,22 @@ public class RS_ReferenceSystem extends PropertyType<RS_ReferenceSystem, Referen
     /**
      * Wraps a Reference System value in a {@code MD_ReferenceSystem} element at marshalling-time.
      *
-     * @param  metadata  the metadata value to marshal.
+     * @param  value  the metadata element to marshal.
      */
-    protected RS_ReferenceSystem(final ReferenceSystem metadata) {
-        super(metadata);
+    protected RS_ReferenceSystem(final ReferenceSystem value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <gmd:RS_ReferenceSystem>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected RS_ReferenceSystem wrap(ReferenceSystem metadata) {
-        return new RS_ReferenceSystem(metadata);
+    protected RS_ReferenceSystem wrap(ReferenceSystem value) {
+        return new RS_ReferenceSystem(value);
     }
 
     /**
@@ -112,10 +112,10 @@ public class RS_ReferenceSystem extends PropertyType<RS_ReferenceSystem, Referen
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public final void setElement(final ReferenceSystemMetadata metadata) {
-        this.metadata = metadata;
+    public final void setElement(final ReferenceSystemMetadata value) {
+        metadata = value;
     }
 
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
index 2ad1b5b..ddcc040 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
@@ -53,20 +53,20 @@ public final class SV_CoupledResource extends PropertyType<SV_CoupledResource, C
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private SV_CoupledResource(final CoupledResource metadata) {
-        super(metadata);
+    private SV_CoupledResource(final CoupledResource value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <srv:SV_CoupledResource>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected SV_CoupledResource wrap(final CoupledResource metadata) {
-        return new SV_CoupledResource(metadata);
+    protected SV_CoupledResource wrap(final CoupledResource value) {
+        return new SV_CoupledResource(value);
     }
 
     /**
@@ -84,9 +84,9 @@ public final class SV_CoupledResource extends PropertyType<SV_CoupledResource, C
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultCoupledResource metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultCoupledResource value) {
+        metadata = value;
     }
 }
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
index eb682a7..94b6ad2 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
@@ -53,20 +53,20 @@ public final class SV_OperationChainMetadata extends PropertyType<SV_OperationCh
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private SV_OperationChainMetadata(final OperationChainMetadata metadata) {
-        super(metadata);
+    private SV_OperationChainMetadata(final OperationChainMetadata value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <srv:SV_OperationChainMetadata>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected SV_OperationChainMetadata wrap(final OperationChainMetadata metadata) {
-        return new SV_OperationChainMetadata(metadata);
+    protected SV_OperationChainMetadata wrap(final OperationChainMetadata value) {
+        return new SV_OperationChainMetadata(value);
     }
 
     /**
@@ -84,9 +84,9 @@ public final class SV_OperationChainMetadata extends PropertyType<SV_OperationCh
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final DefaultOperationChainMetadata metadata) {
-        this.metadata = metadata;
+    public void setElement(final DefaultOperationChainMetadata value) {
+        metadata = value;
     }
 }
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
index 5adb052..5a07a58 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
@@ -53,20 +53,20 @@ public class SV_OperationMetadata extends PropertyType<SV_OperationMetadata, Ope
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private SV_OperationMetadata(final OperationMetadata metadata) {
-        super(metadata);
+    private SV_OperationMetadata(final OperationMetadata value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <srv:SV_OperationMetadata>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected SV_OperationMetadata wrap(final OperationMetadata metadata) {
-        return new SV_OperationMetadata(metadata);
+    protected SV_OperationMetadata wrap(final OperationMetadata value) {
+        return new SV_OperationMetadata(value);
     }
 
     /**
@@ -84,10 +84,10 @@ public class SV_OperationMetadata extends PropertyType<SV_OperationMetadata, Ope
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public final void setElement(final DefaultOperationMetadata metadata) {
-        this.metadata = metadata;
+    public final void setElement(final DefaultOperationMetadata value) {
+        metadata = value;
     }
 
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java
index 8f943ac..7fd303c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java
@@ -54,20 +54,20 @@ public final class SV_Parameter extends PropertyType<SV_Parameter, ParameterDesc
     /**
      * Constructor for the {@link #wrap} method only.
      */
-    private SV_Parameter(final ParameterDescriptor<?> metadata) {
-        super(metadata);
+    private SV_Parameter(final ParameterDescriptor<?> value) {
+        super(value);
     }
 
     /**
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <srv:SV_Parameter>} XML element.
      *
-     * @param  metadata  the metadata element to marshal.
+     * @param  value  the metadata element to marshal.
      * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
-    protected SV_Parameter wrap(final ParameterDescriptor<?> metadata) {
-        return new SV_Parameter(metadata);
+    protected SV_Parameter wrap(final ParameterDescriptor<?> value) {
+        return new SV_Parameter(value);
     }
 
     /**
@@ -85,9 +85,9 @@ public final class SV_Parameter extends PropertyType<SV_Parameter, ParameterDesc
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param  metadata  the unmarshalled metadata.
+     * @param  value  the unmarshalled metadata.
      */
-    public void setElement(final ServiceParameter metadata) {
-        this.metadata = metadata;
+    public void setElement(final ServiceParameter value) {
+        metadata = value;
     }
 }
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 0ef26da..0f03d9d 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
@@ -50,7 +50,7 @@
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @author  Cullen Rombach (Image Matters)
- * @since   1.0
+ * @since   1.1
  *
  * @see javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter
  *