Index: geoapi/src/main/java/org/opengis/metadata/constraint/Constraints.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/constraint/Constraints.java	(révision 1402)
+++ geoapi/src/main/java/org/opengis/metadata/constraint/Constraints.java	(copie de travail)
@@ -32,7 +32,19 @@
      * Example: "not to be used for navigation".
      *
      * @return Limitation affecting the fitness for use of the resource.
+     *
+     * @deprecated Renamed as {@link #getUseLimitations()} (with an "s").
      */
+    @Deprecated
     @UML(identifier="useLimitation", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends InternationalString> getUseLimitation();
+
+    /**
+     * Limitation affecting the fitness for use of the resource.
+     * Example: "not to be used for navigation".
+     *
+     * @return Limitation affecting the fitness for use of the resource.
+     */
+    @UML(identifier="useLimitation", obligation=OPTIONAL, specification=ISO_19115)
+    Collection<? extends InternationalString> getUseLimitations();
 }
Index: geoapi/src/main/java/org/opengis/metadata/quality/Element.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/quality/Element.java	(révision 1402)
+++ geoapi/src/main/java/org/opengis/metadata/quality/Element.java	(copie de travail)
@@ -35,11 +35,22 @@
      * Name of the test applied to the data.
      *
      * @return Name of the test applied to the data.
+     *
+     * @deprecated Renamed as {@link #getNamesOfMeasures()} (with an "s").
      */
+    @Deprecated
     @UML(identifier="nameOfMeasure", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends InternationalString> getNamesOfMeasure();
 
     /**
+     * Name of the test applied to the data.
+     *
+     * @return Name of the test applied to the data.
+     */
+    @UML(identifier="nameOfMeasure", obligation=OPTIONAL, specification=ISO_19115)
+    Collection<? extends InternationalString> getNamesOfMeasures();
+
+    /**
      * Code identifying a registered standard procedure, or {@code null} if none.
      *
      * @return Code identifying a registered standard procedure, or {@code null}.
Index: geoapi/src/main/java/org/opengis/metadata/identification/DataIdentification.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/identification/DataIdentification.java	(révision 1402)
+++ geoapi/src/main/java/org/opengis/metadata/identification/DataIdentification.java	(copie de travail)
@@ -56,12 +56,24 @@
      * Language(s) used within the dataset.
      *
      * @return Language(s) used.
+     *
+     * @deprecated Renamed as {@link #getLanguages()} (with an "s").
      */
+    @Deprecated
     @Profile (level=CORE)
     @UML(identifier="language", obligation=MANDATORY, specification=ISO_19115)
     Collection<Locale> getLanguage();
 
     /**
+     * Language(s) used within the dataset.
+     *
+     * @return Language(s) used.
+     */
+    @Profile (level=CORE)
+    @UML(identifier="language", obligation=MANDATORY, specification=ISO_19115)
+    Collection<Locale> getLanguages();
+
+    /**
      * Full name of the character coding standard(s) used for the dataset.
      *
      * @return Name(s) of the character coding standard(s) used.
@@ -93,12 +105,25 @@
      * extent of the dataset.
      *
      * @return Additional extent information.
+     *
+     * @deprecated Renamed as {@link #getExtents()} (with an "s").
      */
+    @Deprecated
     @Profile (level=CORE)
     @UML(identifier="extent", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends Extent> getExtent();
 
     /**
+     * Additional extent information including the bounding polygon, vertical, and temporal
+     * extent of the dataset.
+     *
+     * @return Additional extent information.
+     */
+    @Profile (level=CORE)
+    @UML(identifier="extent", obligation=OPTIONAL, specification=ISO_19115)
+    Collection<? extends Extent> getExtents();
+
+    /**
      * Any other descriptive information about the dataset.
      *
      * @return Other descriptive information, or {@code null}.
Index: geoapi/src/main/java/org/opengis/metadata/identification/Identification.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/identification/Identification.java	(révision 1402)
+++ geoapi/src/main/java/org/opengis/metadata/identification/Identification.java	(copie de travail)
@@ -93,11 +93,22 @@
      * Provides information about the frequency of resource updates, and the scope of those updates.
      *
      * @return Frequency and scope of resource updates.
+     *
+     * @deprecated Renamed as {@link #getResourceMaintenances()} (with an "s").
      */
+    @Deprecated
     @UML(identifier="resourceMaintenance", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends MaintenanceInformation> getResourceMaintenance();
 
     /**
+     * Provides information about the frequency of resource updates, and the scope of those updates.
+     *
+     * @return Frequency and scope of resource updates.
+     */
+    @UML(identifier="resourceMaintenance", obligation=OPTIONAL, specification=ISO_19115)
+    Collection<? extends MaintenanceInformation> getResourceMaintenances();
+
+    /**
      * Provides a graphic that illustrates the resource(s) (should include a legend for the graphic).
      *
      * @return A graphic that illustrates the resource(s).
@@ -109,11 +120,22 @@
      * Provides a description of the format of the resource(s).
      *
      * @return Description of the format.
+     *
+     * @deprecated Renamed as {@link #getResourceFormats()} (with an "s").
      */
+    @Deprecated
     @UML(identifier="resourceFormat", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends Format> getResourceFormat();
 
     /**
+     * Provides a description of the format of the resource(s).
+     *
+     * @return Description of the format.
+     */
+    @UML(identifier="resourceFormat", obligation=OPTIONAL, specification=ISO_19115)
+    Collection<? extends Format> getResourceFormats();
+
+    /**
      * Provides category keywords, their type, and reference source.
      *
      * @return Category keywords, their type, and reference source.
Index: geoapi/src/main/java/org/opengis/metadata/spatial/Georeferenceable.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/spatial/Georeferenceable.java	(révision 1402)
+++ geoapi/src/main/java/org/opengis/metadata/spatial/Georeferenceable.java	(copie de travail)
@@ -70,7 +70,18 @@
      * Reference providing description of the parameters.
      *
      * @return Reference providing description of the parameters.
+     *
+     * @deprecated Renamed as {@link #getParameterCitations()} (with an "s").
      */
+    @Deprecated
     @UML(identifier="parameterCitation", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends Citation> getParameterCitation();
+
+    /**
+     * Reference providing description of the parameters.
+     *
+     * @return Reference providing description of the parameters.
+     */
+    @UML(identifier="parameterCitation", obligation=OPTIONAL, specification=ISO_19115)
+    Collection<? extends Citation> getParameterCitations();
 }
Index: geoapi/src/main/java/org/opengis/metadata/citation/Citation.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/citation/Citation.java	(révision 1402)
+++ geoapi/src/main/java/org/opengis/metadata/citation/Citation.java	(copie de travail)
@@ -98,11 +98,22 @@
      * Mode in which the resource is represented, or an empty string if none.
      *
      * @return The presentation mode, or an empty collection if none.
+     *
+     * @deprecated Renamed as {@link #getPresentationForms()} (with an "s").
      */
+    @Deprecated
     @UML(identifier="presentationForm", obligation=OPTIONAL, specification=ISO_19115)
     Collection<PresentationForm> getPresentationForm();
 
     /**
+     * Mode in which the resource is represented, or an empty string if none.
+     *
+     * @return The presentation mode, or an empty collection if none.
+     */
+    @UML(identifier="presentationForm", obligation=OPTIONAL, specification=ISO_19115)
+    Collection<PresentationForm> getPresentationForms();
+
+    /**
      * Information about the series, or aggregate dataset, of which the dataset is a part.
      * Returns {@code null} if none.
      *