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 2025/09/23 14:10:59 UTC
(sis) branch geoapi-4.0 updated (b551cfcb4e -> 5092f522f7)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
omit b551cfcb4e Rename `*.privy` packages as `*.internal.shared` for making their purposes clearer. It should have no impact on user code as it is internal API. This is only a renaming with no change in the code.
new 5092f522f7 Rename `*.privy` packages as `*.internal.shared` for making their purposes clearer. It should have no impact on user code as it is internal API. This is only a renaming with no change in the code.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b551cfcb4e)
\
N -- N -- N refs/heads/geoapi-4.0 (5092f522f7)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/sis/image/{privy => internal/shared}/AssertionMessages.java | 0
.../apache/sis/image/{privy => internal/shared}/BatchComputedImage.java | 0
.../apache/sis/image/{privy => internal/shared}/ColorModelBuilder.java | 0
.../apache/sis/image/{privy => internal/shared}/ColorModelFactory.java | 0
.../org/apache/sis/image/{privy => internal/shared}/ColorModelType.java | 0
.../apache/sis/image/{privy => internal/shared}/ColorScaleBuilder.java | 0
.../org/apache/sis/image/{privy => internal/shared}/ColorsForRange.java | 0
.../org/apache/sis/image/{privy => internal/shared}/DeferredProperty.java | 0
.../main/org/apache/sis/image/{privy => internal/shared}/FillValues.java | 0
.../org/apache/sis/image/{privy => internal/shared}/ImageUtilities.java | 0
.../sis/image/{privy => internal/shared}/MultiBandsIndexColorModel.java | 0
.../org/apache/sis/image/{privy => internal/shared}/ObservableImage.java | 0
.../org/apache/sis/image/{privy => internal/shared}/RasterFactory.java | 0
.../org/apache/sis/image/{privy => internal/shared}/ReshapedImage.java | 0
.../apache/sis/image/{privy => internal/shared}/SampleModelBuilder.java | 0
.../org/apache/sis/image/{privy => internal/shared}/ScaledColorModel.java | 0
.../org/apache/sis/image/{privy => internal/shared}/ScaledColorSpace.java | 0
.../org/apache/sis/image/{privy => internal/shared}/TileErrorHandler.java | 0
.../org/apache/sis/image/{privy => internal/shared}/TileOpExecutor.java | 0
.../org/apache/sis/image/{privy => internal/shared}/TilePlaceholder.java | 0
.../main/org/apache/sis/image/{privy => internal/shared}/TiledImage.java | 0
.../apache/sis/image/{privy => internal/shared}/WritableTiledImage.java | 0
.../org/apache/sis/image/{privy => internal/shared}/package-info.java | 0
.../apache/sis/coverage/{privy => internal/shared}/RangeArgumentTest.java | 0
.../sis/feature/{privy => internal/shared}/AttributeConventionTest.java | 0
.../org/apache/sis/filter/{privy => internal/shared}/CopyVisitorTest.java | 0
.../apache/sis/filter/{privy => internal/shared}/FilterFactoryMock.java | 0
.../org/apache/sis/filter/{privy => internal/shared}/FunctionMock.java | 0
.../apache/sis/filter/{privy => internal/shared}/FunctionNamesTest.java | 0
.../apache/sis/filter/{privy => internal/shared}/ValueReferenceMock.java | 0
.../sis/image/{privy => internal/shared}/ColorModelBuilderTest.java | 0
.../apache/sis/image/{privy => internal/shared}/ImageUtilitiesTest.java | 0
.../apache/sis/image/{privy => internal/shared}/ReshapedImageTest.java | 0
.../sis/image/{privy => internal/shared}/SampleModelBuilderTest.java | 0
.../apache/sis/image/{privy => internal/shared}/ScaledColorSpaceTest.java | 0
...adataServices => org.apache.sis.util.internal.shared.MetadataServices} | 0
.../org/apache/sis/metadata/sql/{privy => internal/shared}/Dialect.java | 0
.../apache/sis/metadata/sql/{privy => internal/shared}/Initializer.java | 0
.../sis/metadata/sql/{privy => internal/shared}/LocalDataSource.java | 0
.../apache/sis/metadata/sql/{privy => internal/shared}/Reflection.java | 0
.../apache/sis/metadata/sql/{privy => internal/shared}/SQLBuilder.java | 0
.../apache/sis/metadata/sql/{privy => internal/shared}/SQLUtilities.java | 0
.../apache/sis/metadata/sql/{privy => internal/shared}/ScriptRunner.java | 0
.../org/apache/sis/metadata/sql/{privy => internal/shared}/Supports.java | 0
.../org/apache/sis/metadata/sql/{privy => internal/shared}/Syntax.java | 0
.../apache/sis/metadata/sql/{privy => internal/shared}/TypeMapper.java | 0
.../apache/sis/metadata/sql/{privy => internal/shared}/package-info.java | 0
.../apache/sis/xml/{privy => internal/shared}/ExceptionSimplifier.java | 0
.../apache/sis/xml/{privy => internal/shared}/ExternalLinkHandler.java | 0
.../org/apache/sis/xml/{privy => internal/shared}/LegacyNamespaces.java | 0
.../apache/sis/xml/{privy => internal/shared}/StreamWriterDelegate.java | 0
.../main/org/apache/sis/xml/{privy => internal/shared}/URISource.java | 0
.../main/org/apache/sis/xml/{privy => internal/shared}/XmlUtilities.java | 0
.../main/org/apache/sis/xml/{privy => internal/shared}/package-info.java | 0
.../apache/sis/metadata/{privy => internal/shared}/AxisDirectionsTest.md | 0
.../org/apache/sis/metadata/{privy => internal/shared}/AxisNamesTest.java | 0
.../apache/sis/metadata/{privy => internal/shared}/IdentifiersTest.java | 0
.../sis/metadata/{privy => internal/shared}/ImplementationHelperTest.java | 0
.../org/apache/sis/metadata/{privy => internal/shared}/MergerTest.java | 0
.../apache/sis/metadata/{privy => internal/shared}/NameMeaningTest.java | 0
.../sis/metadata/sql/{privy => internal/shared}/SQLBuilderTest.java | 0
.../sis/metadata/sql/{privy => internal/shared}/SQLUtilitiesTest.java | 0
.../sis/metadata/sql/{privy => internal/shared}/ScriptRunnerTest.java | 0
.../apache/sis/metadata/sql/{privy => internal/shared}/SupportsTest.java | 0
.../sis/metadata/sql/{privy => internal/shared}/TypeMapperTest.java | 0
.../apache/sis/xml/{privy => internal/shared}/DocumentComparatorTest.java | 0
.../org/apache/sis/xml/{privy => internal/shared}/XmlUtilitiesTest.java | 0
...rvices => org.apache.sis.metadata.internal.shared.ReferencingServices} | 0
...nitializer => org.apache.sis.metadata.sql.internal.shared.Initializer} | 0
.../org/apache/sis/util/{privy => internal/shared}/AbstractMapTest.java | 0
.../test/org/apache/sis/util/{privy => internal/shared}/BagTest.java | 0
.../apache/sis/util/{privy => internal/shared}/CheckedArrayListTest.java | 0
.../apache/sis/util/{privy => internal/shared}/CollectionsExtTest.java | 0
.../org/apache/sis/util/{privy => internal/shared}/ConstantsTest.java | 0
.../org/apache/sis/util/{privy => internal/shared}/DefinitionURITest.java | 0
.../org/apache/sis/util/{privy => internal/shared}/DoubleDoubleTest.java | 0
.../apache/sis/util/{privy => internal/shared}/ListOfUnknownSizeTest.java | 0
.../sis/util/{privy => internal/shared}/LocalizedParseExceptionTest.java | 0
.../test/org/apache/sis/util/{privy => internal/shared}/NumericsTest.java | 0
.../test/org/apache/sis/util/{privy => internal/shared}/StringsTest.java | 0
.../test/org/apache/sis/util/{privy => internal/shared}/X364Test.java | 0
.../sis/geometries/{privy => internal/shared}/AbstractGeometry.java | 0
.../apache/sis/geometries/{privy => internal/shared}/ArraySequence.java | 0
.../geometries/{privy => internal/shared}/DefaultGeometryCollection.java | 0
.../sis/geometries/{privy => internal/shared}/DefaultLineString.java | 0
.../sis/geometries/{privy => internal/shared}/DefaultLinearRing.java | 0
.../sis/geometries/{privy => internal/shared}/DefaultMultiCurve.java | 0
.../sis/geometries/{privy => internal/shared}/DefaultMultiLineString.java | 0
.../sis/geometries/{privy => internal/shared}/DefaultMultiPoint.java | 0
.../sis/geometries/{privy => internal/shared}/DefaultMultiPolygon.java | 0
.../sis/geometries/{privy => internal/shared}/DefaultMultiSurface.java | 0
.../apache/sis/geometries/{privy => internal/shared}/DefaultPoint.java | 0
.../sis/geometries/{privy => internal/shared}/DefaultPointSequence.java | 0
.../apache/sis/geometries/{privy => internal/shared}/DefaultPolygon.java | 0
.../apache/sis/geometries/{privy => internal/shared}/DefaultTriangle.java | 0
.../sis/geometries/{privy => internal/shared}/ArraySequenceTest.java | 0
96 files changed, 0 insertions(+), 0 deletions(-)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/AssertionMessages.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/BatchComputedImage.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ColorModelBuilder.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ColorModelFactory.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ColorModelType.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ColorScaleBuilder.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ColorsForRange.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/DeferredProperty.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/FillValues.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ImageUtilities.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/MultiBandsIndexColorModel.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ObservableImage.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/RasterFactory.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ReshapedImage.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/SampleModelBuilder.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ScaledColorModel.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ScaledColorSpace.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/TileErrorHandler.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/TileOpExecutor.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/TilePlaceholder.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/TiledImage.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/WritableTiledImage.java (100%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/package-info.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/{privy => internal/shared}/RangeArgumentTest.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/{privy => internal/shared}/AttributeConventionTest.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/{privy => internal/shared}/CopyVisitorTest.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/{privy => internal/shared}/FilterFactoryMock.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/{privy => internal/shared}/FunctionMock.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/{privy => internal/shared}/FunctionNamesTest.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/{privy => internal/shared}/ValueReferenceMock.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/{privy => internal/shared}/ColorModelBuilderTest.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/{privy => internal/shared}/ImageUtilitiesTest.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/{privy => internal/shared}/ReshapedImageTest.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/{privy => internal/shared}/SampleModelBuilderTest.java (100%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/{privy => internal/shared}/ScaledColorSpaceTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/META-INF/services/{org.apache.sis.util.privy.MetadataServices => org.apache.sis.util.internal.shared.MetadataServices} (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/Dialect.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/Initializer.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/LocalDataSource.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/Reflection.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/SQLBuilder.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/SQLUtilities.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/ScriptRunner.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/Supports.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/Syntax.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/TypeMapper.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/package-info.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/ExceptionSimplifier.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/ExternalLinkHandler.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/LegacyNamespaces.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/StreamWriterDelegate.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/URISource.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/XmlUtilities.java (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/package-info.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/AxisDirectionsTest.md (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/AxisNamesTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/IdentifiersTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/ImplementationHelperTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/MergerTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/NameMeaningTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/{privy => internal/shared}/SQLBuilderTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/{privy => internal/shared}/SQLUtilitiesTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/{privy => internal/shared}/ScriptRunnerTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/{privy => internal/shared}/SupportsTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/{privy => internal/shared}/TypeMapperTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/{privy => internal/shared}/DocumentComparatorTest.java (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/{privy => internal/shared}/XmlUtilitiesTest.java (100%)
rename endorsed/src/org.apache.sis.referencing/main/META-INF/services/{org.apache.sis.metadata.privy.ReferencingServices => org.apache.sis.metadata.internal.shared.ReferencingServices} (100%)
rename endorsed/src/org.apache.sis.referencing/main/META-INF/services/{org.apache.sis.metadata.sql.privy.Initializer => org.apache.sis.metadata.sql.internal.shared.Initializer} (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/AbstractMapTest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/BagTest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/CheckedArrayListTest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/CollectionsExtTest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/ConstantsTest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/DefinitionURITest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/DoubleDoubleTest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/ListOfUnknownSizeTest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/LocalizedParseExceptionTest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/NumericsTest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/StringsTest.java (100%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/X364Test.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/AbstractGeometry.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/ArraySequence.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultGeometryCollection.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultLineString.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultLinearRing.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultMultiCurve.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultMultiLineString.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultMultiPoint.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultMultiPolygon.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultMultiSurface.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultPoint.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultPointSequence.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultPolygon.java (100%)
rename incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/{privy => internal/shared}/DefaultTriangle.java (100%)
rename incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/{privy => internal/shared}/ArraySequenceTest.java (100%)
(sis) 01/01: Rename `*.privy` packages as `*.internal.shared` for making their purposes clearer. It should have no impact on user code as it is internal API. This is only a renaming with no change in the code.
Posted by de...@apache.org.
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 5092f522f7bbeabcf155b4344b3f3d993f3fc6a3
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Sep 23 15:41:14 2025 +0200
Rename `*.privy` packages as `*.internal.shared` for making their purposes clearer.
It should have no impact on user code as it is internal API.
This is only a renaming with no change in the code.
---
endorsed/build.gradle.kts | 6 +++---
.../apache/sis/cloud/aws/s3/ClientFileSystem.java | 2 +-
.../main/org/apache/sis/console/AboutCommand.java | 4 ++--
.../main/org/apache/sis/console/Command.java | 2 +-
.../main/org/apache/sis/console/CommandRunner.java | 2 +-
.../apache/sis/console/FormattedOutputCommand.java | 2 +-
.../org/apache/sis/console/IdentifierCommand.java | 2 +-
.../apache/sis/console/ResourcesDownloader.java | 2 +-
.../org/apache/sis/console/TransformCommand.java | 8 ++++----
.../org.apache.sis.feature/main/module-info.java | 8 ++++----
.../org/apache/sis/coverage/CoverageCombiner.java | 6 +++---
.../org/apache/sis/coverage/SampleDimension.java | 2 +-
.../org/apache/sis/coverage/SampleRangeFormat.java | 2 +-
.../coverage/grid/BandAggregateGridCoverage.java | 4 ++--
.../sis/coverage/grid/ClippedGridCoverage.java | 2 +-
.../coverage/grid/CoordinateOperationFinder.java | 6 +++---
.../apache/sis/coverage/grid/DefaultEvaluator.java | 8 ++++----
.../sis/coverage/grid/DimensionAppender.java | 2 +-
.../apache/sis/coverage/grid/DimensionReducer.java | 2 +-
.../sis/coverage/grid/DimensionalityReduction.java | 2 +-
.../coverage/grid/FractionalGridCoordinates.java | 2 +-
.../org/apache/sis/coverage/grid/GridCoverage.java | 4 ++--
.../apache/sis/coverage/grid/GridCoverage2D.java | 6 +++---
.../sis/coverage/grid/GridCoverageBuilder.java | 8 ++++----
.../sis/coverage/grid/GridCoverageProcessor.java | 8 ++++----
.../apache/sis/coverage/grid/GridDerivation.java | 2 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 10 +++++-----
.../apache/sis/coverage/grid/GridExtentCRS.java | 2 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 14 +++++++-------
.../apache/sis/coverage/grid/ImageRenderer.java | 12 ++++++------
.../sis/coverage/grid/ReducedGridCoverage.java | 2 +-
.../sis/coverage/grid/ResampledGridCoverage.java | 6 +++---
.../apache/sis/coverage/grid/SliceGeometry.java | 8 ++++----
.../shared}/BandAggregateArgument.java | 4 ++--
.../shared}/CommonDomainFinder.java | 6 +++---
.../{privy => internal/shared}/RangeArgument.java | 8 ++++----
.../shared}/SampleDimensions.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../org/apache/sis/feature/AbstractFeature.java | 2 +-
.../org/apache/sis/feature/CharacteristicMap.java | 8 ++++----
.../apache/sis/feature/CharacteristicTypeMap.java | 4 ++--
.../apache/sis/feature/DefaultAssociationRole.java | 2 +-
.../org/apache/sis/feature/DefaultFeatureType.java | 4 ++--
.../main/org/apache/sis/feature/DenseFeature.java | 4 ++--
.../org/apache/sis/feature/EnvelopeOperation.java | 4 ++--
.../apache/sis/feature/ExpressionOperation.java | 4 ++--
.../main/org/apache/sis/feature/FeatureFormat.java | 4 ++--
.../org/apache/sis/feature/FeatureOperations.java | 4 ++--
.../sis/feature/GroupAsPolylineOperation.java | 4 ++--
.../apache/sis/feature/MultiValuedAssociation.java | 2 +-
.../apache/sis/feature/MultiValuedAttribute.java | 4 ++--
.../org/apache/sis/feature/NamedFeatureType.java | 2 +-
.../org/apache/sis/feature/SingletonAttribute.java | 2 +-
.../main/org/apache/sis/feature/SparseFeature.java | 4 ++--
.../apache/sis/feature/StringJoinOperation.java | 6 +++---
.../sis/feature/builder/AttributeTypeBuilder.java | 8 ++++----
.../sis/feature/builder/FeatureTypeBuilder.java | 2 +-
.../shared}/AttributeConvention.java | 2 +-
.../shared}/FeatureExpression.java | 2 +-
.../shared}/FeatureProjection.java | 6 +++---
.../shared}/FeatureProjectionBuilder.java | 4 ++--
.../{privy => internal/shared}/FeatureView.java | 2 +-
.../{privy => internal/shared}/InstantList.java | 2 +-
.../{privy => internal/shared}/MovingFeatures.java | 4 ++--
.../{privy => internal/shared}/package-info.java | 2 +-
.../org/apache/sis/filter/ArithmeticFunction.java | 6 +++---
.../org/apache/sis/filter/AssociationValue.java | 2 +-
.../apache/sis/filter/BinaryGeometryFilter.java | 2 +-
.../main/org/apache/sis/filter/Capabilities.java | 2 +-
.../org/apache/sis/filter/ConvertFunction.java | 6 +++---
.../apache/sis/filter/DefaultFilterFactory.java | 4 ++--
.../org/apache/sis/filter/IdentifierFilter.java | 2 +-
.../main/org/apache/sis/filter/LeafExpression.java | 4 ++--
.../main/org/apache/sis/filter/LogicalFilter.java | 4 ++--
.../main/org/apache/sis/filter/Optimization.java | 2 +-
.../main/org/apache/sis/filter/PropertyValue.java | 4 ++--
.../main/org/apache/sis/filter/TemporalFilter.java | 2 +-
.../org/apache/sis/filter/TemporalOperation.java | 2 +-
.../sis/filter/internal/GeometryFromFeature.java | 4 ++--
.../main/org/apache/sis/filter/internal/Node.java | 6 +++---
.../{privy => internal/shared}/CopyVisitor.java | 4 ++--
.../{privy => internal/shared}/EditVisitor.java | 2 +-
.../{privy => internal/shared}/FunctionNames.java | 2 +-
.../shared}/ListingPropertyVisitor.java | 2 +-
.../shared}/SortByComparator.java | 4 ++--
.../filter/{privy => internal/shared}/Visitor.java | 2 +-
.../{privy => internal/shared}/WarningEvent.java | 2 +-
.../filter/{privy => internal/shared}/XPath.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../apache/sis/filter/sqlmm/FunctionWithSRID.java | 4 ++--
.../main/org/apache/sis/filter/sqlmm/ST_Point.java | 2 +-
.../apache/sis/filter/sqlmm/SpatialFunction.java | 4 ++--
.../org/apache/sis/filter/sqlmm/TwoGeometries.java | 2 +-
.../apache/sis/geometry/wrapper/Geometries.java | 4 ++--
.../apache/sis/geometry/wrapper/GeometryType.java | 2 +-
.../sis/geometry/wrapper/GeometryWrapper.java | 2 +-
.../geometry/wrapper/SpatialOperationContext.java | 6 +++---
.../apache/sis/geometry/wrapper/esri/Factory.java | 2 +-
.../sis/geometry/wrapper/j2d/EmptyShape.java | 2 +-
.../apache/sis/geometry/wrapper/j2d/Factory.java | 6 +++---
.../apache/sis/geometry/wrapper/j2d/FlatShape.java | 2 +-
.../sis/geometry/wrapper/j2d/MultiPolylines.java | 2 +-
.../sis/geometry/wrapper/j2d/ShapeProperties.java | 2 +-
.../sis/geometry/wrapper/j2d/ShapeWrapper.java | 2 +-
.../apache/sis/geometry/wrapper/j2d/Wrapper.java | 4 ++--
.../apache/sis/geometry/wrapper/jts/Factory.java | 2 +-
.../org/apache/sis/geometry/wrapper/jts/JTS.java | 2 +-
.../sis/geometry/wrapper/jts/ShapeAdapter.java | 4 ++--
.../sis/geometry/wrapper/jts/ShapeConverter.java | 2 +-
.../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +-
.../main/org/apache/sis/image/AnnotatedImage.java | 6 +++---
.../org/apache/sis/image/BandAggregateImage.java | 4 ++--
.../org/apache/sis/image/BandAggregateLayout.java | 12 ++++++------
.../main/org/apache/sis/image/BandSelectImage.java | 8 ++++----
.../main/org/apache/sis/image/BandSharing.java | 2 +-
.../apache/sis/image/BandedSampleConverter.java | 10 +++++-----
.../main/org/apache/sis/image/Colorizer.java | 10 +++++-----
.../main/org/apache/sis/image/ComputedImage.java | 4 ++--
.../main/org/apache/sis/image/DataType.java | 4 ++--
.../main/org/apache/sis/image/ImageCombiner.java | 4 ++--
.../main/org/apache/sis/image/ImageLayout.java | 4 ++--
.../main/org/apache/sis/image/ImageOverlay.java | 4 ++--
.../main/org/apache/sis/image/ImageProcessor.java | 4 ++--
.../main/org/apache/sis/image/MaskImage.java | 6 +++---
.../main/org/apache/sis/image/MaskedImage.java | 10 +++++-----
.../org/apache/sis/image/MultiSourceImage.java | 2 +-
.../org/apache/sis/image/MultiSourcePrefetch.java | 2 +-
.../main/org/apache/sis/image/PixelIterator.java | 4 ++--
.../main/org/apache/sis/image/PlanarImage.java | 6 +++---
.../sis/image/PositionalConsistencyImage.java | 2 +-
.../main/org/apache/sis/image/PrefetchedImage.java | 8 ++++----
.../main/org/apache/sis/image/RecoloredImage.java | 6 +++---
.../main/org/apache/sis/image/ResampledImage.java | 8 ++++----
.../main/org/apache/sis/image/ResamplingGrid.java | 2 +-
.../org/apache/sis/image/SourceAlignedImage.java | 2 +-
.../org/apache/sis/image/StatisticsCalculator.java | 2 +-
.../main/org/apache/sis/image/TileCache.java | 2 +-
.../main/org/apache/sis/image/Transferer.java | 4 ++--
.../main/org/apache/sis/image/Visualization.java | 8 ++++----
.../apache/sis/image/WritableComputedImage.java | 2 +-
.../shared}/AssertionMessages.java | 2 +-
.../shared}/BatchComputedImage.java | 2 +-
.../shared}/ColorModelBuilder.java | 2 +-
.../shared}/ColorModelFactory.java | 6 +++---
.../{privy => internal/shared}/ColorModelType.java | 2 +-
.../shared}/ColorScaleBuilder.java | 4 ++--
.../{privy => internal/shared}/ColorsForRange.java | 2 +-
.../shared}/DeferredProperty.java | 2 +-
.../{privy => internal/shared}/FillValues.java | 2 +-
.../{privy => internal/shared}/ImageUtilities.java | 6 +++---
.../shared}/MultiBandsIndexColorModel.java | 2 +-
.../shared}/ObservableImage.java | 2 +-
.../{privy => internal/shared}/RasterFactory.java | 2 +-
.../{privy => internal/shared}/ReshapedImage.java | 2 +-
.../shared}/SampleModelBuilder.java | 2 +-
.../shared}/ScaledColorModel.java | 2 +-
.../shared}/ScaledColorSpace.java | 4 ++--
.../shared}/TileErrorHandler.java | 2 +-
.../{privy => internal/shared}/TileOpExecutor.java | 4 ++--
.../shared}/TilePlaceholder.java | 4 ++--
.../{privy => internal/shared}/TiledImage.java | 2 +-
.../shared}/WritableTiledImage.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../sis/image/processing/CompoundFuture.java | 2 +-
.../sis/image/processing/isoline/Fragments.java | 2 +-
.../org/apache/sis/index/tree/NodeIterator.java | 2 +-
.../main/org/apache/sis/index/tree/PointTree.java | 2 +-
.../sis/coverage/grid/ClippedGridCoverageTest.java | 2 +-
.../coverage/grid/ConvertedGridCoverageTest.java | 2 +-
.../coverage/grid/DimensionalityReductionTest.java | 2 +-
.../sis/coverage/grid/GridCoverage2DTest.java | 2 +-
.../sis/coverage/grid/GridCoverageBuilderTest.java | 2 +-
.../sis/coverage/grid/GridDerivationTest.java | 4 ++--
.../apache/sis/coverage/grid/GridGeometryTest.java | 2 +-
.../coverage/grid/ResampledGridCoverageTest.java | 8 ++++----
.../coverage/grid/TranslatedGridCoverageTest.java | 2 +-
.../shared}/RangeArgumentTest.java | 2 +-
.../apache/sis/feature/EnvelopeOperationTest.java | 2 +-
.../apache/sis/feature/FeatureMemoryBenchmark.java | 2 +-
.../apache/sis/feature/FeatureOperationsTest.java | 2 +-
.../sis/feature/StringJoinOperationTest.java | 2 +-
.../feature/builder/AttributeTypeBuilderTest.java | 2 +-
.../feature/builder/FeatureTypeBuilderTest.java | 2 +-
.../shared}/AttributeConventionTest.java | 2 +-
.../apache/sis/feature/test/FeatureComparator.java | 2 +-
.../apache/sis/filter/ComparisonFilterTest.java | 2 +-
.../org/apache/sis/filter/TemporalFilterTest.java | 2 +-
.../test/org/apache/sis/filter/XPathTest.java | 2 +-
.../shared}/CopyVisitorTest.java | 2 +-
.../shared}/FilterFactoryMock.java | 2 +-
.../{privy => internal/shared}/FunctionMock.java | 2 +-
.../shared}/FunctionNamesTest.java | 2 +-
.../shared}/ValueReferenceMock.java | 2 +-
.../apache/sis/geometry/wrapper/jts/JTSTest.java | 2 +-
.../apache/sis/image/BandAggregateImageTest.java | 4 ++--
.../org/apache/sis/image/BandSelectImageTest.java | 4 ++--
.../org/apache/sis/image/ImageCombinerTest.java | 2 +-
.../org/apache/sis/image/ImageOverlayTest.java | 2 +-
.../org/apache/sis/image/InterpolationTest.java | 4 ++--
.../test/org/apache/sis/image/MaskedImageTest.java | 2 +-
.../test/org/apache/sis/image/PlanarImageTest.java | 2 +-
.../org/apache/sis/image/ResampledImageTest.java | 4 ++--
.../org/apache/sis/image/ResamplingGridTest.java | 4 ++--
.../apache/sis/image/StatisticsCalculatorTest.java | 2 +-
.../test/org/apache/sis/image/TiledImageMock.java | 4 ++--
.../shared}/ColorModelBuilderTest.java | 2 +-
.../shared}/ImageUtilitiesTest.java | 4 ++--
.../shared}/ReshapedImageTest.java | 2 +-
.../shared}/SampleModelBuilderTest.java | 2 +-
.../shared}/ScaledColorSpaceTest.java | 2 +-
.../sis/image/processing/isoline/IsolinesTest.java | 2 +-
.../sis/image/processing/isoline/StepsViewer.java | 2 +-
...ache.sis.util.internal.shared.MetadataServices} | 0
.../org.apache.sis.metadata/main/module-info.java | 12 ++++++------
.../org/apache/sis/metadata/MetadataStandard.java | 4 ++--
.../org/apache/sis/metadata/MetadataVisitor.java | 2 +-
.../sis/metadata/MetadataVisitorException.java | 2 +-
.../apache/sis/metadata/ModifiableMetadata.java | 8 ++++----
.../org/apache/sis/metadata/PropertyAccessor.java | 10 +++++-----
.../main/org/apache/sis/metadata/PropertyMap.java | 2 +-
.../main/org/apache/sis/metadata/Pruner.java | 2 +-
.../main/org/apache/sis/metadata/StateChanger.java | 6 +++---
.../main/org/apache/sis/metadata/TreeNode.java | 4 ++--
.../org/apache/sis/metadata/TreeTableView.java | 4 ++--
.../sis/metadata/internal/CitationConstant.java | 2 +-
.../sis/metadata/internal/ServicesForUtility.java | 8 ++++----
.../{privy => internal/shared}/AxisNames.java | 2 +-
.../{privy => internal/shared}/Identifiers.java | 8 ++++----
.../shared}/ImplementationHelper.java | 8 ++++----
.../{privy => internal/shared}/Merger.java | 4 ++--
.../{privy => internal/shared}/NameMeaning.java | 8 ++++----
.../shared}/NameToIdentifier.java | 2 +-
.../shared}/RecordSchemaSIS.java | 4 ++--
.../shared}/ReferencingServices.java | 4 ++--
.../{privy => internal/shared}/SecondaryTrait.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../iso/DefaultExtendedElementInformation.java | 6 +++---
.../apache/sis/metadata/iso/DefaultMetadata.java | 6 +++---
.../org/apache/sis/metadata/iso/ISOMetadata.java | 6 +++---
.../acquisition/DefaultEnvironmentalRecord.java | 2 +-
.../sis/metadata/iso/citation/Citations.java | 8 ++++----
.../sis/metadata/iso/citation/DefaultCitation.java | 2 +-
.../sis/metadata/iso/citation/DefaultContact.java | 4 ++--
.../iso/citation/DefaultResponsibleParty.java | 4 ++--
.../metadata/iso/citation/DefaultTelephone.java | 4 ++--
.../sis/metadata/iso/citation/package-info.java | 2 +-
.../sis/metadata/iso/content/DefaultBand.java | 2 +-
.../iso/content/DefaultCoverageDescription.java | 6 +++---
.../DefaultFeatureCatalogueDescription.java | 4 ++--
.../iso/content/DefaultFeatureTypeInfo.java | 2 +-
.../iso/content/DefaultImageDescription.java | 6 +++---
.../iso/content/DefaultRangeDimension.java | 2 +-
.../iso/content/DefaultSampleDimension.java | 2 +-
.../sis/metadata/iso/content/package-info.java | 2 +-
.../metadata/iso/distribution/DefaultDataFile.java | 2 +-
.../DefaultDigitalTransferOptions.java | 4 ++--
.../metadata/iso/distribution/DefaultFormat.java | 4 ++--
.../metadata/iso/distribution/DefaultMedium.java | 6 +++---
.../metadata/iso/distribution/package-info.java | 2 +-
.../sis/metadata/iso/extent/DefaultExtent.java | 2 +-
.../iso/extent/DefaultGeographicBoundingBox.java | 2 +-
.../iso/extent/DefaultSpatialTemporalExtent.java | 4 ++--
.../metadata/iso/extent/DefaultTemporalExtent.java | 2 +-
.../metadata/iso/extent/DefaultVerticalExtent.java | 2 +-
.../apache/sis/metadata/iso/extent/Extents.java | 6 +++---
.../iso/identification/AbstractIdentification.java | 2 +-
.../DefaultAggregateInformation.java | 2 +-
.../iso/identification/DefaultCoupledResource.java | 4 ++--
.../identification/DefaultDataIdentification.java | 2 +-
.../DefaultRepresentativeFraction.java | 6 +++---
.../iso/identification/DefaultResolution.java | 2 +-
.../metadata/iso/identification/DefaultUsage.java | 2 +-
.../metadata/iso/identification/OperationName.java | 2 +-
.../metadata/iso/identification/package-info.java | 2 +-
.../metadata/iso/legacy/LegacyPropertyAdapter.java | 2 +-
.../iso/lineage/DefaultNominalResolution.java | 2 +-
.../metadata/iso/lineage/DefaultProcessStep.java | 2 +-
.../sis/metadata/iso/lineage/DefaultSource.java | 2 +-
.../sis/metadata/iso/lineage/package-info.java | 2 +-
.../maintenance/DefaultMaintenanceInformation.java | 6 +++---
.../sis/metadata/iso/maintenance/package-info.java | 2 +-
.../org/apache/sis/metadata/iso/package-info.java | 2 +-
.../sis/metadata/iso/quality/AbstractElement.java | 2 +-
.../iso/quality/DefaultCoverageResult.java | 2 +-
.../metadata/iso/quality/DefaultDataQuality.java | 2 +-
.../iso/quality/DefaultEvaluationMethod.java | 4 ++--
.../iso/quality/DefaultMeasureReference.java | 2 +-
.../DefaultNonQuantitativeAttributeAccuracy.java | 2 +-
.../iso/quality/DefaultQuantitativeResult.java | 2 +-
.../sis/metadata/iso/quality/DefaultScope.java | 2 +-
.../sis/metadata/iso/quality/DefaultUsability.java | 2 +-
.../sis/metadata/iso/quality/package-info.java | 2 +-
.../sis/metadata/iso/spatial/DefaultDimension.java | 2 +-
.../iso/spatial/DefaultGeometricObjects.java | 2 +-
.../spatial/DefaultGridSpatialRepresentation.java | 2 +-
.../apache/sis/metadata/simple/SimpleCitation.java | 2 +-
.../apache/sis/metadata/simple/SimpleExtent.java | 2 +-
.../apache/sis/metadata/simple/SimpleFormat.java | 2 +-
.../metadata/simple/SimpleIdentifiedObject.java | 4 ++--
.../sis/metadata/simple/SimpleIdentifier.java | 2 +-
.../org/apache/sis/metadata/sql/Dispatcher.java | 4 ++--
.../sis/metadata/sql/IdentifierGenerator.java | 2 +-
.../org/apache/sis/metadata/sql/Installer.java | 2 +-
.../apache/sis/metadata/sql/MetadataFallback.java | 2 +-
.../apache/sis/metadata/sql/MetadataSource.java | 16 ++++++++--------
.../apache/sis/metadata/sql/MetadataWriter.java | 8 ++++----
.../sql/{privy => internal/shared}/Dialect.java | 4 ++--
.../{privy => internal/shared}/Initializer.java | 6 +++---
.../shared}/LocalDataSource.java | 4 ++--
.../sql/{privy => internal/shared}/Reflection.java | 2 +-
.../sql/{privy => internal/shared}/SQLBuilder.java | 4 ++--
.../{privy => internal/shared}/SQLUtilities.java | 4 ++--
.../{privy => internal/shared}/ScriptRunner.java | 4 ++--
.../sql/{privy => internal/shared}/Supports.java | 2 +-
.../sql/{privy => internal/shared}/Syntax.java | 4 ++--
.../sql/{privy => internal/shared}/TypeMapper.java | 2 +-
.../{privy => internal/shared}/package-info.java | 4 ++--
.../org/apache/sis/temporal/DefaultPeriod.java | 2 +-
.../org/apache/sis/temporal/GeneralDuration.java | 2 +-
.../org/apache/sis/temporal/LenientDateFormat.java | 2 +-
.../main/org/apache/sis/temporal/TemporalDate.java | 2 +-
.../main/org/apache/sis/temporal/TimeMethods.java | 2 +-
.../org/apache/sis/util/iso/AbstractFactory.java | 2 +-
.../apache/sis/util/iso/DefaultNameFactory.java | 2 +-
.../org/apache/sis/util/iso/DefaultNameSpace.java | 4 ++--
.../org/apache/sis/util/iso/DefaultRecord.java | 6 +++---
.../apache/sis/util/iso/DefaultRecordSchema.java | 2 +-
.../org/apache/sis/util/iso/DefaultRecordType.java | 2 +-
.../org/apache/sis/util/iso/DefaultScopedName.java | 2 +-
.../org/apache/sis/util/iso/RecordDefinition.java | 2 +-
.../main/org/apache/sis/util/iso/TypeNames.java | 2 +-
.../main/org/apache/sis/util/iso/Types.java | 4 ++--
.../main/org/apache/sis/xml/MarshallerPool.java | 2 +-
.../main/org/apache/sis/xml/Namespaces.java | 4 ++--
.../main/org/apache/sis/xml/NilObjectHandler.java | 2 +-
.../main/org/apache/sis/xml/OutputFactory.java | 2 +-
.../main/org/apache/sis/xml/Pooled.java | 6 +++---
.../main/org/apache/sis/xml/PooledMarshaller.java | 2 +-
.../org/apache/sis/xml/PooledUnmarshaller.java | 2 +-
.../main/org/apache/sis/xml/ReferenceResolver.java | 8 ++++----
.../main/org/apache/sis/xml/TransformVersion.java | 2 +-
.../org/apache/sis/xml/TransformingReader.java | 14 +++++++-------
.../org/apache/sis/xml/TransformingWriter.java | 4 ++--
.../main/org/apache/sis/xml/ValueConverter.java | 2 +-
.../main/org/apache/sis/xml/XML.java | 2 +-
.../main/org/apache/sis/xml/XPointer.java | 2 +-
.../main/org/apache/sis/xml/bind/Context.java | 6 +++---
.../apache/sis/xml/bind/IdentifierMapAdapter.java | 4 ++--
.../sis/xml/bind/NonMarshalledAuthority.java | 4 ++--
.../apache/sis/xml/bind/SpecializedIdentifier.java | 2 +-
.../apache/sis/xml/bind/cat/CodeListAdapter.java | 2 +-
.../org/apache/sis/xml/bind/cat/CodeListUID.java | 2 +-
.../sis/xml/bind/gco/CharSequenceAdapter.java | 2 +-
.../sis/xml/bind/gco/GO_CharacterString.java | 4 ++--
.../org/apache/sis/xml/bind/gco/GO_DateTime.java | 2 +-
.../org/apache/sis/xml/bind/gco/GO_Temporal.java | 2 +-
.../org/apache/sis/xml/bind/gco/PropertyType.java | 2 +-
.../org/apache/sis/xml/bind/gmi/MI_Metadata.java | 2 +-
.../org/apache/sis/xml/bind/gmi/package-info.java | 2 +-
.../apache/sis/xml/bind/gml/CodeListAdapter.java | 2 +-
.../org/apache/sis/xml/bind/gml/DateAdapter.java | 2 +-
.../main/org/apache/sis/xml/bind/gml/Measure.java | 4 ++--
.../org/apache/sis/xml/bind/gml/TM_Primitive.java | 2 +-
.../apache/sis/xml/bind/gml/TemporalAdapter.java | 2 +-
.../org/apache/sis/xml/bind/gml/TimeInstant.java | 4 ++--
.../org/apache/sis/xml/bind/gml/TimePeriod.java | 4 ++--
.../sis/xml/bind/gml/UniversalTimeAdapter.java | 4 ++--
.../org/apache/sis/xml/bind/gts/TM_Duration.java | 2 +-
.../org/apache/sis/xml/bind/gts/package-info.java | 2 +-
.../main/org/apache/sis/xml/bind/lan/Country.java | 4 ++--
.../apache/sis/xml/bind/lan/LocaleAndCharset.java | 6 +++---
.../org/apache/sis/xml/bind/lan/PT_Locale.java | 4 ++--
.../xml/bind/metadata/code/MD_MediumNameCode.java | 2 +-
.../sis/xml/bind/metadata/code/package-info.java | 2 +-
.../sis/xml/bind/metadata/replace/Parameter.java | 2 +-
.../xml/bind/metadata/replace/RS_Identifier.java | 2 +-
.../bind/metadata/replace/ServiceParameter.java | 6 +++---
.../xml/bind/metadata/replace/package-info.java | 2 +-
.../shared}/ExceptionSimplifier.java | 2 +-
.../shared}/ExternalLinkHandler.java | 4 ++--
.../shared}/LegacyNamespaces.java | 4 ++--
.../shared}/StreamWriterDelegate.java | 2 +-
.../xml/{privy => internal/shared}/URISource.java | 4 ++--
.../{privy => internal/shared}/XmlUtilities.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../apache/sis/metadata/MetadataCopierTest.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../shared}/AxisDirectionsTest.md | 0
.../{privy => internal/shared}/AxisNamesTest.java | 2 +-
.../shared}/IdentifiersTest.java | 2 +-
.../shared}/ImplementationHelperTest.java | 2 +-
.../{privy => internal/shared}/MergerTest.java | 2 +-
.../shared}/NameMeaningTest.java | 2 +-
.../sis/metadata/iso/citation/CitationsTest.java | 2 +-
.../metadata/iso/citation/DefaultCitationTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java | 2 +-
.../metadata/iso/citation/HardCodedCitations.java | 4 ++--
.../constraint/DefaultLegalConstraintsTest.java | 4 ++--
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../sis/metadata/iso/extent/ExtentsTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../iso/quality/DefaultQuantitativeResultTest.java | 4 ++--
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 4 ++--
.../sis/metadata/sql/MetadataWriterTest.java | 2 +-
.../org/apache/sis/metadata/sql/TestDatabase.java | 6 +++---
.../{privy => internal/shared}/SQLBuilderTest.java | 2 +-
.../shared}/SQLUtilitiesTest.java | 2 +-
.../shared}/ScriptRunnerTest.java | 2 +-
.../{privy => internal/shared}/SupportsTest.java | 2 +-
.../{privy => internal/shared}/TypeMapperTest.java | 2 +-
.../apache/sis/test/mock/FeatureAttributeMock.java | 2 +-
.../apache/sis/test/mock/IdentifiedObjectMock.java | 4 ++--
.../org/apache/sis/test/mock/MetadataMock.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../apache/sis/util/iso/DefaultLocalNameTest.java | 2 +-
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../org/apache/sis/util/iso/TypeNamesTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 4 ++--
.../test/org/apache/sis/xml/NamespacesTest.java | 2 +-
.../org/apache/sis/xml/RenameListGenerator.java | 2 +-
.../test/org/apache/sis/xml/TransformerTest.java | 2 +-
.../apache/sis/xml/TransformingNamespacesTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 4 ++--
.../shared}/DocumentComparatorTest.java | 2 +-
.../shared}/XmlUtilitiesTest.java | 2 +-
.../sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../apache/sis/xml/test/DocumentComparator.java | 4 ++--
.../org/apache/sis/xml/test/PackageVerifier.java | 2 +-
.../test/org/apache/sis/xml/test/TestCase.java | 2 +-
.../org/apache/sis/openoffice/Transformer.java | 2 +-
.../sis/openoffice/ReferencingFunctionsTest.java | 2 +-
.../org/apache/sis/map/coverage/RenderingData.java | 10 +++++-----
.../sis/map/coverage/RenderingWorkaround.java | 2 +-
.../main/org/apache/sis/portrayal/Canvas.java | 8 ++++----
.../org/apache/sis/portrayal/CanvasContext.java | 2 +-
.../org/apache/sis/portrayal/CanvasExtent.java | 4 ++--
.../org/apache/sis/portrayal/CanvasFollower.java | 2 +-
.../org/apache/sis/portrayal/PlanarCanvas.java | 2 +-
.../org/apache/sis/style/se1/StyleFactory.java | 2 +-
.../referencing/gazetteer/FinalLocationType.java | 2 +-
.../referencing/gazetteer/GazetteerFactory.java | 2 +-
.../gazetteer/GeohashReferenceSystem.java | 2 +-
.../sis/referencing/gazetteer/LocationFormat.java | 2 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 6 +++---
.../gazetteer/ReferencingByIdentifiers.java | 4 ++--
.../sis/referencing/gazetteer/LocationViewer.java | 2 +-
.../gazetteer/MilitaryGridReferenceSystemTest.java | 2 +-
...s.metadata.internal.shared.ReferencingServices} | 0
...e.sis.metadata.sql.internal.shared.Initializer} | 0
.../main/module-info.java | 6 +++---
.../sis/coordinate/DefaultCoordinateMetadata.java | 4 ++--
.../sis/geometry/AbstractDirectPosition.java | 6 +++---
.../org/apache/sis/geometry/AbstractEnvelope.java | 8 ++++----
.../org/apache/sis/geometry/ArrayEnvelope.java | 2 +-
.../org/apache/sis/geometry/CoordinateFormat.java | 10 +++++-----
.../main/org/apache/sis/geometry/Envelope2D.java | 2 +-
.../org/apache/sis/geometry/EnvelopeReducer.java | 2 +-
.../main/org/apache/sis/geometry/Envelopes.java | 10 +++++-----
.../org/apache/sis/geometry/GeneralEnvelope.java | 4 ++--
.../main/org/apache/sis/geometry/Shapes2D.java | 6 +++---
.../apache/sis/geometry/WraparoundAdjustment.java | 6 +++---
.../apache/sis/geometry/WraparoundInEnvelope.java | 2 +-
.../main/org/apache/sis/io/wkt/Colors.java | 2 +-
.../main/org/apache/sis/io/wkt/Element.java | 4 ++--
.../org/apache/sis/io/wkt/FormattableObject.java | 4 ++--
.../main/org/apache/sis/io/wkt/Formatter.java | 10 +++++-----
.../apache/sis/io/wkt/GeodeticObjectParser.java | 20 ++++++++++----------
.../org/apache/sis/io/wkt/MathTransformParser.java | 6 +++---
.../main/org/apache/sis/io/wkt/StoredTree.java | 2 +-
.../main/org/apache/sis/io/wkt/Transliterator.java | 6 +++---
.../main/org/apache/sis/io/wkt/VerticalInfo.java | 2 +-
.../main/org/apache/sis/io/wkt/WKTDictionary.java | 10 +++++-----
.../main/org/apache/sis/io/wkt/WKTFormat.java | 4 ++--
.../sis/parameter/AbstractParameterDescriptor.java | 4 ++--
.../sis/parameter/DefaultParameterDescriptor.java | 2 +-
.../parameter/DefaultParameterDescriptorGroup.java | 4 ++--
.../sis/parameter/DefaultParameterValue.java | 10 +++++-----
.../sis/parameter/DefaultParameterValueGroup.java | 2 +-
.../apache/sis/parameter/FilteredParameters.java | 2 +-
.../sis/parameter/MapProjectionDescriptor.java | 2 +-
.../sis/parameter/MapProjectionParameters.java | 4 ++--
.../org/apache/sis/parameter/MatrixParameters.java | 2 +-
.../sis/parameter/MatrixParametersAlphaNum.java | 4 ++--
.../org/apache/sis/parameter/ParameterFormat.java | 6 +++---
.../apache/sis/parameter/ParameterTableRow.java | 8 ++++----
.../org/apache/sis/parameter/TensorParameters.java | 2 +-
.../org/apache/sis/parameter/TensorValues.java | 10 +++++-----
.../sis/parameter/UninitializedParameter.java | 2 +-
.../sis/parameter/UnmodifiableParameterValue.java | 2 +-
.../parameter/UnmodifiableParameterValueGroup.java | 2 +-
.../main/org/apache/sis/parameter/Verifier.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 20 ++++++++++----------
.../apache/sis/referencing/AuthorityFactories.java | 6 +++---
.../main/org/apache/sis/referencing/CRS.java | 12 ++++++------
.../main/org/apache/sis/referencing/CommonCRS.java | 6 +++---
.../sis/referencing/DefaultObjectDomain.java | 2 +-
.../sis/referencing/EPSGFactoryFallback.java | 6 +++---
.../referencing/EllipsoidalHeightSeparator.java | 10 +++++-----
.../sis/referencing/GeodesicsOnEllipsoid.java | 2 +-
.../apache/sis/referencing/GeodeticCalculator.java | 12 ++++++------
.../apache/sis/referencing/IdentifiedObjects.java | 14 +++++++-------
.../sis/referencing/ImmutableIdentifier.java | 8 ++++----
.../org/apache/sis/referencing/NameIterator.java | 8 ++++----
.../apache/sis/referencing/NamedIdentifier.java | 2 +-
.../org/apache/sis/referencing/Properties.java | 4 ++--
.../sis/referencing/StandardDefinitions.java | 8 ++++----
.../apache/sis/referencing/crs/AbstractCRS.java | 6 +++---
.../sis/referencing/crs/AbstractDerivedCRS.java | 6 +++---
.../sis/referencing/crs/AbstractSingleCRS.java | 2 +-
.../sis/referencing/crs/DefaultCompoundCRS.java | 10 +++++-----
.../sis/referencing/crs/DefaultDerivedCRS.java | 6 +++---
.../sis/referencing/crs/DefaultEngineeringCRS.java | 2 +-
.../sis/referencing/crs/DefaultGeodeticCRS.java | 8 ++++----
.../sis/referencing/crs/DefaultGeographicCRS.java | 10 +++++-----
.../sis/referencing/crs/DefaultImageCRS.java | 2 +-
.../sis/referencing/crs/DefaultParametricCRS.java | 2 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 8 ++++----
.../sis/referencing/crs/DefaultTemporalCRS.java | 6 +++---
.../sis/referencing/crs/DefaultVerticalCRS.java | 2 +-
.../org/apache/sis/referencing/crs/DynamicCRS.java | 2 +-
.../sis/referencing/crs/ExplicitParameters.java | 6 +++---
.../org/apache/sis/referencing/cs/AbstractCS.java | 12 ++++++------
.../apache/sis/referencing/cs/AxesConvention.java | 2 +-
.../main/org/apache/sis/referencing/cs/Codes.java | 4 ++--
.../sis/referencing/cs/CoordinateSystems.java | 6 +++---
.../apache/sis/referencing/cs/DefaultAffineCS.java | 2 +-
.../sis/referencing/cs/DefaultCompoundCS.java | 4 ++--
.../cs/DefaultCoordinateSystemAxis.java | 12 ++++++------
.../sis/referencing/cs/DefaultCylindricalCS.java | 2 +-
.../sis/referencing/cs/DefaultEllipsoidalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultLinearCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultPolarCS.java | 2 +-
.../sis/referencing/cs/DefaultSphericalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultTimeCS.java | 2 +-
.../sis/referencing/cs/DefaultVerticalCS.java | 2 +-
.../sis/referencing/cs/DirectionAlongMeridian.java | 6 +++---
.../org/apache/sis/referencing/cs/Normalizer.java | 6 +++---
.../org/apache/sis/referencing/cs/SubTypes.java | 2 +-
.../sis/referencing/datum/AbstractDatum.java | 12 ++++++------
.../sis/referencing/datum/BursaWolfParameters.java | 4 ++--
.../sis/referencing/datum/DatumOrEnsemble.java | 2 +-
.../sis/referencing/datum/DatumShiftGrid.java | 4 ++--
.../referencing/datum/DefaultDatumEnsemble.java | 10 +++++-----
.../sis/referencing/datum/DefaultEllipsoid.java | 12 ++++++------
.../referencing/datum/DefaultEngineeringDatum.java | 2 +-
.../referencing/datum/DefaultGeodeticDatum.java | 12 ++++++------
.../sis/referencing/datum/DefaultImageDatum.java | 4 ++--
.../referencing/datum/DefaultParametricDatum.java | 2 +-
.../referencing/datum/DefaultPrimeMeridian.java | 14 +++++++-------
.../referencing/datum/DefaultTemporalDatum.java | 2 +-
.../referencing/datum/DefaultVerticalDatum.java | 6 +++---
.../sis/referencing/datum/TimeDependentBWP.java | 4 ++--
.../apache/sis/referencing/datum/package-info.java | 2 +-
.../factory/AuthorityFactoryIdentifier.java | 10 +++++-----
.../referencing/factory/AuthorityFactoryProxy.java | 2 +-
.../referencing/factory/CommonAuthorityCode.java | 4 ++--
.../factory/CommonAuthorityFactory.java | 4 ++--
.../factory/ConcurrentAuthorityFactory.java | 4 ++--
.../sis/referencing/factory/FilteredCodes.java | 2 +-
.../factory/GeodeticAuthorityFactory.java | 4 ++--
.../referencing/factory/GeodeticObjectFactory.java | 2 +-
.../factory/IdentifiedObjectFinder.java | 6 +++---
.../factory/LazySynchronizedIterator.java | 2 +-
.../factory/MultiAuthoritiesFactory.java | 14 +++++++-------
.../sis/referencing/factory/ReferenceKeeper.java | 2 +-
.../referencing/factory/sql/AuthorityCodes.java | 6 +++---
.../referencing/factory/sql/EPSGCodeFinder.java | 14 +++++++-------
.../referencing/factory/sql/EPSGDataAccess.java | 14 +++++++-------
.../sis/referencing/factory/sql/EPSGFactory.java | 6 +++---
.../sis/referencing/factory/sql/EPSGInstaller.java | 6 +++---
.../factory/sql/InstallationScriptProvider.java | 2 +-
.../referencing/factory/sql/ObjectPertinence.java | 6 +++---
.../sis/referencing/factory/sql/SQLTranslator.java | 6 +++---
.../sis/referencing/factory/sql/TableInfo.java | 2 +-
.../sis/referencing/internal/AnnotatedMatrix.java | 2 +-
.../sis/referencing/internal/Arithmetic.java | 6 +++---
.../sis/referencing/internal/DatabaseListener.java | 4 ++--
.../referencing/internal/EPSGParameterDomain.java | 2 +-
.../org/apache/sis/referencing/internal/Epoch.java | 2 +-
.../apache/sis/referencing/internal/Legacy.java | 4 ++--
.../sis/referencing/internal/MergedProperties.java | 2 +-
.../referencing/internal/ParameterizedAffine.java | 2 +-
.../internal/ParameterizedTransformBuilder.java | 8 ++++----
.../internal/PositionalAccuracyConstant.java | 2 +-
.../referencing/internal/ServicesForMetadata.java | 10 +++++-----
.../referencing/internal/VerticalDatumTypes.java | 2 +-
.../{privy => internal/shared}/AbstractShape.java | 2 +-
.../{privy => internal/shared}/AffineMatrix.java | 4 ++--
.../shared}/AffineTransform2D.java | 2 +-
.../{privy => internal/shared}/AxesMapper.java | 4 ++--
.../{privy => internal/shared}/AxisDirections.java | 6 +++---
.../shared}/CoordinateOperations.java | 10 +++++-----
.../shared}/DefinitionVerifier.java | 2 +-
.../shared}/DirectPositionView.java | 2 +-
.../shared}/EllipsoidalHeightCombiner.java | 2 +-
.../shared}/ExtendedPrecisionMatrix.java | 2 +-
.../{privy => internal/shared}/ExtentSelector.java | 4 ++--
.../shared}/FilteredIterator.java | 2 +-
.../{privy => internal/shared}/Formulas.java | 12 ++++++------
.../shared}/GeodeticObjectBuilder.java | 2 +-
.../shared}/IntervalRectangle.java | 4 ++--
.../{privy => internal/shared}/LazySet.java | 4 ++--
.../shared}/NilReferencingObject.java | 2 +-
.../shared}/ReferencingFactoryContainer.java | 4 ++--
.../shared}/ReferencingUtilities.java | 4 ++--
.../{privy => internal/shared}/ShapeUtilities.java | 2 +-
.../shared}/TemporalAccessor.java | 2 +-
.../{privy => internal/shared}/WKTKeywords.java | 2 +-
.../{privy => internal/shared}/WKTUtilities.java | 6 +++---
.../shared}/WraparoundApplicator.java | 4 ++--
.../shared}/WraparoundAxesFinder.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../operation/AbstractCoordinateOperation.java | 18 +++++++++---------
.../operation/AbstractSingleOperation.java | 6 +++---
.../apache/sis/referencing/operation/CRSPair.java | 4 ++--
.../operation/CoordinateOperationContext.java | 4 ++--
.../operation/CoordinateOperationFinder.java | 12 ++++++------
.../operation/CoordinateOperationRegistry.java | 6 +++---
.../operation/DefaultConcatenatedOperation.java | 10 +++++-----
.../referencing/operation/DefaultConversion.java | 2 +-
.../DefaultCoordinateOperationFactory.java | 6 +++---
.../sis/referencing/operation/DefaultFormula.java | 2 +-
.../operation/DefaultOperationMethod.java | 10 +++++-----
.../operation/DefaultPassThroughOperation.java | 4 ++--
.../operation/InverseOperationMethod.java | 2 +-
.../operation/MathTransformContext.java | 6 +++---
.../operation/builder/LinearTransformBuilder.java | 10 +++++-----
.../operation/builder/LocalizationGridBuilder.java | 4 ++--
.../operation/builder/ResidualGrid.java | 6 +++---
.../operation/gridded/CompressedGrid.java | 2 +-
.../referencing/operation/gridded/GridGroup.java | 6 +++---
.../referencing/operation/gridded/LoadedGrid.java | 2 +-
.../sis/referencing/operation/gridded/Tile.java | 2 +-
.../operation/gridded/TileOrganizer.java | 2 +-
.../operation/matrix/AffineTransforms2D.java | 4 ++--
.../operation/matrix/GeneralMatrix.java | 4 ++--
.../sis/referencing/operation/matrix/Matrices.java | 8 ++++----
.../sis/referencing/operation/matrix/Matrix1.java | 2 +-
.../sis/referencing/operation/matrix/Matrix2.java | 2 +-
.../referencing/operation/matrix/MatrixSIS.java | 4 ++--
.../sis/referencing/operation/matrix/Solver.java | 2 +-
.../operation/matrix/UnmodifiableMatrix.java | 2 +-
.../operation/projection/AlbersEqualArea.java | 4 ++--
.../operation/projection/AuthalicConversion.java | 2 +-
.../operation/projection/ConformalProjection.java | 2 +-
.../operation/projection/CylindricalEqualArea.java | 2 +-
.../projection/EquidistantCylindrical.java | 2 +-
.../operation/projection/Initializer.java | 6 +++---
.../projection/LambertAzimuthalEqualArea.java | 4 ++--
.../projection/LambertConicConformal.java | 6 +++---
.../operation/projection/LongitudeWraparound.java | 4 ++--
.../referencing/operation/projection/Mercator.java | 2 +-
.../operation/projection/MeridianArcBased.java | 2 +-
.../operation/projection/NormalizedProjection.java | 6 +++---
.../operation/projection/ObliqueMercator.java | 2 +-
.../operation/projection/ObliqueStereographic.java | 4 ++--
.../operation/projection/PolarStereographic.java | 6 +++---
.../referencing/operation/projection/Robinson.java | 2 +-
.../operation/projection/SatelliteTracking.java | 2 +-
.../operation/projection/TransverseMercator.java | 2 +-
.../operation/projection/ZonedGridSystem.java | 2 +-
.../operation/provider/AbstractProvider.java | 2 +-
.../sis/referencing/operation/provider/Affine.java | 4 ++--
.../referencing/operation/provider/EPSGName.java | 2 +-
.../operation/provider/Equirectangular.java | 4 ++--
.../provider/FranceGeocentricInterpolation.java | 2 +-
.../operation/provider/GeocentricAffine.java | 6 +++---
.../GeocentricAffineBetweenGeographic.java | 2 +-
.../operation/provider/Geographic2Dto3D.java | 2 +-
.../operation/provider/Geographic3Dto2D.java | 4 ++--
.../operation/provider/GeographicOffsets2D.java | 2 +-
.../operation/provider/Interpolation1D.java | 2 +-
.../operation/provider/LambertConformal2SP.java | 2 +-
.../operation/provider/LongitudeRotation.java | 2 +-
.../operation/provider/MapProjection.java | 2 +-
.../operation/provider/Mercator1SP.java | 2 +-
.../provider/MercatorAuxiliarySphere.java | 2 +-
.../operation/provider/MillerCylindrical.java | 2 +-
.../referencing/operation/provider/Mollweide.java | 2 +-
.../referencing/operation/provider/Molodensky.java | 6 +++---
.../sis/referencing/operation/provider/NTv2.java | 4 ++--
.../operation/provider/NorthPoleRotation.java | 2 +-
.../provider/ObliqueMercatorTwoPoints.java | 2 +-
.../operation/provider/PolarStereographicA.java | 6 +++---
.../referencing/operation/provider/Robinson.java | 2 +-
.../operation/provider/SatelliteTracking.java | 2 +-
.../operation/provider/SouthPoleRotation.java | 2 +-
.../operation/provider/Spherical2Dto3D.java | 2 +-
.../operation/provider/Spherical3Dto2D.java | 2 +-
.../operation/provider/TransverseMercator.java | 6 +++---
.../transform/AbstractLinearTransform.java | 4 ++--
.../operation/transform/AbstractMathTransform.java | 4 ++--
.../transform/AbstractMathTransform2D.java | 2 +-
.../operation/transform/CartesianToPolar.java | 2 +-
.../operation/transform/ConcatenatedTransform.java | 4 ++--
.../operation/transform/ContextualParameters.java | 14 +++++++-------
.../transform/CoordinateSystemTransform.java | 6 +++---
.../CoordinateSystemTransformBuilder.java | 2 +-
.../transform/DefaultMathTransformFactory.java | 6 +++---
.../transform/EllipsoidToCentricTransform.java | 12 ++++++------
.../transform/EllipsoidToRadiusTransform.java | 10 +++++-----
.../transform/ExponentialTransform1D.java | 2 +-
.../operation/transform/IdentityTransform.java | 2 +-
.../transform/InterpolatedGeocentricTransform.java | 2 +-
.../operation/transform/InterpolatedTransform.java | 4 ++--
.../operation/transform/LinearInterpolator1D.java | 2 +-
.../operation/transform/LinearTransform1D.java | 8 ++++----
.../transform/LogarithmicTransform1D.java | 2 +-
.../operation/transform/MathTransformBuilder.java | 2 +-
.../operation/transform/MathTransforms.java | 6 +++---
.../operation/transform/MolodenskyTransform.java | 2 +-
.../operation/transform/OperationMethodSet.java | 2 +-
.../operation/transform/PassThroughTransform.java | 6 +++---
.../operation/transform/PolarToCartesian.java | 2 +-
.../operation/transform/PoleRotation.java | 6 +++---
.../operation/transform/PowerTransform1D.java | 2 +-
.../operation/transform/ProjectiveTransform.java | 10 +++++-----
.../operation/transform/ProjectiveTransform2D.java | 2 +-
.../operation/transform/ScaleTransform.java | 4 ++--
.../transform/SpecializableTransform.java | 2 +-
.../operation/transform/TransformJoiner.java | 2 +-
.../operation/transform/TransformSeparator.java | 4 ++--
.../operation/transform/TranslationTransform.java | 4 ++--
.../operation/transform/WraparoundTransform.java | 2 +-
.../org/apache/sis/referencing/package-info.java | 2 +-
.../bind/referencing/CC_CoordinateOperation.java | 2 +-
.../referencing/CC_GeneralOperationParameter.java | 2 +-
.../sis/xml/bind/referencing/CS_AxisDirection.java | 2 +-
.../sis/xml/bind/referencing/CS_RangeMeaning.java | 2 +-
.../org/apache/sis/xml/bind/referencing/Code.java | 8 ++++----
.../org/apache/sis/geometry/EnvelopesTest.java | 2 +-
.../apache/sis/geometry/GeneralEnvelopeTest.java | 2 +-
.../org/apache/sis/geometry/TransformTestCase.java | 4 ++--
.../sis/geometry/WraparoundAdjustmentTest.java | 2 +-
.../test/org/apache/sis/io/wkt/CRSParserTest.java | 2 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 6 +++---
.../org/apache/sis/io/wkt/TransliteratorTest.java | 2 +-
.../DefaultParameterDescriptorGroupTest.java | 2 +-
.../parameter/DefaultParameterDescriptorTest.java | 2 +-
.../sis/parameter/DefaultParameterValueTest.java | 2 +-
.../sis/parameter/MapProjectionParametersTest.java | 18 +++++++++---------
.../apache/sis/parameter/TensorParametersTest.java | 4 ++--
.../org/apache/sis/parameter/TensorValuesTest.java | 6 +++---
.../org/apache/sis/referencing/Assertions.java | 2 +-
.../sis/referencing/AuthorityFactoriesTest.java | 2 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 6 +++---
.../sis/referencing/GeodesicsOnEllipsoidTest.java | 4 ++--
.../sis/referencing/GeodeticCalculatorTest.java | 6 +++---
.../sis/referencing/GeodeticObjectVerifier.java | 2 +-
.../sis/referencing/ImmutableIdentifierTest.java | 4 ++--
.../sis/referencing/StandardDefinitionsTest.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 2 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 4 ++--
.../referencing/crs/DefaultTemporalCRSTest.java | 4 ++--
.../apache/sis/referencing/cs/HardCodedAxes.java | 2 +-
.../datum/DefaultPrimeMeridianTest.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../sis/referencing/datum/GeodeticDatumMock.java | 2 +-
.../sis/referencing/datum/HardCodedDatum.java | 2 +-
.../referencing/datum/TimeDependentBWPTest.java | 2 +-
.../factory/CommonAuthorityFactoryTest.java | 2 +-
.../factory/ConcurrentAuthorityFactoryTest.java | 2 +-
.../sis/referencing/factory/TestFactorySource.java | 4 ++--
.../referencing/factory/sql/EPSGInstallerTest.java | 4 ++--
.../factory/sql/EPSGScriptProvider.java | 2 +-
.../apache/sis/referencing/internal/EpochTest.java | 2 +-
.../shared}/AbstractShapeTest.java | 2 +-
.../{privy => internal/shared}/AxesMapperTest.java | 2 +-
.../shared}/AxisDirectionsTest.java | 2 +-
.../shared}/CoordinateOperationsTest.java | 2 +-
.../shared}/DefinitionVerifierTest.java | 2 +-
.../shared}/EllipsoidalHeightCombinerTest.java | 2 +-
.../shared}/ExtentSelectorTest.java | 2 +-
.../{privy => internal/shared}/FormulasTest.java | 4 ++--
.../shared}/GeodeticObjectBuilderTest.java | 2 +-
.../{privy => internal/shared}/LazySetTest.java | 2 +-
.../shared}/ReferencingUtilitiesTest.java | 4 ++--
.../shared}/ShapeUtilitiesExt.java | 2 +-
.../shared}/ShapeUtilitiesTest.java | 2 +-
.../shared}/ShapeUtilitiesViewer.java | 2 +-
.../shared}/WKTKeywordsTest.java | 2 +-
.../shared}/WKTUtilitiesTest.java | 4 ++--
.../shared}/WraparoundApplicatorTest.java | 2 +-
.../operation/CoordinateOperationFinderTest.java | 6 +++---
.../operation/CoordinateOperationRegistryTest.java | 2 +-
.../operation/DefaultConversionTest.java | 4 ++--
.../DefaultCoordinateOperationFactoryTest.java | 4 ++--
.../operation/DefaultTransformationTest.java | 2 +-
.../operation/HardCodedConversions.java | 2 +-
.../operation/matrix/GeneralMatrixTest.java | 2 +-
.../referencing/operation/matrix/MatricesTest.java | 2 +-
.../operation/matrix/MatrixTestCase.java | 4 ++--
.../operation/projection/AlbersEqualAreaTest.java | 2 +-
.../projection/AuthalicConversionTest.java | 2 +-
.../projection/AzimuthalEquidistantTest.java | 2 +-
.../operation/projection/CassiniSoldnerTest.java | 2 +-
.../projection/ConformalProjectionTest.java | 2 +-
.../projection/CylindricalEqualAreaTest.java | 2 +-
.../projection/EquidistantCylindricalTest.java | 2 +-
.../operation/projection/EquirectangularTest.java | 4 ++--
.../operation/projection/InitializerTest.java | 2 +-
.../projection/LambertAzimuthalEqualAreaTest.java | 6 +++---
.../projection/LambertConicConformalTest.java | 2 +-
.../projection/MapProjectionTestCase.java | 4 ++--
.../projection/MercatorMethodComparison.java | 4 ++--
.../operation/projection/MercatorTest.java | 4 ++--
.../operation/projection/MollweideTest.java | 2 +-
.../sis/referencing/operation/projection/NoOp.java | 2 +-
.../projection/NormalizedProjectionTest.java | 2 +-
.../projection/ObliqueStereographicTest.java | 2 +-
.../projection/PolarStereographicTest.java | 2 +-
.../operation/projection/PolyconicTest.java | 2 +-
.../operation/projection/ProjectionBenchmark.java | 2 +-
.../projection/ProjectionResultComparator.java | 2 +-
.../operation/projection/RobinsonTest.java | 2 +-
.../projection/SatelliteTrackingTest.java | 2 +-
.../operation/projection/SinusoidalTest.java | 2 +-
.../projection/TransverseMercatorTest.java | 2 +-
.../operation/projection/ZonedGridSystemTest.java | 4 ++--
.../provider/CoordinateFrameRotationTest.java | 2 +-
.../provider/GeocentricTranslationTest.java | 2 +-
.../operation/provider/GeographicOffsetsTest.java | 2 +-
.../operation/provider/MapProjectionTest.java | 2 +-
.../referencing/operation/provider/NTv2Test.java | 2 +-
.../provider/PositionVector7ParamTest.java | 2 +-
.../operation/provider/ProvidersTest.java | 2 +-
.../operation/provider/TransverseMercatorTest.java | 2 +-
.../transform/AbridgedMolodenskyTransformTest.java | 2 +-
.../transform/ConcatenatedTransformTest.java | 2 +-
.../operation/transform/CoordinateDomain.java | 2 +-
.../transform/DefaultMathTransformFactoryTest.java | 2 +-
.../operation/transform/DomainDefinitionTest.java | 2 +-
.../transform/EllipsoidToCentricTransformTest.java | 2 +-
.../transform/InterpolatedTransformTest.java | 2 +-
.../operation/transform/LinearTransformTest.java | 2 +-
.../transform/MolodenskyTransformTest.java | 4 ++--
.../transform/OperationMethodSetTest.java | 2 +-
.../operation/transform/PoleRotationTest.java | 2 +-
.../transform/ProjectiveTransformTest.java | 6 +++---
.../operation/transform/ScaleTransformTest.java | 2 +-
.../transform/SpecializableTransformTest.java | 2 +-
.../transform/TranslationTransformTest.java | 4 ++--
.../transform/WraparoundTransformTest.java | 2 +-
.../report/CoordinateOperationMethods.java | 4 ++--
.../report/CoordinateReferenceSystems.java | 2 +-
.../sis/referencing/report/HTMLGenerator.java | 2 +-
.../sis/test/integration/ConsistencyTest.java | 2 +-
.../apache/sis/test/integration/MetadataTest.java | 2 +-
.../org/apache/sis/test/widget/package-info.java | 2 +-
.../CC_OperationParameterGroupTest.java | 2 +-
.../apache/sis/xml/bind/referencing/CodeTest.java | 2 +-
.../main/org/apache/sis/storage/landsat/Band.java | 2 +-
.../org/apache/sis/storage/landsat/BandGroup.java | 2 +-
.../apache/sis/storage/landsat/LandsatStore.java | 2 +-
.../apache/sis/storage/landsat/MetadataReader.java | 10 +++++-----
.../sis/storage/geotiff/CompressedSubset.java | 2 +-
.../apache/sis/storage/geotiff/Compression.java | 2 +-
.../org/apache/sis/storage/geotiff/DataSubset.java | 8 ++++----
.../apache/sis/storage/geotiff/GeoTiffStore.java | 4 ++--
.../sis/storage/geotiff/GeoTiffStoreProvider.java | 2 +-
.../sis/storage/geotiff/ImageFileDirectory.java | 12 ++++++------
.../sis/storage/geotiff/MultiResolutionImage.java | 2 +-
.../org/apache/sis/storage/geotiff/Writer.java | 2 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 14 +++++++-------
.../geotiff/reader/GridGeometryBuilder.java | 2 +-
.../apache/sis/storage/geotiff/reader/Type.java | 2 +-
.../sis/storage/geotiff/writer/GeoEncoder.java | 10 +++++-----
.../storage/geotiff/writer/ReformattedImage.java | 4 ++--
.../org/apache/sis/storage/geotiff/WriterTest.java | 2 +-
.../storage/geotiff/reader/XMLMetadataTest.java | 2 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 10 +++++-----
.../org/apache/sis/storage/netcdf/NetcdfStore.java | 6 +++---
.../sis/storage/netcdf/NetcdfStoreProvider.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Axis.java | 2 +-
.../apache/sis/storage/netcdf/base/AxisType.java | 2 +-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 2 +-
.../apache/sis/storage/netcdf/base/CRSMerger.java | 4 ++--
.../apache/sis/storage/netcdf/base/Convention.java | 2 +-
.../apache/sis/storage/netcdf/base/Decoder.java | 4 ++--
.../apache/sis/storage/netcdf/base/FeatureSet.java | 4 ++--
.../org/apache/sis/storage/netcdf/base/Grid.java | 2 +-
.../sis/storage/netcdf/base/GridCacheKey.java | 2 +-
.../sis/storage/netcdf/base/GridMapping.java | 10 +++++-----
.../apache/sis/storage/netcdf/base/Linearizer.java | 6 +++---
.../sis/storage/netcdf/base/NamedElement.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Node.java | 2 +-
.../sis/storage/netcdf/base/RasterResource.java | 8 ++++----
.../apache/sis/storage/netcdf/base/Variable.java | 6 +++---
.../storage/netcdf/base/VariableTransformer.java | 2 +-
.../sis/storage/netcdf/classic/ChannelDecoder.java | 4 ++--
.../sis/storage/netcdf/classic/GridInfo.java | 2 +-
.../sis/storage/netcdf/classic/VariableInfo.java | 2 +-
.../sis/storage/netcdf/ucar/DecoderWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/DimensionWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/GridWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/VariableWrapper.java | 2 +-
.../sis/storage/netcdf/base/FeatureSetTest.java | 2 +-
.../main/org/apache/sis/storage/sql/SQLStore.java | 2 +-
.../org/apache/sis/storage/sql/duckdb/DuckDB.java | 2 +-
.../apache/sis/storage/sql/feature/Analyzer.java | 4 ++--
.../org/apache/sis/storage/sql/feature/Column.java | 6 +++---
.../apache/sis/storage/sql/feature/Database.java | 12 ++++++------
.../sis/storage/sql/feature/FeatureAdapter.java | 2 +-
.../sis/storage/sql/feature/FeatureIterator.java | 4 ++--
.../sis/storage/sql/feature/FeatureStream.java | 10 +++++-----
.../sis/storage/sql/feature/InfoStatements.java | 10 +++++-----
.../apache/sis/storage/sql/feature/PrimaryKey.java | 4 ++--
.../sis/storage/sql/feature/QueryAnalyzer.java | 4 ++--
.../apache/sis/storage/sql/feature/Relation.java | 4 ++--
.../sis/storage/sql/feature/SelectionClause.java | 4 ++--
.../storage/sql/feature/SelectionClauseWriter.java | 4 ++--
.../org/apache/sis/storage/sql/feature/Table.java | 8 ++++----
.../sis/storage/sql/feature/TableAnalyzer.java | 4 ++--
.../sis/storage/sql/feature/TableReference.java | 2 +-
.../sis/storage/sql/feature/ValueGetter.java | 4 ++--
.../sis/storage/sql/postgis/ExtentEstimator.java | 2 +-
.../apache/sis/storage/sql/postgis/Postgres.java | 2 +-
.../sis/storage/sql/postgis/RasterReader.java | 10 +++++-----
.../org/apache/sis/storage/sql/SQLStoreTest.java | 2 +-
.../storage/sql/feature/InfoStatementsTest.java | 2 +-
.../sql/feature/TemporalValueGetterTest.java | 2 +-
.../sis/storage/sql/postgis/PostgresTest.java | 2 +-
.../apache/sis/storage/sql/postgis/TestRaster.java | 2 +-
.../main/org/apache/sis/storage/gpx/Metadata.java | 2 +-
.../main/org/apache/sis/storage/gpx/Reader.java | 2 +-
.../main/org/apache/sis/storage/gpx/Types.java | 2 +-
.../main/org/apache/sis/storage/gpx/Writer.java | 2 +-
.../sis/storage/xml/stream/FormattedWriter.java | 2 +-
.../sis/storage/xml/stream/NamespaceEraser.java | 2 +-
.../sis/storage/xml/stream/StaxDataStore.java | 6 +++---
.../sis/storage/xml/stream/StaxStreamReader.java | 2 +-
.../test/org/apache/sis/storage/gpx/TypesTest.java | 2 +-
.../apache/sis/io/stream/ChannelDataOutput.java | 2 +-
.../apache/sis/io/stream/FileCacheByteChannel.java | 2 +-
.../main/org/apache/sis/io/stream/IOUtilities.java | 2 +-
.../sis/storage/AbstractGridCoverageResource.java | 2 +-
.../org/apache/sis/storage/CoverageSubset.java | 6 +++---
.../main/org/apache/sis/storage/DataStore.java | 2 +-
.../org/apache/sis/storage/DataStoreRegistry.java | 4 ++--
.../main/org/apache/sis/storage/FeatureNaming.java | 2 +-
.../main/org/apache/sis/storage/FeatureQuery.java | 12 ++++++------
.../main/org/apache/sis/storage/FeatureSubset.java | 2 +-
.../main/org/apache/sis/storage/ProbeResult.java | 2 +-
.../org/apache/sis/storage/StorageConnector.java | 4 ++--
.../sis/storage/aggregate/AggregatedResource.java | 2 +-
.../aggregate/BandAggregateGridResource.java | 6 +++---
.../storage/aggregate/ConcatenatedFeatureSet.java | 4 ++--
.../aggregate/ConcatenatedGridCoverage.java | 4 ++--
.../aggregate/ConcatenatedGridResource.java | 4 ++--
.../sis/storage/aggregate/CoverageAggregator.java | 2 +-
.../sis/storage/aggregate/DimensionSelector.java | 2 +-
.../apache/sis/storage/aggregate/GridSlice.java | 6 +++---
.../org/apache/sis/storage/aggregate/Group.java | 2 +-
.../sis/storage/aggregate/GroupAggregate.java | 2 +-
.../sis/storage/aggregate/GroupByTransform.java | 2 +-
.../sis/storage/aggregate/JoinFeatureSet.java | 2 +-
.../sis/storage/aggregate/MergeStrategy.java | 4 ++--
.../main/org/apache/sis/storage/base/CodeType.java | 4 ++--
.../apache/sis/storage/base/MetadataBuilder.java | 10 +++++-----
.../org/apache/sis/storage/base/PRJDataStore.java | 2 +-
.../apache/sis/storage/base/ResourceLineage.java | 4 ++--
.../apache/sis/storage/base/SimpleAggregate.java | 2 +-
.../apache/sis/storage/base/StoreUtilities.java | 2 +-
.../sis/storage/base/TiledDeferredImage.java | 2 +-
.../apache/sis/storage/base/TiledGridCoverage.java | 6 +++---
.../apache/sis/storage/base/TiledGridResource.java | 8 ++++----
.../org/apache/sis/storage/base/URIDataStore.java | 4 ++--
.../sis/storage/csv/MovingFeatureBuilder.java | 4 ++--
.../main/org/apache/sis/storage/csv/Store.java | 6 +++---
.../apache/sis/storage/esri/AsciiGridStore.java | 2 +-
.../org/apache/sis/storage/esri/RasterStore.java | 12 ++++++------
.../apache/sis/storage/esri/RawRasterReader.java | 8 ++++----
.../apache/sis/storage/esri/RawRasterStore.java | 6 +++---
.../apache/sis/storage/event/StoreListeners.java | 2 +-
.../main/org/apache/sis/storage/folder/Store.java | 2 +-
.../sis/storage/image/WorldFileResource.java | 6 +++---
.../apache/sis/storage/image/WorldFileStore.java | 4 ++--
.../sis/storage/modifier/CoverageModifier.java | 2 +-
.../main/org/apache/sis/storage/tiling/Tile.java | 2 +-
.../org/apache/sis/storage/wkt/StoreFormat.java | 2 +-
.../org/apache/sis/storage/wkt/StoreProvider.java | 2 +-
.../main/org/apache/sis/storage/xml/Store.java | 4 ++--
.../org/apache/sis/storage/xml/StoreProvider.java | 2 +-
.../org/apache/sis/storage/CoverageQueryTest.java | 2 +-
.../org/apache/sis/storage/FeatureQueryTest.java | 2 +-
.../sis/storage/aggregate/CoverageMosaicTest.java | 2 +-
.../sis/storage/aggregate/JoinFeatureSetTest.java | 2 +-
.../sis/storage/base/MemoryGridResourceTest.java | 2 +-
.../sis/storage/test/CoverageReadConsistency.java | 4 ++--
.../apache/sis/storage/test/SubsampledImage.java | 2 +-
.../sis/storage/xml/MimeTypeDetectorTest.java | 2 +-
.../test/org/apache/sis/storage/xml/StoreTest.java | 2 +-
.../src/org.apache.sis.util/main/module-info.java | 4 ++--
.../org/apache/sis/converter/StringConverter.java | 4 ++--
.../main/org/apache/sis/io/CompoundFormat.java | 6 +++---
.../main/org/apache/sis/io/DefaultFormat.java | 2 +-
.../org/apache/sis/io/IdentifiedObjectFormat.java | 6 +++---
.../main/org/apache/sis/io/LineAppender.java | 2 +-
.../main/org/apache/sis/io/TableAppender.java | 2 +-
.../main/org/apache/sis/math/ArrayVector.java | 2 +-
.../main/org/apache/sis/math/DecimalFunctions.java | 2 +-
.../main/org/apache/sis/math/Fraction.java | 2 +-
.../main/org/apache/sis/math/Line.java | 6 +++---
.../org/apache/sis/math/LinearlyDerivedVector.java | 2 +-
.../main/org/apache/sis/math/MathFunctions.java | 6 +++---
.../main/org/apache/sis/math/Plane.java | 6 +++---
.../main/org/apache/sis/math/Statistics.java | 4 ++--
.../main/org/apache/sis/math/StatisticsFormat.java | 2 +-
.../main/org/apache/sis/math/Vector.java | 2 +-
.../main/org/apache/sis/measure/AbstractUnit.java | 2 +-
.../main/org/apache/sis/measure/Angle.java | 2 +-
.../main/org/apache/sis/measure/AngleFormat.java | 4 ++--
.../org/apache/sis/measure/LinearConverter.java | 4 ++--
.../main/org/apache/sis/measure/NumberRange.java | 2 +-
.../main/org/apache/sis/measure/Prefixes.java | 2 +-
.../main/org/apache/sis/measure/Range.java | 2 +-
.../main/org/apache/sis/measure/RangeFormat.java | 4 ++--
.../main/org/apache/sis/measure/Scalar.java | 2 +-
.../apache/sis/measure/SexagesimalConverter.java | 2 +-
.../main/org/apache/sis/measure/UnitDimension.java | 2 +-
.../main/org/apache/sis/measure/UnitFormat.java | 6 +++---
.../main/org/apache/sis/measure/UnitRegistry.java | 2 +-
.../main/org/apache/sis/measure/UnitServices.java | 2 +-
.../main/org/apache/sis/measure/Units.java | 6 +++---
.../main/org/apache/sis/setup/About.java | 6 +++---
.../main/org/apache/sis/setup/Configuration.java | 2 +-
.../main/org/apache/sis/setup/GeometryLibrary.java | 2 +-
.../apache/sis/setup/InstallationResources.java | 6 +++---
.../apache/sis/setup/OptionalInstallations.java | 2 +-
.../main/org/apache/sis/system/DataDirectory.java | 2 +-
.../sis/util/AbstractInternationalString.java | 2 +-
.../main/org/apache/sis/util/ArgumentChecks.java | 2 +-
.../main/org/apache/sis/util/Characters.java | 4 ++--
.../main/org/apache/sis/util/Numbers.java | 4 ++--
.../apache/sis/util/collection/CodeListSet.java | 2 +-
.../org/apache/sis/util/collection/Containers.java | 2 +-
.../sis/util/collection/DefaultTreeTable.java | 4 ++--
.../org/apache/sis/util/collection/DerivedSet.java | 2 +-
.../apache/sis/util/collection/IntegerList.java | 2 +-
.../sis/util/collection/TreeTableFormat.java | 6 +++---
.../sis/util/internal/AutoMessageFormat.java | 2 +-
.../shared}/AbstractIterator.java | 2 +-
.../{privy => internal/shared}/AbstractMap.java | 2 +-
.../shared}/AbstractMapEntry.java | 2 +-
.../sis/util/{privy => internal/shared}/Bag.java | 2 +-
.../shared}/CheckedArrayList.java | 2 +-
.../{privy => internal/shared}/CheckedHashSet.java | 2 +-
.../{privy => internal/shared}/CloneAccess.java | 2 +-
.../util/{privy => internal/shared}/Cloner.java | 2 +-
.../util/{privy => internal/shared}/CodeLists.java | 2 +-
.../{privy => internal/shared}/CollectionsExt.java | 2 +-
.../util/{privy => internal/shared}/Constants.java | 2 +-
.../{privy => internal/shared}/DefinitionURI.java | 8 ++++----
.../{privy => internal/shared}/DoubleDouble.java | 2 +-
.../{privy => internal/shared}/EmptyQueue.java | 2 +-
.../{privy => internal/shared}/LazyCandidate.java | 2 +-
.../shared}/ListOfUnknownSize.java | 2 +-
.../shared}/LocalizedParseException.java | 2 +-
.../shared}/MetadataServices.java | 2 +-
.../util/{privy => internal/shared}/Numerics.java | 6 +++---
.../{privy => internal/shared}/PropertyFormat.java | 2 +-
.../shared}/SetOfUnknownSize.java | 2 +-
.../util/{privy => internal/shared}/Strings.java | 2 +-
.../shared}/TreeFormatCustomization.java | 2 +-
.../sis/util/{privy => internal/shared}/URLs.java | 2 +-
.../shared}/UnmodifiableArrayList.java | 2 +-
.../util/{privy => internal/shared}/Unsafe.java | 2 +-
.../sis/util/{privy => internal/shared}/X364.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../apache/sis/util/logging/MonolineFormatter.java | 6 +++---
.../sis/util/resources/IndexedResourceBundle.java | 4 ++--
.../test/org/apache/sis/io/WordWrapTest.java | 2 +-
.../org/apache/sis/measure/RangeFormatTest.java | 2 +-
.../test/org/apache/sis/test/TestCase.java | 2 +-
.../test/org/apache/sis/test/TestUtilities.java | 4 ++--
.../org/apache/sis/util/collection/CacheTest.java | 2 +-
.../apache/sis/util/collection/RangeSetTest.java | 4 ++--
.../shared}/AbstractMapTest.java | 2 +-
.../util/{privy => internal/shared}/BagTest.java | 2 +-
.../shared}/CheckedArrayListTest.java | 2 +-
.../shared}/CollectionsExtTest.java | 2 +-
.../{privy => internal/shared}/ConstantsTest.java | 2 +-
.../shared}/DefinitionURITest.java | 2 +-
.../shared}/DoubleDoubleTest.java | 2 +-
.../shared}/ListOfUnknownSizeTest.java | 2 +-
.../shared}/LocalizedParseExceptionTest.java | 2 +-
.../{privy => internal/shared}/NumericsTest.java | 4 ++--
.../{privy => internal/shared}/StringsTest.java | 2 +-
.../util/{privy => internal/shared}/X364Test.java | 4 ++--
.../sis/util/logging/MonolineFormatterTest.java | 2 +-
.../org/apache/sis/cql/FilterToCQLVisitor.java | 4 ++--
.../test/org/apache/sis/cql/FilterReadingTest.java | 2 +-
.../test/org/apache/sis/cql/FilterWritingTest.java | 2 +-
.../org/apache/sis/geometries/CurvePolygon.java | 2 +-
.../main/org/apache/sis/geometries/Geometries.java | 4 ++--
.../org/apache/sis/geometries/GeometryFactory.java | 22 +++++++++++-----------
.../main/org/apache/sis/geometries/LineString.java | 2 +-
.../main/org/apache/sis/geometries/LinearRing.java | 2 +-
.../org/apache/sis/geometries/MultiLineString.java | 2 +-
.../main/org/apache/sis/geometries/MultiPoint.java | 2 +-
.../org/apache/sis/geometries/MultiPolygon.java | 2 +-
.../main/org/apache/sis/geometries/OBBox.java | 2 +-
.../main/org/apache/sis/geometries/Point.java | 2 +-
.../main/org/apache/sis/geometries/Polygon.java | 2 +-
.../main/org/apache/sis/geometries/Sphere.java | 2 +-
.../main/org/apache/sis/geometries/TIN.java | 2 +-
.../main/org/apache/sis/geometries/Triangle.java | 2 +-
.../main/org/apache/sis/geometries/Wrapper.java | 2 +-
.../shared}/AbstractGeometry.java | 2 +-
.../{privy => internal/shared}/ArraySequence.java | 2 +-
.../shared}/DefaultGeometryCollection.java | 2 +-
.../shared}/DefaultLineString.java | 2 +-
.../shared}/DefaultLinearRing.java | 2 +-
.../shared}/DefaultMultiCurve.java | 2 +-
.../shared}/DefaultMultiLineString.java | 2 +-
.../shared}/DefaultMultiPoint.java | 2 +-
.../shared}/DefaultMultiPolygon.java | 2 +-
.../shared}/DefaultMultiSurface.java | 2 +-
.../{privy => internal/shared}/DefaultPoint.java | 2 +-
.../shared}/DefaultPointSequence.java | 2 +-
.../{privy => internal/shared}/DefaultPolygon.java | 4 ++--
.../shared}/DefaultTriangle.java | 2 +-
.../org/apache/sis/geometries/math/DataType.java | 2 +-
.../main/org/apache/sis/geometries/math/Maths.java | 2 +-
.../apache/sis/geometries/mesh/MeshPrimitive.java | 2 +-
.../sis/geometries/mesh/MultiMeshPrimitive.java | 2 +-
.../sis/geometries/processor/ProcessorUtils.java | 2 +-
.../processor/spatialanalysis2d/Intersection.java | 2 +-
.../geometries/processor/spatialedition/To3D.java | 2 +-
.../processor/spatialedition/ToPrimitive.java | 2 +-
.../processor/spatialedition/Transform.java | 2 +-
.../simplify/greedyinsert/WTriangle.java | 2 +-
.../triangulate/delaunay/OrientedEdge.java | 2 +-
.../triangulate/delaunay/OrientedTriangle.java | 4 ++--
.../shared}/ArraySequenceTest.java | 2 +-
.../main/org/apache/sis/map/SEPortrayer.java | 4 ++--
.../main/org/apache/sis/map/SymbologyVisitor.java | 2 +-
.../apache/sis/map/service/se1/LineToScene2D.java | 2 +-
.../test/org/apache/sis/map/SEPortrayerTest.java | 2 +-
.../sis/map/service/GraphicsPortrayerTest.java | 2 +-
.../sis/storage/geoheif/CoverageBuilder.java | 10 +++++-----
.../apache/sis/storage/geoheif/GeoHeifStore.java | 2 +-
.../main/org/apache/sis/storage/geoheif/Group.java | 2 +-
.../sis/storage/geoheif/UncompressedImage.java | 4 ++--
.../org/apache/sis/storage/isobmff/TreeNode.java | 2 +-
.../apache/sis/storage/isobmff/base/HeaderBox.java | 2 +-
.../sis/storage/isobmff/mpeg/ComponentPalette.java | 2 +-
.../org/apache/sis/storage/geopackage/Content.java | 2 +-
.../sis/storage/geopackage/ContentWriter.java | 2 +-
.../apache/sis/storage/geopackage/GpkgStore.java | 2 +-
.../sis/storage/geopackage/GpkgStoreProvider.java | 4 ++--
.../sis/storage/shapefile/ShapefileStore.java | 6 +++---
.../sis/storage/shapefile/ShapefileStoreTest.java | 2 +-
netbeans-project/nbproject/project.properties | 8 ++++----
optional/build.gradle.kts | 2 +-
.../apache/sis/gui/controls/SyncWindowList.java | 2 +-
.../apache/sis/gui/controls/ValueColorMapper.java | 2 +-
.../apache/sis/gui/coverage/CoverageCanvas.java | 4 ++--
.../main/org/apache/sis/gui/coverage/GridView.java | 2 +-
.../org/apache/sis/gui/coverage/GridViewSkin.java | 4 ++--
.../apache/sis/gui/coverage/IsolineRenderer.java | 2 +-
.../org/apache/sis/gui/dataset/ExpandableList.java | 2 +-
.../org/apache/sis/gui/dataset/FeatureList.java | 2 +-
.../org/apache/sis/gui/dataset/FeatureTable.java | 4 ++--
.../org/apache/sis/gui/dataset/ResourceCell.java | 2 +-
.../apache/sis/gui/internal/DataStoreOpener.java | 2 +-
.../org/apache/sis/gui/internal/GUIUtilities.java | 2 +-
.../apache/sis/gui/internal/ImageConverter.java | 6 +++---
.../sis/gui/internal/PropertyValueFormats.java | 2 +-
.../sis/gui/internal/PropertyValueFormatter.java | 2 +-
.../apache/sis/gui/internal/io/FileAccessItem.java | 2 +-
.../main/org/apache/sis/gui/map/MapCanvas.java | 8 ++++----
.../main/org/apache/sis/gui/map/MapCanvasAWT.java | 2 +-
.../main/org/apache/sis/gui/map/StatusBar.java | 2 +-
.../org/apache/sis/gui/map/ValuesFormatter.java | 2 +-
.../sis/gui/metadata/IdentificationInfo.java | 4 ++--
.../apache/sis/gui/metadata/MetadataSummary.java | 2 +-
.../sis/gui/metadata/RepresentationInfo.java | 2 +-
.../sis/gui/metadata/StandardMetadataTree.java | 2 +-
.../apache/sis/gui/referencing/AuthorityCodes.java | 4 ++--
.../org/apache/sis/gui/referencing/CRSChooser.java | 2 +-
.../org/apache/sis/gui/referencing/CodeFilter.java | 2 +-
.../org/apache/sis/gui/referencing/MenuSync.java | 2 +-
.../gui/referencing/PositionableProjection.java | 4 ++--
.../gui/referencing/RecentReferenceSystems.java | 4 ++--
.../main/org/apache/sis/gui/referencing/Utils.java | 2 +-
.../sis/resources/embedded/EmbeddedResources.java | 4 ++--
.../resources/embedded/EmbeddedResourcesTest.java | 2 +-
.../apache/sis/resources/embedded/Generator.java | 4 ++--
.../factory/sql/epsg/ScriptProvider.java | 2 +-
.../factory/sql/epsg/DataScriptFormatter.java | 6 +++---
.../main/org/apache/sis/storage/gdal/Band.java | 4 ++--
.../main/org/apache/sis/storage/gdal/Driver.java | 4 ++--
.../apache/sis/storage/gdal/FeatureIterator.java | 4 ++--
.../org/apache/sis/storage/gdal/FeatureLayer.java | 4 ++--
.../org/apache/sis/storage/gdal/FieldAccessor.java | 4 ++--
.../main/org/apache/sis/storage/gdal/GDAL.java | 2 +-
.../org/apache/sis/storage/gdal/GDALStore.java | 4 ++--
.../apache/sis/storage/gdal/GDALStoreProvider.java | 2 +-
.../main/org/apache/sis/storage/gdal/Opener.java | 2 +-
.../org/apache/sis/storage/gdal/SpatialRef.java | 2 +-
.../org/apache/sis/storage/gdal/TiledCoverage.java | 2 +-
.../org/apache/sis/storage/gdal/TiledResource.java | 8 ++++----
.../org/apache/sis/storage/gdal/GDALStoreTest.java | 2 +-
1210 files changed, 2130 insertions(+), 2130 deletions(-)
diff --git a/endorsed/build.gradle.kts b/endorsed/build.gradle.kts
index ffd4adcfd4..26becb2149 100644
--- a/endorsed/build.gradle.kts
+++ b/endorsed/build.gradle.kts
@@ -162,14 +162,14 @@ fun addExportForTests(args : MutableList<String>) {
* an internal API.
*/
// ――――――――――――― Module name ――――――――――――――――――――――― Package to export ―――――――――――――――
- addExport(args, "org.apache.sis.metadata", "org.apache.sis.metadata.privy",
+ addExport(args, "org.apache.sis.metadata", "org.apache.sis.metadata.internal.shared",
"org.apache.sis.referencing.gazetteer")
addExport(args, "org.apache.sis.metadata", "org.apache.sis.metadata.xml",
"org.apache.sis.storage," +
"org.apache.sis.console")
- addExport(args, "org.apache.sis.metadata", "org.apache.sis.xml.privy",
+ addExport(args, "org.apache.sis.metadata", "org.apache.sis.xml.internal.shared",
"org.apache.sis.storage.geotiff")
addExport(args, "org.apache.sis.metadata", "org.apache.sis.xml.bind.gcx",
@@ -178,7 +178,7 @@ fun addExportForTests(args : MutableList<String>) {
addExport(args, "org.apache.sis.referencing", "org.apache.sis.referencing.internal",
"org.apache.sis.openoffice")
- addExport(args, "org.apache.sis.feature", "org.apache.sis.feature.privy",
+ addExport(args, "org.apache.sis.feature", "org.apache.sis.feature.internal.shared",
"org.apache.sis.storage.sql")
addExport(args, "org.apache.sis.feature", "org.apache.sis.geometry.wrapper.jts",
diff --git a/endorsed/src/org.apache.sis.cloud.aws/main/org/apache/sis/cloud/aws/s3/ClientFileSystem.java b/endorsed/src/org.apache.sis.cloud.aws/main/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
index e28376cf7d..afb73ee54d 100644
--- a/endorsed/src/org.apache.sis.cloud.aws/main/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
+++ b/endorsed/src/org.apache.sis.cloud.aws/main/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
@@ -37,7 +37,7 @@ import software.amazon.awssdk.core.exception.SdkException;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
/**
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java
index e117142701..253f90146d 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java
@@ -36,8 +36,8 @@ import org.apache.sis.util.resources.Messages;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.collection.TableColumn;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.X364;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.X364;
import org.apache.sis.system.Loggers;
import org.apache.sis.system.Supervisor;
import org.apache.sis.system.SupervisorMBean;
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/Command.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/Command.java
index 58ec0edf18..055923819e 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/Command.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/Command.java
@@ -26,7 +26,7 @@ import java.sql.SQLException;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.privy.X364;
+import org.apache.sis.util.internal.shared.X364;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.logging.Initializer;
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
index c17b7f89c6..6ea21715e1 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
@@ -35,7 +35,7 @@ import org.apache.sis.system.Environment;
import org.apache.sis.util.Locales;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.X364;
+import org.apache.sis.util.internal.shared.X364;
import org.apache.sis.pending.jdk.JDK22;
import org.apache.sis.storage.DataOptionKey;
import org.apache.sis.storage.StorageConnector;
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/FormattedOutputCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/FormattedOutputCommand.java
index 24eae3bcc9..5168df2f9c 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/FormattedOutputCommand.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/FormattedOutputCommand.java
@@ -45,7 +45,7 @@ import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.collection.TreeTableFormat;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.X364;
+import org.apache.sis.util.internal.shared.X364;
import org.apache.sis.measure.Range;
import org.apache.sis.setup.OptionKey;
import org.apache.sis.xml.MarshallerPool;
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java
index b048d9a32e..9095f0937d 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java
@@ -31,7 +31,7 @@ import org.opengis.util.FactoryException;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Workaround;
-import org.apache.sis.util.privy.X364;
+import org.apache.sis.util.internal.shared.X364;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.util.resources.Vocabulary;
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/ResourcesDownloader.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/ResourcesDownloader.java
index fdd143eac1..585c8b0ca8 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/ResourcesDownloader.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/ResourcesDownloader.java
@@ -23,7 +23,7 @@ import java.util.Locale;
import java.util.ResourceBundle;
import java.io.Console;
import java.io.PrintWriter;
-import org.apache.sis.util.privy.X364;
+import org.apache.sis.util.internal.shared.X364;
import org.apache.sis.system.Fallback;
import org.apache.sis.system.Environment;
import org.apache.sis.setup.OptionalInstallations;
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java
index 220a599de1..efed1ce08f 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java
@@ -53,16 +53,16 @@ import org.opengis.referencing.operation.NoninvertibleTransformException;
import org.apache.sis.geometry.ImmutableEnvelope;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.Formulas;
-import org.apache.sis.referencing.privy.DirectPositionView;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.Formulas;
+import org.apache.sis.referencing.internal.shared.DirectPositionView;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStores;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.base.CodeType;
import org.apache.sis.system.Modules;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.privy.X364;
+import org.apache.sis.util.internal.shared.X364;
import org.apache.sis.io.LineAppender;
import org.apache.sis.io.TableAppender;
import org.apache.sis.io.stream.IOUtilities;
diff --git a/endorsed/src/org.apache.sis.feature/main/module-info.java b/endorsed/src/org.apache.sis.feature/main/module-info.java
index e557fb23e2..4930f89a37 100644
--- a/endorsed/src/org.apache.sis.feature/main/module-info.java
+++ b/endorsed/src/org.apache.sis.feature/main/module-info.java
@@ -41,7 +41,7 @@ module org.apache.sis.feature {
exports org.apache.sis.filter;
exports org.apache.sis.index.tree;
- exports org.apache.sis.filter.privy to
+ exports org.apache.sis.filter.internal.shared to
org.apache.sis.storage,
org.apache.sis.storage.sql,
org.apache.sis.storage.shapefile, // In the "incubator" sub-project.
@@ -51,7 +51,7 @@ module org.apache.sis.feature {
exports org.apache.sis.filter.sqlmm to
org.apache.sis.geometry; // In the "incubator" sub-project.
- exports org.apache.sis.feature.privy to
+ exports org.apache.sis.feature.internal.shared to
org.apache.sis.storage,
org.apache.sis.storage.xml,
org.apache.sis.storage.sql,
@@ -81,12 +81,12 @@ module org.apache.sis.feature {
org.apache.sis.portrayal.map, // In the "incubator" sub-project.
org.apache.sis.cql; // In the "incubator" sub-project.
- exports org.apache.sis.coverage.privy to
+ exports org.apache.sis.coverage.internal.shared to
org.apache.sis.storage,
org.apache.sis.storage.netcdf,
org.apache.sis.portrayal;
- exports org.apache.sis.image.privy to
+ exports org.apache.sis.image.internal.shared to
org.apache.sis.storage,
org.apache.sis.storage.sql,
org.apache.sis.storage.netcdf,
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java
index 4c43a50743..7e414f32cb 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java
@@ -39,9 +39,9 @@ import org.apache.sis.image.Interpolation;
import org.apache.sis.image.PlanarImage;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.measure.NumberRange;
-import org.apache.sis.coverage.privy.SampleDimensions;
-import static org.apache.sis.util.privy.Numerics.saturatingAdd;
-import static org.apache.sis.util.privy.Numerics.saturatingSubtract;
+import org.apache.sis.coverage.internal.shared.SampleDimensions;
+import static org.apache.sis.util.internal.shared.Numerics.saturatingAdd;
+import static org.apache.sis.util.internal.shared.Numerics.saturatingSubtract;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.coverage.CannotEvaluateException;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleDimension.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleDimension.java
index c082297388..547c383163 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleDimension.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleDimension.java
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.operation.transform.TransferFunction;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.Debug;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.measure.MeasurementRange;
import org.apache.sis.measure.NumberRange;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleRangeFormat.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleRangeFormat.java
index bc7b36226e..37960cd763 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleRangeFormat.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleRangeFormat.java
@@ -27,7 +27,7 @@ import org.apache.sis.measure.Range;
import org.apache.sis.measure.RangeFormat;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.measure.MeasurementRange;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.system.Configuration;
import org.apache.sis.util.resources.Vocabulary;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BandAggregateGridCoverage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BandAggregateGridCoverage.java
index 52fbe4393e..b3cb457620 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BandAggregateGridCoverage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BandAggregateGridCoverage.java
@@ -24,8 +24,8 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.image.DataType;
import org.apache.sis.image.ImageProcessor;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.coverage.privy.BandAggregateArgument;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.coverage.internal.shared.BandAggregateArgument;
+import org.apache.sis.util.internal.shared.CollectionsExt;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ClippedGridCoverage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ClippedGridCoverage.java
index a81b2c6286..65cba86440 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ClippedGridCoverage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ClippedGridCoverage.java
@@ -21,7 +21,7 @@ import java.awt.image.RenderedImage;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.util.CorruptedObjectException;
import org.apache.sis.image.PlanarImage;
-import org.apache.sis.image.privy.ReshapedImage;
+import org.apache.sis.image.internal.shared.ReshapedImage;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/CoordinateOperationFinder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
index 003fc80760..d9c7c484b5 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
@@ -30,8 +30,8 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.CoordinateOperations;
-import org.apache.sis.referencing.privy.WraparoundApplicator;
+import org.apache.sis.referencing.internal.shared.CoordinateOperations;
+import org.apache.sis.referencing.internal.shared.WraparoundApplicator;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.transform.WraparoundTransform;
@@ -41,7 +41,7 @@ import org.apache.sis.image.ImageProcessor;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
import org.apache.sis.util.logging.Logging;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DefaultEvaluator.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DefaultEvaluator.java
index 29a51992ba..4711de9781 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DefaultEvaluator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DefaultEvaluator.java
@@ -34,11 +34,11 @@ import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.image.internal.shared.ImageUtilities;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.DirectPositionView;
-import org.apache.sis.referencing.privy.WraparoundAxesFinder;
+import org.apache.sis.referencing.internal.shared.DirectPositionView;
+import org.apache.sis.referencing.internal.shared.WraparoundAxesFinder;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java
index 1264dfcc67..02f6a431e0 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java
@@ -20,7 +20,7 @@ import java.awt.image.RenderedImage;
import org.opengis.util.FactoryException;
import org.apache.sis.image.DataType;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.coverage.SubspaceNotSpecifiedException;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionReducer.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionReducer.java
index 29fd52dea9..7f9bed10b1 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionReducer.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionReducer.java
@@ -23,7 +23,7 @@ import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.geometry.GeneralEnvelope;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java
index 240e8ca9e5..01fc2cc3e0 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java
@@ -33,7 +33,7 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArgumentCheckByAssertion;
import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.geometry.ImmutableEnvelope;
import org.apache.sis.geometry.GeneralDirectPosition;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
index 5cf4dfb9fe..d8d23d9c0e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
@@ -23,7 +23,7 @@ import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.StringBuilders;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java
index 29671ec2fe..e428365373 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java
@@ -31,14 +31,14 @@ import org.opengis.referencing.operation.NoninvertibleTransformException;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Classes;
import org.apache.sis.util.Debug;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.coverage.BandedCoverage;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.SubspaceNotSpecifiedException;
import org.apache.sis.image.DataType;
import org.apache.sis.image.ImageProcessor;
-import org.apache.sis.coverage.privy.SampleDimensions;
+import org.apache.sis.coverage.internal.shared.SampleDimensions;
import org.apache.sis.util.collection.DefaultTreeTable;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.TreeTable;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java
index 38d60c852f..14bf66550a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java
@@ -44,8 +44,8 @@ import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.MathTransform1D;
import org.apache.sis.image.DataType;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.ReshapedImage;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.ReshapedImage;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Debug;
@@ -629,7 +629,7 @@ public class GridCoverage2D extends GridCoverage {
* at the cost of returning an image larger than necessary.
* This workaround can be removed on JDK17.
*/
- if (org.apache.sis.image.privy.TilePlaceholder.PENDING_JDK_FIX) {
+ if (org.apache.sis.image.internal.shared.TilePlaceholder.PENDING_JDK_FIX) {
if (result.getTileGridXOffset() == ix && result.getTileGridYOffset() == iy) {
return result;
}
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageBuilder.java
index 731f5e2cc5..b99bb4ce9d 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageBuilder.java
@@ -36,10 +36,10 @@ import org.opengis.geometry.Envelope;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.image.PlanarImage;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.image.privy.ColorScaleBuilder;
-import org.apache.sis.image.privy.ObservableImage;
-import org.apache.sis.image.privy.TiledImage;
-import org.apache.sis.image.privy.WritableTiledImage;
+import org.apache.sis.image.internal.shared.ColorScaleBuilder;
+import org.apache.sis.image.internal.shared.ObservableImage;
+import org.apache.sis.image.internal.shared.TiledImage;
+import org.apache.sis.image.internal.shared.WritableTiledImage;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageProcessor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageProcessor.java
index 47c44ab22d..c4648c90a4 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageProcessor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageProcessor.java
@@ -45,16 +45,16 @@ import org.apache.sis.image.Colorizer;
import org.apache.sis.image.PlanarImage;
import org.apache.sis.image.ImageProcessor;
import org.apache.sis.image.Interpolation;
-import org.apache.sis.coverage.privy.SampleDimensions;
-import org.apache.sis.coverage.privy.BandAggregateArgument;
+import org.apache.sis.coverage.internal.shared.SampleDimensions;
+import org.apache.sis.coverage.internal.shared.BandAggregateArgument;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.crs.DefaultTemporalCRS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.collection.WeakHashSet;
-import org.apache.sis.util.privy.Numerics;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.Numerics;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.measure.NumberRange;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridDerivation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridDerivation.java
index 7ad8920b1f..5a839eea07 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridDerivation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridDerivation.java
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.TransformSeparator;
import org.apache.sis.referencing.operation.matrix.Matrices;
-import org.apache.sis.referencing.privy.DirectPositionView;
+import org.apache.sis.referencing.internal.shared.DirectPositionView;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.Envelopes;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java
index 50ede01bbf..0d313275ac 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java
@@ -48,16 +48,16 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.collection.WeakValueHashMap;
-import org.apache.sis.util.privy.Numerics;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.DoubleDouble;
+import org.apache.sis.util.internal.shared.Numerics;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.DoubleDouble;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.geometry.AbstractEnvelope;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.coverage.SubspaceNotSpecifiedException;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.referencing.privy.ExtendedPrecisionMatrix;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.referencing.internal.shared.ExtendedPrecisionMatrix;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
index ce159e20c1..32b0f20527 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
@@ -52,7 +52,7 @@ import org.apache.sis.referencing.operation.DefaultConversion;
import org.apache.sis.referencing.operation.DefaultOperationMethod;
import org.apache.sis.referencing.operation.transform.TransformSeparator;
import org.apache.sis.referencing.factory.GeodeticObjectFactory;
-import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.Characters;
import org.apache.sis.util.Classes;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java
index aef757ced4..58bd4f5f0c 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java
@@ -55,11 +55,11 @@ import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.PassThroughTransform;
-import org.apache.sis.referencing.privy.ExtendedPrecisionMatrix;
-import org.apache.sis.referencing.privy.DirectPositionView;
-import org.apache.sis.referencing.privy.TemporalAccessor;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.referencing.internal.shared.ExtendedPrecisionMatrix;
+import org.apache.sis.referencing.internal.shared.DirectPositionView;
+import org.apache.sis.referencing.internal.shared.TemporalAccessor;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.ComparisonMode;
@@ -69,8 +69,8 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.Classes;
import org.apache.sis.util.Debug;
-import org.apache.sis.util.privy.DoubleDouble;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.DoubleDouble;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.DefaultTreeTable;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java
index 21b99a6306..8d293236cd 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java
@@ -45,12 +45,12 @@ import org.apache.sis.coverage.SubspaceNotSpecifiedException;
import org.apache.sis.coverage.MismatchedCoverageRangeException;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.Category;
-import org.apache.sis.image.privy.ColorScaleBuilder;
-import org.apache.sis.image.privy.DeferredProperty;
-import org.apache.sis.image.privy.RasterFactory;
-import org.apache.sis.image.privy.ObservableImage;
-import org.apache.sis.image.privy.TiledImage;
-import org.apache.sis.image.privy.WritableTiledImage;
+import org.apache.sis.image.internal.shared.ColorScaleBuilder;
+import org.apache.sis.image.internal.shared.DeferredProperty;
+import org.apache.sis.image.internal.shared.RasterFactory;
+import org.apache.sis.image.internal.shared.ObservableImage;
+import org.apache.sis.image.internal.shared.TiledImage;
+import org.apache.sis.image.internal.shared.WritableTiledImage;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ReducedGridCoverage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ReducedGridCoverage.java
index 5f0f43c8a9..61fbe9a64d 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ReducedGridCoverage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ReducedGridCoverage.java
@@ -20,7 +20,7 @@ import java.util.Map;
import java.util.TreeMap;
import java.awt.image.RenderedImage;
import org.opengis.geometry.DirectPosition;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ResampledGridCoverage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ResampledGridCoverage.java
index 890c791275..0ec7f0a33f 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ResampledGridCoverage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ResampledGridCoverage.java
@@ -31,10 +31,10 @@ import org.apache.sis.image.ImageProcessor;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
-import org.apache.sis.util.privy.DoubleDouble;
+import org.apache.sis.util.internal.shared.DoubleDouble;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.DirectPositionView;
-import org.apache.sis.referencing.privy.ExtendedPrecisionMatrix;
+import org.apache.sis.referencing.internal.shared.DirectPositionView;
+import org.apache.sis.referencing.internal.shared.ExtendedPrecisionMatrix;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.transform.TransformSeparator;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/SliceGeometry.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/SliceGeometry.java
index ec6e73472a..d57182f506 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/SliceGeometry.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/SliceGeometry.java
@@ -31,11 +31,11 @@ import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.TransformSeparator;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.ImmutableEnvelope;
-import org.apache.sis.referencing.privy.DirectPositionView;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.DirectPositionView;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.resources.Errors;
@@ -44,7 +44,7 @@ import org.apache.sis.util.resources.Errors;
* {@link GridGeometry#selectDimensions(int[])} and {@link ImageRenderer#getImageGeometry(int)} methods.
*
* <p>This class implements {@link Function} for allowing {@code apply(…)} to be invoked from outside this package.
- * That function is invoked (indirectly) by {@link org.apache.sis.image.privy.TiledImage#getProperty(String)}.</p>
+ * That function is invoked (indirectly) by {@link org.apache.sis.image.internal.shared.TiledImage#getProperty(String)}.</p>
*
* @author Martin Desruisseaux (Geomatys)
*/
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/BandAggregateArgument.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/BandAggregateArgument.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/BandAggregateArgument.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/BandAggregateArgument.java
index f4a5efe523..abf4dd1b00 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/BandAggregateArgument.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/BandAggregateArgument.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.coverage.privy;
+package org.apache.sis.coverage.internal.shared;
import java.util.List;
import java.util.Arrays;
@@ -32,7 +32,7 @@ import org.apache.sis.coverage.grid.IllegalGridGeometryException;
import org.apache.sis.coverage.grid.PixelInCell;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/CommonDomainFinder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/CommonDomainFinder.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/CommonDomainFinder.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/CommonDomainFinder.java
index fc6563132c..01b2a5ce33 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/CommonDomainFinder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/CommonDomainFinder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.coverage.privy;
+package org.apache.sis.coverage.internal.shared;
import java.util.Map;
import java.util.LinkedHashMap;
@@ -31,10 +31,10 @@ import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.IllegalGridGeometryException;
import org.apache.sis.coverage.grid.PixelInCell;
-import org.apache.sis.referencing.privy.ExtendedPrecisionMatrix;
+import org.apache.sis.referencing.internal.shared.ExtendedPrecisionMatrix;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.Numbers;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.coordinate.MismatchedDimensionException;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/RangeArgument.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/RangeArgument.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/RangeArgument.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/RangeArgument.java
index 2584e68eb2..cbecfc1242 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/RangeArgument.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/RangeArgument.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.coverage.privy;
+package org.apache.sis.coverage.internal.shared;
import java.util.List;
import java.util.Arrays;
@@ -25,12 +25,12 @@ import org.opengis.metadata.spatial.DimensionNameType;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.image.privy.ColorModelFactory;
-import org.apache.sis.image.privy.SampleModelBuilder;
+import org.apache.sis.image.internal.shared.ColorModelFactory;
+import org.apache.sis.image.internal.shared.SampleModelBuilder;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Localized;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.math.MathFunctions;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/SampleDimensions.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/SampleDimensions.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/SampleDimensions.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/SampleDimensions.java
index 32665632db..74ec3dc952 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/SampleDimensions.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/SampleDimensions.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.coverage.privy;
+package org.apache.sis.coverage.internal.shared;
import java.util.List;
import java.util.Optional;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/package-info.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/package-info.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/package-info.java
index ad13927b9a..9fffef8bf0 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/package-info.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/package-info.java
@@ -27,4 +27,4 @@
*
* @author Martin Desruisseaux (Geomatys)
*/
-package org.apache.sis.coverage.privy;
+package org.apache.sis.coverage.internal.shared;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
index 1ac43343df..ae57b3522e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
@@ -31,7 +31,7 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.CorruptedObjectException;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.Containers;
-import org.apache.sis.util.privy.CheckedArrayList;
+import org.apache.sis.util.internal.shared.CheckedArrayList;
import org.apache.sis.feature.internal.Resources;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java
index 8c32f92b3a..d3d0c1af24 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java
@@ -18,10 +18,10 @@ package org.apache.sis.feature;
import java.util.Map;
import org.opengis.util.GenericName;
-import org.apache.sis.util.privy.Cloner;
-import org.apache.sis.util.privy.CloneAccess;
-import org.apache.sis.util.privy.AbstractMap;
-import org.apache.sis.util.privy.AbstractMapEntry;
+import org.apache.sis.util.internal.shared.Cloner;
+import org.apache.sis.util.internal.shared.CloneAccess;
+import org.apache.sis.util.internal.shared.AbstractMap;
+import org.apache.sis.util.internal.shared.AbstractMapEntry;
import org.apache.sis.feature.internal.Resources;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java
index 99f9006b73..8ea71fddc2 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java
@@ -21,8 +21,8 @@ import java.util.HashMap;
import org.opengis.util.ScopedName;
import org.opengis.util.GenericName;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.AbstractMap;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.AbstractMap;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.util.collection.WeakValueHashMap;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.pending.jdk.JDK19;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
index 2dbaf6fe30..aba59be67e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
@@ -26,7 +26,7 @@ import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
import org.opengis.metadata.Identifier;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.PropertyType;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
index 83e5ce6285..fb9a800298 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
@@ -36,8 +36,8 @@ import org.opengis.util.InternationalString;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.collection.Containers;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.feature.internal.Resources;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java
index db9fd2c693..af8344ec28 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java
@@ -22,8 +22,8 @@ import java.util.Optional;
import org.opengis.metadata.maintenance.ScopeCode;
import org.opengis.metadata.quality.DataQuality;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.CloneAccess;
-import org.apache.sis.util.privy.Cloner;
+import org.apache.sis.util.internal.shared.CloneAccess;
+import org.apache.sis.util.internal.shared.Cloner;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Property;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/EnvelopeOperation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/EnvelopeOperation.java
index 349c759a98..0b77b5ed8a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/EnvelopeOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/EnvelopeOperation.java
@@ -28,13 +28,13 @@ import org.opengis.parameter.ParameterValueGroup;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.feature.privy.AttributeConvention;
import org.apache.sis.feature.internal.Resources;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.referencing.CRS;
import org.apache.sis.pending.jdk.JDK21;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java
index 5d27304400..cb855771e2 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java
@@ -23,8 +23,8 @@ import java.util.Collection;
import java.util.function.Function;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.parameter.ParameterDescriptorGroup;
-import org.apache.sis.filter.privy.FunctionNames;
-import org.apache.sis.filter.privy.Visitor;
+import org.apache.sis.filter.internal.shared.FunctionNames;
+import org.apache.sis.filter.internal.shared.Visitor;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.util.CodeList;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureFormat.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureFormat.java
index a5e392d5c2..38997ad5f7 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureFormat.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureFormat.java
@@ -42,8 +42,8 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.referencing.IdentifiedObjects;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java
index 1b9bde711c..ae5b2c7c98 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java
@@ -26,9 +26,9 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Static;
import org.apache.sis.util.collection.WeakHashSet;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.filter.DefaultFilterFactory;
-import org.apache.sis.filter.privy.XPath;
+import org.apache.sis.filter.internal.shared.XPath;
import org.apache.sis.setup.GeometryLibrary;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/GroupAsPolylineOperation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/GroupAsPolylineOperation.java
index 7f603f4ca3..4ef3d47351 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/GroupAsPolylineOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/GroupAsPolylineOperation.java
@@ -22,13 +22,13 @@ import java.util.Iterator;
import java.util.EnumMap;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.parameter.ParameterValueGroup;
-import org.apache.sis.feature.privy.AttributeConvention;
import org.apache.sis.feature.internal.Resources;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryType;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.setup.GeometryLibrary;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java
index 1f9b497dc6..e4155ae136 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java
@@ -18,7 +18,7 @@ package org.apache.sis.feature;
import java.util.Collection;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.CheckedArrayList;
+import org.apache.sis.util.internal.shared.CheckedArrayList;
import org.apache.sis.feature.internal.Resources;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAttribute.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAttribute.java
index 482edf2f3d..ca1b22a975 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAttribute.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAttribute.java
@@ -18,8 +18,8 @@ package org.apache.sis.feature;
import java.util.Collection;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.CloneAccess;
-import org.apache.sis.util.privy.CheckedArrayList;
+import org.apache.sis.util.internal.shared.CloneAccess;
+import org.apache.sis.util.internal.shared.CheckedArrayList;
import org.apache.sis.util.collection.CheckedContainer;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.feature.internal.Resources;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java
index abc94cb28d..c1517e71f9 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java
@@ -20,7 +20,7 @@ import java.util.Collection;
import java.util.Collections;
import java.io.Serializable;
import org.opengis.util.GenericName;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Set;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java
index 8175cd608a..1a623d3821 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java
@@ -17,7 +17,7 @@
package org.apache.sis.feature;
import java.util.Objects;
-import org.apache.sis.util.privy.CloneAccess;
+import org.apache.sis.util.internal.shared.CloneAccess;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.AttributeType;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java
index 76a110b426..6ddc2667dd 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java
@@ -25,8 +25,8 @@ import org.opengis.metadata.maintenance.ScopeCode;
import org.opengis.metadata.quality.DataQuality;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.CorruptedObjectException;
-import org.apache.sis.util.privy.CloneAccess;
-import org.apache.sis.util.privy.Cloner;
+import org.apache.sis.util.internal.shared.CloneAccess;
+import org.apache.sis.util.internal.shared.Cloner;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Property;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
index c6dd9105ce..5729aefcaf 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
@@ -32,11 +32,11 @@ import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Classes;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.converter.SurjectiveConverter;
-import org.apache.sis.feature.privy.AttributeConvention;
import org.apache.sis.feature.internal.Resources;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.util.resources.Errors;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java
index 9c1eeaa26d..fabd4d95a0 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java
@@ -32,11 +32,11 @@ import org.apache.sis.feature.FeatureOperations;
import org.apache.sis.util.Classes;
import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.UnconvertibleObjectException;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.SetOfUnknownSize;
-import org.apache.sis.util.privy.AbstractIterator;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.SetOfUnknownSize;
+import org.apache.sis.util.internal.shared.AbstractIterator;
import org.apache.sis.feature.internal.Resources;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/FeatureTypeBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/FeatureTypeBuilder.java
index 8a22418d3f..97b0d7c760 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/FeatureTypeBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/FeatureTypeBuilder.java
@@ -33,8 +33,8 @@ import org.apache.sis.setup.GeometryLibrary;
import org.apache.sis.feature.AbstractOperation;
import org.apache.sis.feature.DefaultFeatureType;
import org.apache.sis.feature.FeatureOperations;
-import org.apache.sis.feature.privy.AttributeConvention;
import org.apache.sis.feature.internal.Resources;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.util.CorruptedObjectException;
import org.apache.sis.util.ArraysExt;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/AttributeConvention.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/AttributeConvention.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/AttributeConvention.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/AttributeConvention.java
index 088c5b53d4..70e3c6b2ef 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/AttributeConvention.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/AttributeConvention.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.feature.privy;
+package org.apache.sis.feature.internal.shared;
import java.util.Optional;
import org.opengis.util.LocalName;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureExpression.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureExpression.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureExpression.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureExpression.java
index 03dbf4913a..0c86b600f7 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureExpression.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.feature.privy;
+package org.apache.sis.feature.internal.shared;
import java.util.Set;
import org.apache.sis.math.FunctionProperty;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureProjection.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureProjection.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java
index b263c1e4dc..9807ccfbd0 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureProjection.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.feature.privy;
+package org.apache.sis.feature.internal.shared;
import java.util.List;
import java.util.Set;
@@ -25,8 +25,8 @@ import java.util.function.UnaryOperator;
import org.apache.sis.util.Debug;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
-import org.apache.sis.filter.privy.ListingPropertyVisitor;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
+import org.apache.sis.filter.internal.shared.ListingPropertyVisitor;
import org.apache.sis.io.TableAppender;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureProjectionBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjectionBuilder.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureProjectionBuilder.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjectionBuilder.java
index 49858e1f63..ac9681ef89 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureProjectionBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjectionBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.feature.privy;
+package org.apache.sis.feature.internal.shared;
import java.util.Map;
import java.util.HashMap;
@@ -38,7 +38,7 @@ import org.apache.sis.feature.builder.PropertyTypeBuilder;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.ArgumentCheckByAssertion;
import org.apache.sis.util.UnconvertibleObjectException;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Vocabulary;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureView.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureView.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureView.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureView.java
index a0dac0a57f..077d491398 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureView.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.feature.privy;
+package org.apache.sis.feature.internal.shared;
import org.apache.sis.feature.AbstractFeature;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/InstantList.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/InstantList.java
similarity index 97%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/InstantList.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/InstantList.java
index 817f4efce3..bd8b5cab43 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/InstantList.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/InstantList.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.feature.privy;
+package org.apache.sis.feature.internal.shared;
import java.time.Instant;
import java.util.AbstractList;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/MovingFeatures.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/MovingFeatures.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/MovingFeatures.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/MovingFeatures.java
index c468b4d0dd..3ca1254b1b 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/MovingFeatures.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/MovingFeatures.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.feature.privy;
+package org.apache.sis.feature.internal.shared;
import java.util.Map;
import java.util.HashMap;
@@ -23,7 +23,7 @@ import org.apache.sis.util.iso.Names;
import org.apache.sis.math.Vector;
import org.apache.sis.feature.DefaultAttributeType;
import org.apache.sis.referencing.crs.DefaultTemporalCRS;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Attribute;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/package-info.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/package-info.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/package-info.java
index b2763685f0..e496ee79bc 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/package-info.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/package-info.java
@@ -29,4 +29,4 @@
* @author Martin Desruisseaux (Geomatys)
* @author Alexis Manin (Geomatys)
*/
-package org.apache.sis.feature.privy;
+package org.apache.sis.feature.internal.shared;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ArithmeticFunction.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ArithmeticFunction.java
index eabd8cdf58..0e5521269e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ArithmeticFunction.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ArithmeticFunction.java
@@ -19,9 +19,9 @@ package org.apache.sis.filter;
import java.math.BigDecimal;
import java.math.BigInteger;
import org.opengis.util.ScopedName;
-import org.apache.sis.feature.privy.FeatureExpression;
-import org.apache.sis.feature.privy.FeatureProjectionBuilder;
-import org.apache.sis.filter.privy.FunctionNames;
+import org.apache.sis.feature.internal.shared.FeatureExpression;
+import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder;
+import org.apache.sis.filter.internal.shared.FunctionNames;
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.math.Fraction;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/AssociationValue.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/AssociationValue.java
index 1ab716a0a3..657a64b49f 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/AssociationValue.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/AssociationValue.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Collection;
import java.util.Optional;
import org.apache.sis.feature.Features;
-import org.apache.sis.feature.privy.FeatureProjectionBuilder;
+import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder;
import org.apache.sis.math.FunctionProperty;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/BinaryGeometryFilter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/BinaryGeometryFilter.java
index 92502c388f..d8e1b00f43 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/BinaryGeometryFilter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/BinaryGeometryFilter.java
@@ -23,7 +23,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.geometry.wrapper.SpatialOperationContext;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.filter.internal.Node;
import org.apache.sis.util.Exceptions;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
index 11503530ce..240218641c 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
@@ -30,7 +30,7 @@ import org.opengis.filter.capability.ScalarCapabilities;
import org.opengis.filter.capability.SpatialCapabilities;
import org.opengis.filter.capability.TemporalCapabilities;
import org.apache.sis.util.collection.CodeListSet;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ConvertFunction.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ConvertFunction.java
index cc00434d9d..faa913ae15 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ConvertFunction.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ConvertFunction.java
@@ -23,8 +23,8 @@ import org.opengis.util.ScopedName;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.UnconvertibleObjectException;
-import org.apache.sis.feature.privy.FeatureExpression;
-import org.apache.sis.feature.privy.FeatureProjectionBuilder;
+import org.apache.sis.feature.internal.shared.FeatureExpression;
+import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder;
import org.apache.sis.math.FunctionProperty;
import org.apache.sis.util.resources.Errors;
@@ -41,7 +41,7 @@ import org.opengis.filter.Expression;
* @param <S> the type of value computed by the wrapped exception. This is the type to convert.
* @param <V> the type of value computed by this expression. This is the type after conversion.
*
- * @see org.apache.sis.filter.privy.GeometryConverter
+ * @see org.apache.sis.filter.internal.shared.GeometryConverter
*/
final class ConvertFunction<R,S,V> extends UnaryFunction<R,S>
implements FeatureExpression<R,V>, Optimization.OnExpression<R,V>
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
index 004d0985ae..ba50e7bbff 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
@@ -41,8 +41,8 @@ import org.opengis.filter.*;
import org.opengis.feature.Feature;
import org.opengis.filter.capability.AvailableFunction;
import org.opengis.filter.capability.FilterCapabilities;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.AbstractMap;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.AbstractMap;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/IdentifierFilter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/IdentifierFilter.java
index 54bf782cf1..f2a7b4ef71 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/IdentifierFilter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/IdentifierFilter.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Collection;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.filter.internal.Node;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LeafExpression.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LeafExpression.java
index a869d79ae4..77d3b85e97 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LeafExpression.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LeafExpression.java
@@ -26,8 +26,8 @@ import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.iso.Names;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.WeakValueHashMap;
-import org.apache.sis.feature.privy.FeatureExpression;
-import org.apache.sis.feature.privy.FeatureProjectionBuilder;
+import org.apache.sis.feature.internal.shared.FeatureExpression;
+import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder;
import org.apache.sis.filter.internal.Node;
import org.apache.sis.math.FunctionProperty;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java
index 42ef29a5cb..d641643596 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java
@@ -22,8 +22,8 @@ import java.util.LinkedHashSet;
import java.util.Objects;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.filter.internal.Node;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Filter;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
index 29b26bd24f..71c84d6fe1 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
@@ -27,7 +27,7 @@ import org.opengis.util.CodeList;
import org.apache.sis.math.FunctionProperty;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.filter.internal.Node;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Filter;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/PropertyValue.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/PropertyValue.java
index 29e203d7b9..7b7d9c4d27 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/PropertyValue.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/PropertyValue.java
@@ -23,8 +23,8 @@ import org.apache.sis.feature.Features;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.UnconvertibleObjectException;
-import org.apache.sis.feature.privy.FeatureProjectionBuilder;
-import org.apache.sis.filter.privy.XPath;
+import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder;
+import org.apache.sis.filter.internal.shared.XPath;
import org.apache.sis.util.resources.Errors;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
index a8c05ad15b..64a5121d8e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
@@ -20,7 +20,7 @@ import java.time.DateTimeException;
import org.apache.sis.util.Classes;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.temporal.TimeMethods;
-import org.apache.sis.feature.privy.FeatureExpression;
+import org.apache.sis.feature.internal.shared.FeatureExpression;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.temporal.Period;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalOperation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalOperation.java
index 5eef5933ec..55ba782f6b 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalOperation.java
@@ -20,7 +20,7 @@ import java.util.Optional;
import java.io.Serializable;
import java.time.DateTimeException;
import java.time.temporal.Temporal;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.collection.WeakHashSet;
import org.apache.sis.temporal.TimeMethods;
import static org.apache.sis.temporal.TimeMethods.BEFORE;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryFromFeature.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryFromFeature.java
index 07244202f4..de82d0562e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryFromFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryFromFeature.java
@@ -19,8 +19,8 @@ package org.apache.sis.filter.internal;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.feature.privy.AttributeConvention;
-import org.apache.sis.filter.privy.XPath;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
+import org.apache.sis.filter.internal.shared.XPath;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java
index 42d48014a7..e3842427c0 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java
@@ -32,12 +32,12 @@ import org.opengis.referencing.IdentifiedObject;
import org.apache.sis.math.FunctionProperty;
import org.apache.sis.feature.DefaultAttributeType;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.feature.privy.FeatureExpression;
-import org.apache.sis.filter.privy.WarningEvent;
+import org.apache.sis.feature.internal.shared.FeatureExpression;
+import org.apache.sis.filter.internal.shared.WarningEvent;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.util.Classes;
import org.apache.sis.util.iso.Names;
import org.apache.sis.util.collection.BackingStoreException;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/CopyVisitor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/CopyVisitor.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/CopyVisitor.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/CopyVisitor.java
index e274fcdffb..7fc67478a1 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/CopyVisitor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/CopyVisitor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.util.List;
import java.util.ArrayList;
@@ -25,7 +25,7 @@ import javax.measure.quantity.Length;
import org.opengis.util.CodeList;
import org.opengis.geometry.Envelope;
import org.opengis.filter.*;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.feature.internal.Resources;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/EditVisitor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/EditVisitor.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/EditVisitor.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/EditVisitor.java
index 517cf55d86..8d000bbcfb 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/EditVisitor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/EditVisitor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import org.opengis.filter.Literal;
import org.opengis.filter.FilterFactory;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/FunctionNames.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/FunctionNames.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/FunctionNames.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/FunctionNames.java
index cd225b2019..e248d4b306 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/FunctionNames.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/FunctionNames.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import org.apache.sis.filter.sqlmm.SQLMM;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/ListingPropertyVisitor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/ListingPropertyVisitor.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/ListingPropertyVisitor.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/ListingPropertyVisitor.java
index 4b9e664a31..32785ce3ad 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/ListingPropertyVisitor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/ListingPropertyVisitor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.util.HashSet;
import java.util.Set;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/SortByComparator.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/SortByComparator.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/SortByComparator.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/SortByComparator.java
index 624e60d7c2..f54ca83695 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/SortByComparator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/SortByComparator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.util.Arrays;
import java.util.List;
@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
import java.util.Comparator;
import java.io.Serializable;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.SortBy;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/Visitor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/Visitor.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/Visitor.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/Visitor.java
index b314efe3de..5302141e4f 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/Visitor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/Visitor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.util.Map;
import java.util.HashMap;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/WarningEvent.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/WarningEvent.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/WarningEvent.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/WarningEvent.java
index edba134a81..72b098dc57 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/WarningEvent.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/WarningEvent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.util.Optional;
import java.util.function.Consumer;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/XPath.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/XPath.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/XPath.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/XPath.java
index 679b7631c8..e1002c4a2b 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/XPath.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/XPath.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.util.List;
import java.util.Arrays;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/package-info.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/package-info.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/package-info.java
index 17692cd892..bbc43f568a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/package-info.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/package-info.java
@@ -28,4 +28,4 @@
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java
index fc3b821449..d031ff73d7 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java
@@ -24,8 +24,8 @@ import org.opengis.util.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
-import org.apache.sis.feature.privy.FeatureProjectionBuilder;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.resources.Errors;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
index 9aec4e3105..d61c51024f 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
@@ -22,7 +22,7 @@ import static java.lang.Double.isNaN;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.util.resources.Errors;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SpatialFunction.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SpatialFunction.java
index 8d24f49ba2..64200551e3 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SpatialFunction.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SpatialFunction.java
@@ -23,8 +23,8 @@ import org.opengis.util.ScopedName;
import org.apache.sis.filter.Optimization;
import org.apache.sis.filter.internal.Node;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.feature.privy.FeatureExpression;
-import org.apache.sis.feature.privy.FeatureProjectionBuilder;
+import org.apache.sis.feature.internal.shared.FeatureExpression;
+import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/TwoGeometries.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/TwoGeometries.java
index dcdf386453..81b49eaf28 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/TwoGeometries.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/TwoGeometries.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.filter.Optimization;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
index 03e50c87b4..120a5a34ea 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
@@ -31,10 +31,10 @@ import org.apache.sis.geometry.AbstractEnvelope;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.WraparoundMethod;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.cs.AxesConvention;
-import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.system.Loggers;
import org.apache.sis.math.Vector;
import org.apache.sis.setup.GeometryLibrary;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryType.java
index 13d9cafccc..b835cf004a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryType.java
@@ -23,7 +23,7 @@ import org.opengis.util.NameSpace;
import org.apache.sis.util.iso.Names;
import org.apache.sis.util.iso.DefaultNameFactory;
import org.apache.sis.setup.GeometryLibrary;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
index 18044b7fe4..9a871893de 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
@@ -34,7 +34,7 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.filter.sqlmm.SQLMM;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Classes;
import org.apache.sis.util.Debug;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
index 0f0f9784b7..df9078b625 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
@@ -35,14 +35,14 @@ import org.opengis.referencing.operation.OperationMethod;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.ImmutableIdentifier;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.ReferencingFactoryContainer;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.referencing.operation.DefaultConversion;
import org.apache.sis.referencing.crs.DefaultProjectedCRS;
import org.apache.sis.measure.Units;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.metadata.iso.citation.Citations;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/esri/Factory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/esri/Factory.java
index d7f179ce2d..a2a85e149d 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/esri/Factory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/esri/Factory.java
@@ -40,7 +40,7 @@ import org.apache.sis.geometry.wrapper.Dimensions;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryType;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/EmptyShape.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/EmptyShape.java
index dc540a9b57..390bd6e5e6 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/EmptyShape.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/EmptyShape.java
@@ -24,7 +24,7 @@ import java.awt.geom.Point2D;
import java.io.Serializable;
import java.io.ObjectStreamException;
import java.util.NoSuchElementException;
-import org.apache.sis.referencing.privy.AbstractShape;
+import org.apache.sis.referencing.internal.shared.AbstractShape;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Factory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Factory.java
index 54111c7fbd..a175bf02bd 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Factory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Factory.java
@@ -32,10 +32,10 @@ import org.apache.sis.geometry.wrapper.Dimensions;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryType;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.referencing.privy.AbstractShape;
-import org.apache.sis.referencing.privy.ShapeUtilities;
+import org.apache.sis.referencing.internal.shared.AbstractShape;
+import org.apache.sis.referencing.internal.shared.ShapeUtilities;
import org.apache.sis.util.UnsupportedImplementationException;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/FlatShape.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/FlatShape.java
index 325ddff97c..e1d9e458c6 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/FlatShape.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/FlatShape.java
@@ -23,7 +23,7 @@ import java.awt.geom.Rectangle2D;
import java.awt.geom.PathIterator;
import java.awt.geom.AffineTransform;
import org.apache.sis.geometry.wrapper.AbstractGeometry;
-import org.apache.sis.referencing.privy.IntervalRectangle;
+import org.apache.sis.referencing.internal.shared.IntervalRectangle;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/MultiPolylines.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/MultiPolylines.java
index 269c0a83ee..3669db0925 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/MultiPolylines.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/MultiPolylines.java
@@ -22,7 +22,7 @@ import java.awt.Shape;
import java.awt.geom.Rectangle2D;
import java.awt.geom.PathIterator;
import java.awt.geom.AffineTransform;
-import org.apache.sis.referencing.privy.IntervalRectangle;
+import org.apache.sis.referencing.internal.shared.IntervalRectangle;
import org.apache.sis.util.Classes;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/ShapeProperties.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/ShapeProperties.java
index 014b71a660..f28e8e7b93 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/ShapeProperties.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/ShapeProperties.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Array;
import java.awt.Shape;
import java.awt.geom.PathIterator;
import java.awt.geom.IllegalPathStateException;
-import org.apache.sis.referencing.privy.AbstractShape;
+import org.apache.sis.referencing.internal.shared.AbstractShape;
import org.apache.sis.util.StringBuilders;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/ShapeWrapper.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/ShapeWrapper.java
index 7b9c5239ee..ec5c5b03ae 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/ShapeWrapper.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/ShapeWrapper.java
@@ -23,7 +23,7 @@ import java.awt.geom.Rectangle2D;
import java.awt.geom.PathIterator;
import java.awt.geom.AffineTransform;
import java.io.Serializable;
-import org.apache.sis.referencing.privy.AbstractShape;
+import org.apache.sis.referencing.internal.shared.AbstractShape;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Wrapper.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Wrapper.java
index f71187ce1d..167b8263d3 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Wrapper.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Wrapper.java
@@ -33,8 +33,8 @@ import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.filter.sqlmm.SQLMM;
-import org.apache.sis.referencing.privy.ShapeUtilities;
-import org.apache.sis.referencing.privy.AbstractShape;
+import org.apache.sis.referencing.internal.shared.ShapeUtilities;
+import org.apache.sis.referencing.internal.shared.AbstractShape;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Debug;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Factory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Factory.java
index 2ef54b6da2..d32af01528 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Factory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Factory.java
@@ -47,7 +47,7 @@ import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryType;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.util.Classes;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.BackingStoreException;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java
index d331cb79d9..75521db2bd 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java
@@ -43,7 +43,7 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import static org.apache.sis.geometry.wrapper.Geometries.LOGGER;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ShapeAdapter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ShapeAdapter.java
index ac452619a3..d51e20b39d 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ShapeAdapter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ShapeAdapter.java
@@ -33,8 +33,8 @@ import org.locationtech.jts.geom.LineString;
import org.locationtech.jts.geom.LinearRing;
import org.locationtech.jts.geom.Point;
import org.apache.sis.geometry.wrapper.j2d.EmptyShape;
-import org.apache.sis.referencing.privy.AbstractShape;
-import org.apache.sis.referencing.privy.IntervalRectangle;
+import org.apache.sis.referencing.internal.shared.AbstractShape;
+import org.apache.sis.referencing.internal.shared.IntervalRectangle;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ShapeConverter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ShapeConverter.java
index f7e8e4f028..6491291de9 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ShapeConverter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ShapeConverter.java
@@ -25,7 +25,7 @@ import java.awt.geom.IllegalPathStateException;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.util.GeometryFixer;
-import org.apache.sis.referencing.privy.AbstractShape;
+import org.apache.sis.referencing.internal.shared.AbstractShape;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
index 520150bf1f..d568096b0c 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
@@ -47,7 +47,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.geometry.GeneralEnvelope;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java
index 125f36ffe5..5ef1de0bad 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java
@@ -31,9 +31,9 @@ import java.awt.image.ImagingOpException;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.Cache;
-import org.apache.sis.image.privy.TileOpExecutor;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.image.internal.shared.TileOpExecutor;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.util.internal.shared.Strings;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandAggregateImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandAggregateImage.java
index b8fe4275d7..f0fae51ee6 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandAggregateImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandAggregateImage.java
@@ -30,8 +30,8 @@ import java.awt.image.WritableRenderedImage;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.math.Statistics;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.coverage.privy.BandAggregateArgument;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.coverage.internal.shared.BandAggregateArgument;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandAggregateLayout.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandAggregateLayout.java
index fdadc5e8cf..c7e6cc30b7 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandAggregateLayout.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandAggregateLayout.java
@@ -28,15 +28,15 @@ import java.awt.image.BandedSampleModel;
import java.awt.image.ComponentSampleModel;
import java.awt.image.WritableRenderedImage;
import org.apache.sis.util.collection.FrequencySortedSet;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.DisjointExtentException;
-import org.apache.sis.coverage.privy.BandAggregateArgument;
-import org.apache.sis.coverage.privy.CommonDomainFinder;
-import org.apache.sis.coverage.privy.SampleDimensions;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.ColorModelFactory;
+import org.apache.sis.coverage.internal.shared.BandAggregateArgument;
+import org.apache.sis.coverage.internal.shared.CommonDomainFinder;
+import org.apache.sis.coverage.internal.shared.SampleDimensions;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.ColorModelFactory;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandSelectImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandSelectImage.java
index a3357beb0e..2280fdfc8a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandSelectImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandSelectImage.java
@@ -30,10 +30,10 @@ import java.awt.image.ColorModel;
import java.awt.image.TileObserver;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.TileOpExecutor;
-import org.apache.sis.image.privy.ColorModelFactory;
-import org.apache.sis.image.privy.ObservableImage;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.TileOpExecutor;
+import org.apache.sis.image.internal.shared.ColorModelFactory;
+import org.apache.sis.image.internal.shared.ObservableImage;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandSharing.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandSharing.java
index 5195572f11..5b12ee951a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandSharing.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandSharing.java
@@ -29,7 +29,7 @@ import java.awt.image.DataBufferFloat;
import java.awt.image.DataBufferDouble;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java
index 348e3f4a27..a5a0c78fc7 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java
@@ -32,16 +32,16 @@ import org.opengis.referencing.operation.MathTransform1D;
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.NoninvertibleTransformException;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.coverage.privy.SampleDimensions;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.TileOpExecutor;
-import org.apache.sis.image.privy.ColorScaleBuilder;
+import org.apache.sis.coverage.internal.shared.SampleDimensions;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.TileOpExecutor;
+import org.apache.sis.image.internal.shared.ColorScaleBuilder;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.Disposable;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.math.DecimalFunctions;
import org.apache.sis.measure.NumberRange;
-import static org.apache.sis.image.privy.ImageUtilities.LOGGER;
+import static org.apache.sis.image.internal.shared.ImageUtilities.LOGGER;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Colorizer.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Colorizer.java
index e3fa3553c6..fb5cd43032 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Colorizer.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Colorizer.java
@@ -31,13 +31,13 @@ import java.awt.image.IndexColorModel;
import java.awt.image.RenderedImage;
import org.apache.sis.coverage.Category;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.image.privy.ColorModelBuilder;
-import org.apache.sis.image.privy.ColorScaleBuilder;
-import org.apache.sis.image.privy.ColorModelFactory;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ColorModelBuilder;
+import org.apache.sis.image.internal.shared.ColorScaleBuilder;
+import org.apache.sis.image.internal.shared.ColorModelFactory;
+import org.apache.sis.image.internal.shared.ImageUtilities;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java
index f8a3bd4f50..a1dd4db181 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java
@@ -36,12 +36,12 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Disposable;
import org.apache.sis.util.Exceptions;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.collection.Cache;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.coverage.grid.GridExtent; // For javadoc
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/DataType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/DataType.java
index 4ea76572c5..7e73ee93d6 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/DataType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/DataType.java
@@ -27,9 +27,9 @@ import org.apache.sis.util.Numbers;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.measure.NumberRange;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
import org.apache.sis.feature.internal.Resources;
-import static org.apache.sis.util.privy.Numerics.MAX_INTEGER_CONVERTIBLE_TO_FLOAT;
+import static org.apache.sis.util.internal.shared.Numerics.MAX_INTEGER_CONVERTIBLE_TO_FLOAT;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageCombiner.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageCombiner.java
index c7278a641e..7151e5abc9 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageCombiner.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageCombiner.java
@@ -24,8 +24,8 @@ import java.util.Objects;
import java.util.function.Consumer;
import javax.measure.Quantity;
import org.opengis.referencing.operation.MathTransform;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.TileOpExecutor;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.TileOpExecutor;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageLayout.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageLayout.java
index 7e26598f63..ba515b31b2 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageLayout.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageLayout.java
@@ -31,9 +31,9 @@ import org.apache.sis.math.MathFunctions;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.system.Configuration;
-import org.apache.sis.image.privy.RasterFactory;
+import org.apache.sis.image.internal.shared.RasterFactory;
import org.apache.sis.feature.internal.Resources;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageOverlay.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageOverlay.java
index a52e06d866..3c7253e944 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageOverlay.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageOverlay.java
@@ -40,8 +40,8 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.math.Statistics;
import org.apache.sis.measure.Quantities;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.TilePlaceholder;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.TilePlaceholder;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java
index 92d59fa7a4..fdf2a93ce4 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java
@@ -46,8 +46,8 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridCoverageProcessor;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.TiledImage;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.TiledImage;
import org.apache.sis.math.Statistics;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskImage.java
index ba6ea1262b..a0a87168f9 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskImage.java
@@ -22,10 +22,10 @@ import java.awt.image.WritableRaster;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.NoninvertibleTransformException;
-import org.apache.sis.image.privy.ColorModelFactory;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ColorModelFactory;
+import org.apache.sis.image.internal.shared.ImageUtilities;
import org.apache.sis.util.logging.Logging;
-import static org.apache.sis.image.privy.ImageUtilities.LOGGER;
+import static org.apache.sis.image.internal.shared.ImageUtilities.LOGGER;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskedImage.java
index b82718dcc2..2c1412ed79 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskedImage.java
@@ -32,11 +32,11 @@ import java.awt.image.RenderedImage;
import java.awt.image.IndexColorModel;
import java.awt.image.MultiPixelPackedSampleModel;
import java.lang.ref.SoftReference;
-import org.apache.sis.util.privy.Numerics;
-import org.apache.sis.image.privy.FillValues;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.TilePlaceholder;
-import static org.apache.sis.util.privy.Numerics.LONG_SHIFT;
+import org.apache.sis.util.internal.shared.Numerics;
+import org.apache.sis.image.internal.shared.FillValues;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.TilePlaceholder;
+import static org.apache.sis.util.internal.shared.Numerics.LONG_SHIFT;
import static org.apache.sis.pending.jdk.JDK18.ceilDiv;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourceImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourceImage.java
index 2255b820c0..ddd71505a6 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourceImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourceImage.java
@@ -23,7 +23,7 @@ import java.awt.image.ColorModel;
import java.awt.image.SampleModel;
import java.awt.image.RenderedImage;
import java.awt.image.WritableRenderedImage;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
import org.apache.sis.util.Disposable;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourcePrefetch.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourcePrefetch.java
index cd09e984ae..7f1452b754 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourcePrefetch.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourcePrefetch.java
@@ -23,7 +23,7 @@ import java.awt.image.RenderedImage;
import java.awt.image.ImagingOpException;
import org.apache.sis.util.Disposable;
import org.apache.sis.system.CommonExecutor;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
index 76c8b23ef1..46303499b5 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
@@ -44,9 +44,9 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Messages;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.measure.NumberRange;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
import static org.apache.sis.pending.jdk.JDK18.ceilDiv;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java
index 9715ac8945..a914a29bed 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java
@@ -36,9 +36,9 @@ import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Messages;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.GridGeometry; // For javadoc
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.TileOpExecutor;
-import org.apache.sis.image.privy.ColorModelFactory;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.TileOpExecutor;
+import org.apache.sis.image.internal.shared.ColorModelFactory;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.pending.jdk.JDK18;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PositionalConsistencyImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PositionalConsistencyImage.java
index dae65538bc..a43a6ed02c 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PositionalConsistencyImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PositionalConsistencyImage.java
@@ -22,7 +22,7 @@ import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.image.privy.ColorModelFactory;
+import org.apache.sis.image.internal.shared.ColorModelFactory;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PrefetchedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PrefetchedImage.java
index 2c0e919f28..ee5ac4274e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PrefetchedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PrefetchedImage.java
@@ -25,10 +25,10 @@ import java.awt.image.SampleModel;
import java.awt.image.RenderedImage;
import java.awt.image.Raster;
import java.awt.image.RasterFormatException;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.TileErrorHandler;
-import org.apache.sis.image.privy.TileOpExecutor;
-import org.apache.sis.image.privy.TilePlaceholder;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.TileErrorHandler;
+import org.apache.sis.image.internal.shared.TileOpExecutor;
+import org.apache.sis.image.internal.shared.TilePlaceholder;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Disposable;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/RecoloredImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/RecoloredImage.java
index 7d5b8742b2..2df08ab920 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/RecoloredImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/RecoloredImage.java
@@ -27,10 +27,10 @@ import java.awt.image.SampleModel;
import java.awt.image.RenderedImage;
import org.apache.sis.coverage.Category;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.image.privy.ColorModelFactory;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ColorModelFactory;
+import org.apache.sis.image.internal.shared.ImageUtilities;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.collection.Containers;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.math.Statistics;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResampledImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResampledImage.java
index 8d0b9d4624..9bba2001aa 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResampledImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResampledImage.java
@@ -40,19 +40,19 @@ import org.opengis.referencing.operation.MathTransform2D;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.transform.TransformSeparator;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.FillValues;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.FillValues;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Disposable;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.geometry.Shapes2D;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
-import static org.apache.sis.image.privy.ImageUtilities.LOGGER;
+import static org.apache.sis.image.internal.shared.ImageUtilities.LOGGER;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java
index 260fb83e7a..6cb80a3c2e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java
@@ -28,7 +28,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.operation.matrix.Matrix2;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.transform.AbstractMathTransform2D;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
import org.apache.sis.system.Configuration;
import org.apache.sis.util.collection.Cache;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/SourceAlignedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/SourceAlignedImage.java
index 4c8388951d..eddc14e495 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/SourceAlignedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/SourceAlignedImage.java
@@ -26,7 +26,7 @@ import java.awt.image.RenderedImage;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Disposable;
import org.apache.sis.util.Workaround;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/StatisticsCalculator.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/StatisticsCalculator.java
index 398cc4fda3..3d480b20c6 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/StatisticsCalculator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/StatisticsCalculator.java
@@ -27,7 +27,7 @@ import java.util.stream.Collector;
import org.apache.sis.math.Statistics;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/TileCache.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/TileCache.java
index 7e26aba855..4e43abab39 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/TileCache.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/TileCache.java
@@ -21,7 +21,7 @@ import java.awt.image.DataBuffer;
import java.awt.image.Raster;
import java.lang.ref.Reference;
import org.apache.sis.util.collection.Cache;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.pending.jdk.JDK16;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Transferer.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Transferer.java
index eef1ccefb8..79c7aedeb4 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Transferer.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Transferer.java
@@ -28,10 +28,10 @@ import java.awt.image.RenderedImage;
import java.awt.image.RasterFormatException;
import org.opengis.referencing.operation.MathTransform1D;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
import org.apache.sis.system.Configuration;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Visualization.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Visualization.java
index 54dda3f3ff..c5449d50cd 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Visualization.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Visualization.java
@@ -42,14 +42,14 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.Category;
import org.apache.sis.coverage.internal.CompoundTransform;
-import org.apache.sis.coverage.privy.SampleDimensions;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.ColorScaleBuilder;
+import org.apache.sis.coverage.internal.shared.SampleDimensions;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.ColorScaleBuilder;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.math.Statistics;
import org.apache.sis.util.collection.BackingStoreException;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/WritableComputedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/WritableComputedImage.java
index 6357e04a7c..b27a9e6237 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/WritableComputedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/WritableComputedImage.java
@@ -22,7 +22,7 @@ import java.awt.image.Raster;
import java.awt.image.RenderedImage;
import java.awt.image.WritableRaster;
import java.awt.image.WritableRenderedImage;
-import org.apache.sis.image.privy.ObservableImage;
+import org.apache.sis.image.internal.shared.ObservableImage;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/AssertionMessages.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/AssertionMessages.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/AssertionMessages.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/AssertionMessages.java
index 707157b467..368d4cfbc7 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/AssertionMessages.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/AssertionMessages.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.awt.Rectangle;
import org.apache.sis.io.TableAppender;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/BatchComputedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/BatchComputedImage.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/BatchComputedImage.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/BatchComputedImage.java
index 5af91d8c81..61711b5ef0 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/BatchComputedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/BatchComputedImage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Map;
import java.awt.Rectangle;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorModelBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorModelBuilder.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorModelBuilder.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorModelBuilder.java
index 830b8a9bee..4c5f27de26 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorModelBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorModelBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.awt.Transparency;
import java.awt.color.ColorSpace;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorModelFactory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorModelFactory.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorModelFactory.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorModelFactory.java
index f75dd78c6f..5bc95fb109 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorModelFactory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorModelFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Map;
import java.util.Arrays;
@@ -37,8 +37,8 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Debug;
-import org.apache.sis.util.privy.Numerics;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Numerics;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.collection.WeakHashSet;
import org.apache.sis.util.collection.WeakValueHashMap;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorModelType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorModelType.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorModelType.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorModelType.java
index 09c7baf825..15430ecb36 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorModelType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorModelType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.awt.color.ColorSpace;
import java.awt.image.ColorModel;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorScaleBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorScaleBuilder.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorScaleBuilder.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorScaleBuilder.java
index 3d6872bc5a..9a921f1c33 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorScaleBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorScaleBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Map;
import java.util.List;
@@ -39,7 +39,7 @@ import org.apache.sis.image.DataType;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Vocabulary;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorsForRange.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorsForRange.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorsForRange.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorsForRange.java
index fa61b0403b..a0af7595ac 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ColorsForRange.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ColorsForRange.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Map;
import java.util.Collection;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/DeferredProperty.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/DeferredProperty.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/DeferredProperty.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/DeferredProperty.java
index b3fe050041..c14c9f4ed6 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/DeferredProperty.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/DeferredProperty.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Map;
import java.util.function.Function;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/FillValues.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/FillValues.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/FillValues.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/FillValues.java
index f9735f6ffd..1c24f092e1 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/FillValues.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/FillValues.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Arrays;
import java.util.Objects;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ImageUtilities.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ImageUtilities.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ImageUtilities.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ImageUtilities.java
index 5067933ea4..77deb1af80 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ImageUtilities.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ImageUtilities.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Arrays;
import java.util.logging.Logger;
@@ -40,9 +40,9 @@ import org.apache.sis.image.DataType;
import org.apache.sis.image.PlanarImage;
import org.apache.sis.system.Modules;
import org.apache.sis.util.Numbers;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.resources.Vocabulary;
-import static org.apache.sis.util.privy.Numerics.COMPARISON_THRESHOLD;
+import static org.apache.sis.util.internal.shared.Numerics.COMPARISON_THRESHOLD;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/MultiBandsIndexColorModel.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/MultiBandsIndexColorModel.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/MultiBandsIndexColorModel.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/MultiBandsIndexColorModel.java
index 7971c8db9b..47973e6b1a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/MultiBandsIndexColorModel.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/MultiBandsIndexColorModel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Arrays;
import java.awt.image.Raster;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ObservableImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ObservableImage.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ObservableImage.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ObservableImage.java
index b9da93b4f8..13192e2b3f 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ObservableImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ObservableImage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Arrays;
import java.util.Hashtable;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/RasterFactory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/RasterFactory.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/RasterFactory.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/RasterFactory.java
index 1f31da0596..59592dd328 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/RasterFactory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/RasterFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.awt.Point;
import java.awt.image.ColorModel;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ReshapedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ReshapedImage.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ReshapedImage.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ReshapedImage.java
index f131176aae..cebb3dba77 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ReshapedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ReshapedImage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Vector;
import java.util.Objects;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/SampleModelBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/SampleModelBuilder.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/SampleModelBuilder.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/SampleModelBuilder.java
index 46f395cdd9..d5b753a486 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/SampleModelBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/SampleModelBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Arrays;
import java.awt.Dimension;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ScaledColorModel.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ScaledColorModel.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ScaledColorModel.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ScaledColorModel.java
index 34b22a4d66..a2a96223e2 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ScaledColorModel.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ScaledColorModel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.awt.Transparency;
import java.awt.image.DataBuffer;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ScaledColorSpace.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ScaledColorSpace.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ScaledColorSpace.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ScaledColorSpace.java
index d73bc6a748..6ec5cdbb07 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ScaledColorSpace.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/ScaledColorSpace.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.awt.color.ColorSpace;
import org.apache.sis.util.Debug;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TileErrorHandler.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TileErrorHandler.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TileErrorHandler.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TileErrorHandler.java
index bdb4052f99..0075406ded 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TileErrorHandler.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TileErrorHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.logging.LogRecord;
import java.awt.image.RenderedImage;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TileOpExecutor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TileOpExecutor.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TileOpExecutor.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TileOpExecutor.java
index cbea76f1d6..86dde6b52f 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TileOpExecutor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TileOpExecutor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.logging.Level;
import java.util.logging.LogRecord;
@@ -45,7 +45,7 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.image.ErrorHandler;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.system.CommonExecutor;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TilePlaceholder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TilePlaceholder.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TilePlaceholder.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TilePlaceholder.java
index 1a6498e70b..6276125991 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TilePlaceholder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TilePlaceholder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Arrays;
import java.util.Objects;
@@ -32,7 +32,7 @@ import org.apache.sis.pending.jdk.JDK16;
import org.apache.sis.util.Disposable;
import org.apache.sis.util.Workaround;
import org.apache.sis.util.collection.WeakHashSet;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.system.ReferenceQueueConsumer;
import org.apache.sis.image.DataType;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TiledImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TiledImage.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TiledImage.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TiledImage.java
index 99acb59bec..b7807c8a59 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TiledImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/TiledImage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Map;
import java.awt.Image;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/WritableTiledImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/WritableTiledImage.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/WritableTiledImage.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/WritableTiledImage.java
index 7d4e77f1e5..3353d882bd 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/WritableTiledImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/WritableTiledImage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Map;
import java.util.LinkedHashMap;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/package-info.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/package-info.java
rename to endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/package-info.java
index 76def35429..f4a263f14c 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/package-info.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/internal/shared/package-info.java
@@ -27,4 +27,4 @@
*
* @author Martin Desruisseaux (Geomatys)
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/CompoundFuture.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/CompoundFuture.java
index cd98a0cd6a..e1372ee1d5 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/CompoundFuture.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/CompoundFuture.java
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.CancellationException;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.feature.internal.Resources;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Fragments.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Fragments.java
index 581150d129..9ba10225d6 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Fragments.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Fragments.java
@@ -21,7 +21,7 @@ import java.util.Map;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collections;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/NodeIterator.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/NodeIterator.java
index 036678bd4f..d2cf72d1f5 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/NodeIterator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/NodeIterator.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.Spliterator;
import java.util.function.Consumer;
import org.opengis.geometry.Envelope;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/PointTree.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/PointTree.java
index 1d1beee4bd..eab845c693 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/PointTree.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/PointTree.java
@@ -28,7 +28,7 @@ import java.util.stream.StreamSupport;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.CheckedContainer;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ClippedGridCoverageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ClippedGridCoverageTest.java
index 8ab2fa5ab6..942559ac80 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ClippedGridCoverageTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ClippedGridCoverageTest.java
@@ -22,7 +22,7 @@ import java.awt.image.RenderedImage;
import java.awt.image.BufferedImage;
import java.awt.image.DataBuffer;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.image.privy.RasterFactory;
+import org.apache.sis.image.internal.shared.RasterFactory;
import org.apache.sis.geometry.DirectPosition2D;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
index d743e98f4d..54bced3968 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
@@ -21,7 +21,7 @@ import java.awt.image.DataBuffer;
import java.awt.image.RenderedImage;
import org.opengis.referencing.operation.MathTransform1D;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.image.PlanarImage;
import org.apache.sis.math.MathFunctions;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
index 753d44867d..849c583593 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
@@ -20,7 +20,7 @@ import org.opengis.referencing.crs.SingleCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.Matrix;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.DirectPositionView;
+import org.apache.sis.referencing.internal.shared.DirectPositionView;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.referencing.operation.matrix.Matrices;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index e975d5361a..d1eedba57e 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
@@ -29,7 +29,7 @@ import org.opengis.referencing.operation.MathTransform1D;
import org.opengis.referencing.operation.MathTransform;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.geometry.DirectPosition2D;
-import org.apache.sis.image.privy.RasterFactory;
+import org.apache.sis.image.internal.shared.RasterFactory;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.measure.Units;
import org.apache.sis.referencing.operation.matrix.Matrix3;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java
index 6a7a850358..ed5bdd7f8a 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java
@@ -26,7 +26,7 @@ import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.Matrix;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
import org.apache.sis.referencing.operation.transform.MathTransforms;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
index 0ed8c3b205..e9df20b428 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
@@ -30,8 +30,8 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.referencing.privy.Formulas;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.internal.shared.Formulas;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.crs.DefaultCompoundCRS;
import org.apache.sis.referencing.operation.matrix.Matrices;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java
index b423c0b2c2..4741392add 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java
@@ -31,7 +31,7 @@ import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.privy.ExtendedPrecisionMatrix;
+import org.apache.sis.referencing.internal.shared.ExtendedPrecisionMatrix;
import org.apache.sis.util.ComparisonMode;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
index f0530b7ddb..0597505d05 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
@@ -36,11 +36,11 @@ import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.geometry.ImmutableEnvelope;
import org.apache.sis.image.Interpolation;
-import org.apache.sis.image.privy.TiledImage;
-import org.apache.sis.image.privy.ReshapedImage;
+import org.apache.sis.image.internal.shared.TiledImage;
+import org.apache.sis.image.internal.shared.ReshapedImage;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.referencing.privy.Formulas;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.internal.shared.Formulas;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
index 37aae6af4f..6801cdc7dd 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
@@ -20,7 +20,7 @@ import java.awt.image.BufferedImage;
import java.awt.image.DataBuffer;
import java.awt.image.WritableRaster;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.image.privy.RasterFactory;
+import org.apache.sis.image.internal.shared.RasterFactory;
import org.apache.sis.geometry.DirectPosition2D;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/privy/RangeArgumentTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/internal/shared/RangeArgumentTest.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/privy/RangeArgumentTest.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/internal/shared/RangeArgumentTest.java
index 34e6fcaeff..ed14b01f1d 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/privy/RangeArgumentTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/internal/shared/RangeArgumentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.coverage.privy;
+package org.apache.sis.coverage.internal.shared;
import java.util.Locale;
import org.apache.sis.coverage.grid.GridExtent;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java
index 8e17de1d2b..7693a25c02 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java
@@ -21,7 +21,7 @@ import com.esri.core.geometry.Polyline;
import com.esri.core.geometry.Geometry;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.feature.builder.AttributeRole;
import org.apache.sis.feature.builder.AttributeTypeBuilder;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureMemoryBenchmark.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureMemoryBenchmark.java
index f8256c1a5b..25d978f998 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureMemoryBenchmark.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureMemoryBenchmark.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
// Test dependencies
import org.apache.sis.test.Benchmark;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureOperationsTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureOperationsTest.java
index c4029cae90..1cd24abc28 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureOperationsTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureOperationsTest.java
@@ -23,7 +23,7 @@ import com.esri.core.geometry.Polygon;
import org.opengis.geometry.Envelope;
import org.opengis.util.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.geometry.GeneralEnvelope;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/StringJoinOperationTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/StringJoinOperationTest.java
index 8225648366..ea34770911 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/StringJoinOperationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/StringJoinOperationTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.feature;
import java.util.Map;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
index f7c3a91a48..775279ab55 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
@@ -22,7 +22,7 @@ import com.esri.core.geometry.Geometry;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.feature.Features;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
index 42cd33194a..d2f796c082 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
@@ -22,7 +22,7 @@ import com.esri.core.geometry.Point;
import org.opengis.geometry.Envelope;
import org.apache.sis.feature.AbstractOperation;
import org.apache.sis.feature.FeatureOperations;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/privy/AttributeConventionTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/shared/AttributeConventionTest.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/privy/AttributeConventionTest.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/shared/AttributeConventionTest.java
index 0e40889a81..06cddd2667 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/privy/AttributeConventionTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/shared/AttributeConventionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.feature.privy;
+package org.apache.sis.feature.internal.shared;
import java.util.Map;
import com.esri.core.geometry.Point;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java
index 8466701bb9..54db49acbc 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java
@@ -28,7 +28,7 @@ import java.util.Iterator;
import java.util.Objects;
import java.util.stream.Collectors;
import org.opengis.util.GenericName;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ComparisonFilterTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ComparisonFilterTest.java
index e82bc642c7..4385cb4629 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ComparisonFilterTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ComparisonFilterTest.java
@@ -30,7 +30,7 @@ import org.opengis.filter.ComparisonOperator;
import org.opengis.filter.ComparisonOperatorName;
import org.opengis.filter.BinaryComparisonOperator;
import org.opengis.filter.BetweenComparisonOperator;
-import org.apache.sis.filter.privy.FunctionNames;
+import org.apache.sis.filter.internal.shared.FunctionNames;
/**
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java
index b349e62672..3a9ec8cf7c 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.filter;
import java.time.Instant;
import org.apache.sis.geometry.WraparoundMethod;
-import static org.apache.sis.util.privy.Constants.MILLISECONDS_PER_DAY;
+import static org.apache.sis.util.internal.shared.Constants.MILLISECONDS_PER_DAY;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/XPathTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/XPathTest.java
index 75edf729dd..6e3e6d131c 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/XPathTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/XPathTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.filter;
-import org.apache.sis.filter.privy.XPath;
+import org.apache.sis.filter.internal.shared.XPath;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/CopyVisitorTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/CopyVisitorTest.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/CopyVisitorTest.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/CopyVisitorTest.java
index 61afa6c5b3..c34c190888 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/CopyVisitorTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/CopyVisitorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.util.Map;
import org.opengis.feature.Feature;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/FilterFactoryMock.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/FilterFactoryMock.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/FilterFactoryMock.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/FilterFactoryMock.java
index 39455f6993..d5aae216ca 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/FilterFactoryMock.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/FilterFactoryMock.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.time.Instant;
import java.util.Map;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/FunctionMock.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/FunctionMock.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/FunctionMock.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/FunctionMock.java
index 1ad445e20b..888bd37236 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/FunctionMock.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/FunctionMock.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.util.Map;
import java.util.List;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/FunctionNamesTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/FunctionNamesTest.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/FunctionNamesTest.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/FunctionNamesTest.java
index f3e8064066..b98ad474bc 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/FunctionNamesTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/FunctionNamesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.lang.reflect.Field;
import org.apache.sis.filter.sqlmm.SQLMM;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/ValueReferenceMock.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/ValueReferenceMock.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/ValueReferenceMock.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/ValueReferenceMock.java
index c9c3ce70a7..6a919223b7 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/privy/ValueReferenceMock.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/shared/ValueReferenceMock.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.filter.privy;
+package org.apache.sis.filter.internal.shared;
import java.util.Map;
import org.opengis.filter.Expression;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/JTSTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/JTSTest.java
index 2998c4ecdd..2cd4f17eea 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/JTSTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/JTSTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandAggregateImageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandAggregateImageTest.java
index 8dc757bea0..cd5cae30f5 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandAggregateImageTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandAggregateImageTest.java
@@ -30,8 +30,8 @@ import java.awt.image.Raster;
import java.awt.image.RenderedImage;
import java.awt.image.WritableRaster;
import java.awt.image.WritableRenderedImage;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.RasterFactory;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.RasterFactory;
import org.apache.sis.util.ArraysExt;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandSelectImageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandSelectImageTest.java
index ab7fa2fa9d..32391850f6 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandSelectImageTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandSelectImageTest.java
@@ -26,8 +26,8 @@ import java.awt.image.RenderedImage;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.IndexColorModel;
-import org.apache.sis.image.privy.ColorModelFactory;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ColorModelFactory;
+import org.apache.sis.image.internal.shared.ImageUtilities;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ImageCombinerTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ImageCombinerTest.java
index 8b2c820ce2..eb3f98fc04 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ImageCombinerTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ImageCombinerTest.java
@@ -21,7 +21,7 @@ import java.awt.image.DataBuffer;
import java.awt.image.RenderedImage;
import java.awt.image.BufferedImage;
import org.opengis.referencing.operation.MathTransform;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
import org.apache.sis.referencing.operation.transform.MathTransforms;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ImageOverlayTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ImageOverlayTest.java
index 7fc9317e53..489676e91a 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ImageOverlayTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ImageOverlayTest.java
@@ -26,7 +26,7 @@ import java.awt.image.DataBuffer;
import java.awt.image.RenderedImage;
import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/InterpolationTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/InterpolationTest.java
index 62c59ac449..c0cb2e31b7 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/InterpolationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/InterpolationTest.java
@@ -22,8 +22,8 @@ import java.awt.Dimension;
import java.awt.image.DataBuffer;
import java.awt.image.WritableRaster;
import java.awt.image.BandedSampleModel;
-import org.apache.sis.image.privy.TiledImage;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.image.internal.shared.TiledImage;
+import org.apache.sis.util.internal.shared.Numerics;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
index f32abbc009..433379357e 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
@@ -30,7 +30,7 @@ import java.awt.image.IndexColorModel;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
import java.awt.image.WritableRaster;
-import org.apache.sis.image.privy.TiledImage;
+import org.apache.sis.image.internal.shared.TiledImage;
import org.apache.sis.util.Debug;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/PlanarImageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/PlanarImageTest.java
index 69fdadefb4..95aeb48a6f 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/PlanarImageTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/PlanarImageTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.image;
import java.util.Random;
import java.awt.Rectangle;
import java.awt.image.DataBuffer;
-import org.apache.sis.image.privy.ImageUtilities;
+import org.apache.sis.image.internal.shared.ImageUtilities;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResampledImageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResampledImageTest.java
index c1c58a645c..1119375699 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResampledImageTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResampledImageTest.java
@@ -31,8 +31,8 @@ import java.awt.image.RenderedImage;
import java.awt.image.WritableRaster;
import java.awt.geom.AffineTransform;
import java.awt.geom.NoninvertibleTransformException;
-import org.apache.sis.image.privy.RasterFactory;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.image.internal.shared.RasterFactory;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java
index 24b329754b..09376d53ee 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java
@@ -26,8 +26,8 @@ import org.opengis.referencing.operation.MathTransform2D;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.geometry.Shapes2D;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.privy.AffineTransform2D;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.math.Statistics;
import org.apache.sis.math.StatisticsFormat;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/StatisticsCalculatorTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/StatisticsCalculatorTest.java
index d4adb1bdc3..9faa630361 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/StatisticsCalculatorTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/StatisticsCalculatorTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.test.TestCaseWithLogs;
/**
* Tests {@link StatisticsCalculator}. This will also (indirectly) tests
- * {@link org.apache.sis.image.privy.TileOpExecutor} with multi-threading.
+ * {@link org.apache.sis.image.internal.shared.TileOpExecutor} with multi-threading.
*
* @author Martin Desruisseaux (Geomatys)
*/
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/TiledImageMock.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/TiledImageMock.java
index b32a9d146a..a3e0945053 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/TiledImageMock.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/TiledImageMock.java
@@ -36,8 +36,8 @@ import java.awt.image.SampleModel;
import java.awt.image.TileObserver;
import java.awt.image.WritableRaster;
import java.awt.image.WritableRenderedImage;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.image.privy.WritableTiledImage;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.image.internal.shared.WritableTiledImage;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.pending.jdk.JDK18;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ColorModelBuilderTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ColorModelBuilderTest.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ColorModelBuilderTest.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ColorModelBuilderTest.java
index e4eeb8bbd2..d4a2e26e04 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ColorModelBuilderTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ColorModelBuilderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.List;
import java.util.AbstractMap.SimpleEntry;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ImageUtilitiesTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ImageUtilitiesTest.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ImageUtilitiesTest.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ImageUtilitiesTest.java
index 17b6973679..517ffdff6b 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ImageUtilitiesTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ImageUtilitiesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
@@ -27,7 +27,7 @@ import java.awt.image.BandedSampleModel;
import org.apache.sis.image.DataType;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.resources.Vocabulary;
-import static org.apache.sis.util.privy.Numerics.COMPARISON_THRESHOLD;
+import static org.apache.sis.util.internal.shared.Numerics.COMPARISON_THRESHOLD;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ReshapedImageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ReshapedImageTest.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ReshapedImageTest.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ReshapedImageTest.java
index c2aa208379..f506734025 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ReshapedImageTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ReshapedImageTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Random;
import java.awt.image.DataBuffer;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/SampleModelBuilderTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/SampleModelBuilderTest.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/SampleModelBuilderTest.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/SampleModelBuilderTest.java
index dd719b0f18..7c5d71d8d2 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/SampleModelBuilderTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/SampleModelBuilderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Arrays;
import java.awt.Dimension;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ScaledColorSpaceTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ScaledColorSpaceTest.java
similarity index 98%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ScaledColorSpaceTest.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ScaledColorSpaceTest.java
index 665f350868..3d16685e1c 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/privy/ScaledColorSpaceTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/internal/shared/ScaledColorSpaceTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.image.privy;
+package org.apache.sis.image.internal.shared;
import java.util.Random;
import java.awt.Transparency;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/processing/isoline/IsolinesTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/processing/isoline/IsolinesTest.java
index 09fe78d784..da0d61bd19 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/processing/isoline/IsolinesTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/processing/isoline/IsolinesTest.java
@@ -23,7 +23,7 @@ import java.awt.image.DataBuffer;
import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.image.privy.RasterFactory;
+import org.apache.sis.image.internal.shared.RasterFactory;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/processing/isoline/StepsViewer.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/processing/isoline/StepsViewer.java
index b16c50ac41..3384313756 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/processing/isoline/StepsViewer.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/processing/isoline/StepsViewer.java
@@ -48,7 +48,7 @@ import javax.swing.event.ChangeListener;
import java.util.function.BiConsumer;
import java.util.concurrent.CountDownLatch;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/META-INF/services/org.apache.sis.util.privy.MetadataServices b/endorsed/src/org.apache.sis.metadata/main/META-INF/services/org.apache.sis.util.internal.shared.MetadataServices
similarity index 100%
rename from endorsed/src/org.apache.sis.metadata/main/META-INF/services/org.apache.sis.util.privy.MetadataServices
rename to endorsed/src/org.apache.sis.metadata/main/META-INF/services/org.apache.sis.util.internal.shared.MetadataServices
diff --git a/endorsed/src/org.apache.sis.metadata/main/module-info.java b/endorsed/src/org.apache.sis.metadata/main/module-info.java
index d160fb9e63..e66e26c614 100644
--- a/endorsed/src/org.apache.sis.metadata/main/module-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/module-info.java
@@ -45,11 +45,11 @@ module org.apache.sis.metadata {
provides org.apache.sis.xml.bind.TypeRegistration
with org.apache.sis.metadata.internal.MetadataTypes;
- provides org.apache.sis.util.privy.MetadataServices
+ provides org.apache.sis.util.internal.shared.MetadataServices
with org.apache.sis.metadata.internal.ServicesForUtility;
- uses org.apache.sis.metadata.privy.ReferencingServices;
- uses org.apache.sis.metadata.sql.privy.Initializer;
+ uses org.apache.sis.metadata.internal.shared.ReferencingServices;
+ uses org.apache.sis.metadata.sql.internal.shared.Initializer;
uses org.apache.sis.xml.bind.AdapterReplacement;
uses org.apache.sis.xml.bind.TypeRegistration;
@@ -86,7 +86,7 @@ module org.apache.sis.metadata {
org.apache.sis.storage.shapefile, // In the "incubator" sub-project.
org.apache.sis.cql; // In the "incubator" sub-project.
- exports org.apache.sis.metadata.privy to
+ exports org.apache.sis.metadata.internal.shared to
org.apache.sis.referencing,
org.apache.sis.feature,
org.apache.sis.storage,
@@ -157,7 +157,7 @@ module org.apache.sis.metadata {
org.glassfish.jaxb.core, // For access to various classes.
jakarta.xml.bind; // Seems ignored.
- exports org.apache.sis.metadata.sql.privy to
+ exports org.apache.sis.metadata.sql.internal.shared to
org.apache.sis.referencing,
org.apache.sis.storage.sql,
org.apache.sis.storage.geopackage, // In the "incubator" sub-project.
@@ -169,7 +169,7 @@ module org.apache.sis.metadata {
org.apache.sis.storage,
org.apache.sis.storage.xml;
- exports org.apache.sis.xml.privy to
+ exports org.apache.sis.xml.internal.shared to
org.apache.sis.referencing,
org.apache.sis.storage,
org.apache.sis.storage.xml,
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
index 2948efd9c6..1bed763bfc 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
@@ -29,13 +29,13 @@ import java.io.ObjectInputStream;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.ExtendedElementInformation;
import org.opengis.metadata.citation.Citation;
-import org.apache.sis.metadata.privy.SecondaryTrait;
+import org.apache.sis.metadata.internal.shared.SecondaryTrait;
import org.apache.sis.util.Classes;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.CheckedContainer;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.system.Configuration;
import org.apache.sis.system.Modules;
import org.apache.sis.system.Semaphores;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java
index 516fd20f62..eda12a0a3e 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java
@@ -23,7 +23,7 @@ import java.util.IdentityHashMap;
import java.util.ConcurrentModificationException;
import org.apache.sis.system.Semaphores;
import org.apache.sis.util.Exceptions;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitorException.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitorException.java
index 76af1002a1..1d33ec42c9 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitorException.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitorException.java
@@ -18,7 +18,7 @@ package org.apache.sis.metadata;
import org.opengis.util.InternationalString;
import org.apache.sis.util.LocalizedException;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
index 465eeb8586..208133fd41 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
@@ -34,14 +34,14 @@ import org.opengis.metadata.Metadata; // For javadoc
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.Containers;
import org.apache.sis.util.collection.CodeListSet;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.CheckedHashSet;
-import org.apache.sis.util.privy.CheckedArrayList;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.CheckedHashSet;
+import org.apache.sis.util.internal.shared.CheckedArrayList;
import org.apache.sis.metadata.internal.Resources;
import org.apache.sis.system.Semaphores;
import org.apache.sis.pending.jdk.JDK19;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyAccessor.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyAccessor.java
index 9b698f9533..9bca7c6141 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyAccessor.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyAccessor.java
@@ -38,9 +38,9 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.UnconvertibleObjectException;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.Numerics;
-import org.apache.sis.util.privy.Unsafe;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.Numerics;
+import org.apache.sis.util.internal.shared.Unsafe;
import org.apache.sis.util.collection.CheckedContainer;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.resources.Errors;
@@ -49,8 +49,8 @@ import org.apache.sis.measure.ValueRange;
import org.apache.sis.pending.jdk.JDK19;
import static org.apache.sis.metadata.PropertyComparator.*;
import static org.apache.sis.metadata.ValueExistencePolicy.isNullOrEmpty;
-import static org.apache.sis.util.privy.CollectionsExt.snapshot;
-import static org.apache.sis.util.privy.CollectionsExt.modifiableCopy;
+import static org.apache.sis.util.internal.shared.CollectionsExt.snapshot;
+import static org.apache.sis.util.internal.shared.CollectionsExt.modifiableCopy;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyMap.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyMap.java
index 5bcbdc2fcb..6401174418 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyMap.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyMap.java
@@ -22,7 +22,7 @@ import java.util.AbstractMap;
import java.util.AbstractSet;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.sis.util.privy.AbstractMapEntry;
+import org.apache.sis.util.internal.shared.AbstractMapEntry;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
index 11c2ec435a..7bfedb9f3d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata;
import java.util.Iterator;
import java.util.Collection;
import org.apache.sis.util.Emptiable;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import static org.apache.sis.metadata.ValueExistencePolicy.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StateChanger.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StateChanger.java
index 59e26b719b..e63a9dd246 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StateChanger.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StateChanger.java
@@ -22,9 +22,9 @@ import java.util.EnumSet;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
-import org.apache.sis.util.privy.Cloner;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.Cloner;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.util.collection.CodeListSet;
import org.apache.sis.metadata.iso.identification.DefaultRepresentativeFraction;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeNode.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeNode.java
index 051be71fe1..57a63c9c2d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeNode.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeNode.java
@@ -33,8 +33,8 @@ import org.apache.sis.util.Classes;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ObjectConverters;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.Unsafe;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.Unsafe;
import org.apache.sis.util.iso.Types;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.TreeTable.Node;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeTableView.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeTableView.java
index d653ab5a26..2c5ecbe548 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeTableView.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeTableView.java
@@ -27,8 +27,8 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.TreeTableFormat;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
-import org.apache.sis.util.privy.TreeFormatCustomization;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.TreeFormatCustomization;
import org.apache.sis.xml.bind.SpecializedIdentifier;
import org.apache.sis.xml.bind.NonMarshalledAuthority;
import org.apache.sis.system.Semaphores;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java
index dc9fec2f23..1bbdce19a9 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java
@@ -31,7 +31,7 @@ import org.apache.sis.metadata.sql.MetadataStoreException;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.metadata.simple.SimpleCitation;
import org.apache.sis.system.Loggers;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.logging.Logging;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java
index 5b67ae91c1..b94f3dc48a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java
@@ -28,11 +28,11 @@ import org.apache.sis.util.Exceptions;
import org.apache.sis.util.iso.Types;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.MetadataServices;
+import org.apache.sis.util.internal.shared.MetadataServices;
import org.apache.sis.system.SystemListener;
-import org.apache.sis.metadata.sql.privy.Initializer;
-import org.apache.sis.metadata.privy.Identifiers;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.metadata.sql.internal.shared.Initializer;
+import org.apache.sis.metadata.internal.shared.Identifiers;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.xml.bind.Context;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/AxisNames.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/AxisNames.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/AxisNames.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/AxisNames.java
index 94ddae0b3c..7fdea52e76 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/AxisNames.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/AxisNames.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.Map;
import java.util.HashMap;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/Identifiers.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/Identifiers.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/Identifiers.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/Identifiers.java
index a6daeaa3ce..f079774702 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/Identifiers.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/Identifiers.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.Locale;
import org.opengis.metadata.Identifier;
@@ -23,9 +23,9 @@ import org.opengis.util.InternationalString;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Characters;
import org.apache.sis.util.Deprecable;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Vocabulary;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/ImplementationHelper.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/ImplementationHelper.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/ImplementationHelper.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/ImplementationHelper.java
index 6a5fe88599..ed0af74e8e 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/ImplementationHelper.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/ImplementationHelper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.List;
import java.util.ArrayList;
@@ -27,8 +27,8 @@ import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.IdentifiedObject;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.xml.bind.Context;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.CollectionsExt;
/**
@@ -205,7 +205,7 @@ public final class ImplementationHelper {
* @param newValue the new value to set, or {@code null}Â for instead removing the first element.
* @return the collection (may or may not be the given {@code values} collection).
*
- * @see org.apache.sis.util.privy.CollectionsExt#first(Iterable)
+ * @see org.apache.sis.util.internal.shared.CollectionsExt#first(Iterable)
*/
public static <T> Collection<T> setFirst(Collection<T> values, final T newValue) {
if (values == null) {
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/Merger.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/Merger.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/Merger.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/Merger.java
index 46b262dfea..bc6cc46ff5 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/Merger.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/Merger.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.Map;
import java.util.Iterator;
@@ -31,7 +31,7 @@ import org.apache.sis.metadata.KeyNamePolicy;
import org.apache.sis.metadata.ValueExistencePolicy;
import org.apache.sis.util.CorruptedObjectException;
import org.apache.sis.util.Classes;
-import org.apache.sis.util.privy.Unsafe;
+import org.apache.sis.util.internal.shared.Unsafe;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/NameMeaning.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/NameMeaning.java
similarity index 97%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/NameMeaning.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/NameMeaning.java
index 26e2a50181..32eb66dd7b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/NameMeaning.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/NameMeaning.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.Map;
import java.util.Locale;
@@ -27,9 +27,9 @@ import org.opengis.referencing.datum.*;
import org.opengis.referencing.operation.*;
import org.opengis.util.InternationalString;
import org.opengis.metadata.citation.Citation;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.DefinitionURI;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.DefinitionURI;
import org.apache.sis.metadata.iso.citation.Citations;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/NameToIdentifier.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/NameToIdentifier.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/NameToIdentifier.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/NameToIdentifier.java
index 678b159013..3b52eb98ed 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/NameToIdentifier.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/NameToIdentifier.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.Locale;
import java.util.Objects;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/RecordSchemaSIS.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/RecordSchemaSIS.java
similarity index 97%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/RecordSchemaSIS.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/RecordSchemaSIS.java
index b04c4ba188..ebc4caa136 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/RecordSchemaSIS.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/RecordSchemaSIS.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.Map;
import java.io.Serializable;
@@ -22,7 +22,7 @@ import java.io.ObjectStreamException;
import org.opengis.util.TypeName;
import org.opengis.util.InternationalString;
import org.apache.sis.metadata.internal.Resources;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.iso.DefaultRecordType;
import org.apache.sis.util.iso.DefaultRecordSchema;
import org.apache.sis.util.resources.Vocabulary;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/ReferencingServices.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/ReferencingServices.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/ReferencingServices.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/ReferencingServices.java
index 78a54e6313..cf0c190837 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/ReferencingServices.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/ReferencingServices.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.Locale;
import java.util.TimeZone;
@@ -297,7 +297,7 @@ public class ReferencingServices extends OptionalDependency {
* @param locale language to use if possible.
* @return the information, or {@code null} if none.
*
- * @see org.apache.sis.util.privy.MetadataServices#getInformation(String, Locale)
+ * @see org.apache.sis.util.internal.shared.MetadataServices#getInformation(String, Locale)
*/
public String getInformation(String key, Locale locale) {
return null;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/SecondaryTrait.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/SecondaryTrait.java
similarity index 97%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/SecondaryTrait.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/SecondaryTrait.java
index 8c267dd9e3..0e5679625b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/SecondaryTrait.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/SecondaryTrait.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/package-info.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/package-info.java
index 1aa575d893..4cee85d16a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/shared/package-info.java
@@ -27,4 +27,4 @@
*
* @author Martin Desruisseaux (Geomatys)
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
index 9e58d0daf4..354d36aad9 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
@@ -30,11 +30,11 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.NilReason;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
-import org.apache.sis.util.privy.CollectionsExt;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.AbstractSet;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
index 3c129ac183..036e392187 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
@@ -61,7 +61,7 @@ import org.apache.sis.util.SimpleInternationalString;
import org.apache.sis.util.Emptiable;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.util.collection.Containers;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.temporal.TemporalDate;
import org.apache.sis.metadata.MetadataCopier;
import org.apache.sis.metadata.MetadataStandard;
@@ -71,8 +71,8 @@ import org.apache.sis.metadata.iso.citation.DefaultOnlineResource;
import org.apache.sis.metadata.iso.identification.AbstractIdentification;
import org.apache.sis.metadata.iso.identification.DefaultDataIdentification;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
-import org.apache.sis.metadata.privy.ImplementationHelper;
import org.apache.sis.metadata.internal.Dependencies;
+import org.apache.sis.metadata.internal.shared.ImplementationHelper;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.lan.LocaleAndCharset;
@@ -81,7 +81,7 @@ import org.apache.sis.xml.bind.lan.OtherLocales;
import org.apache.sis.xml.bind.lan.PT_Locale;
import org.apache.sis.xml.bind.metadata.CI_Citation;
import org.apache.sis.xml.bind.metadata.MD_Identifier;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.converter.SurjectiveConverter;
import org.apache.sis.math.FunctionProperty;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/ISOMetadata.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/ISOMetadata.java
index cad4589a8a..023f75cce5 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/ISOMetadata.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/ISOMetadata.java
@@ -36,12 +36,12 @@ import org.apache.sis.metadata.ModifiableMetadata;
import org.apache.sis.xml.bind.IdentifierMapAdapter;
import org.apache.sis.xml.bind.ModifiableIdentifierMap;
import org.apache.sis.xml.bind.NonMarshalledAuthority;
-import org.apache.sis.metadata.privy.ImplementationHelper;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.metadata.internal.shared.ImplementationHelper;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.system.Modules;
import org.apache.sis.util.collection.Containers;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
index d56445efe7..eac8772553 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
@@ -23,7 +23,7 @@ import org.opengis.metadata.acquisition.EnvironmentalRecord;
import org.opengis.util.InternationalString;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.metadata.iso.ISOMetadata;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensureInRange;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensureInRange;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java
index bd805c8be8..d2f26888e0 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java
@@ -30,11 +30,11 @@ import org.apache.sis.util.Static;
import org.apache.sis.util.Characters;
import org.apache.sis.util.CharSequences;
import org.apache.sis.xml.IdentifierSpace;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
-import org.apache.sis.metadata.privy.Identifiers;
-import org.apache.sis.metadata.simple.SimpleCitation;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.metadata.internal.CitationConstant;
+import org.apache.sis.metadata.internal.shared.Identifiers;
+import org.apache.sis.metadata.simple.SimpleCitation;
import org.apache.sis.xml.bind.NonMarshalledAuthority;
import org.apache.sis.system.Modules;
import org.apache.sis.system.SystemListener;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java
index dfbfcfd24c..463e114b85 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java
@@ -35,7 +35,7 @@ import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.IdentifierMap;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.NonMarshalledAuthority;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.temporal.TemporalDate;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.ISOMetadata;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
index 2f27187d4b..2be0195370 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
@@ -35,8 +35,8 @@ import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.gco.InternationalStringAdapter;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
-import org.apache.sis.xml.privy.LegacyNamespaces;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+import org.apache.sis.util.internal.shared.CollectionsExt;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.citation.TelephoneType;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
index 491773332f..da6a3dd660 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
@@ -28,10 +28,10 @@ import org.opengis.metadata.citation.ResponsibleParty;
import org.opengis.metadata.citation.Role;
import org.opengis.util.InternationalString;
import org.apache.sis.util.iso.Types;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
-import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.citation.Party;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
index c560ce5a6a..3b1e3e552a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
@@ -25,9 +25,9 @@ import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.opengis.metadata.citation.Telephone;
import org.apache.sis.metadata.iso.ISOMetadata;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gco.StringAdapter;
import org.apache.sis.xml.bind.metadata.code.CI_TelephoneTypeCode;
import org.apache.sis.metadata.internal.Dependencies;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/package-info.java
index fe3285063a..3b16919bdc 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/package-info.java
@@ -130,7 +130,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gco.*;
import org.apache.sis.xml.bind.metadata.*;
import org.apache.sis.xml.bind.metadata.code.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultBand.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultBand.java
index 179f4283e5..822b1acaaa 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultBand.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultBand.java
@@ -29,7 +29,7 @@ import org.opengis.metadata.content.TransferFunctionType;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.xml.bind.gco.GO_Real;
import org.apache.sis.xml.bind.gco.UnitAdapter;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
// Specific to the geoapi-4.0 branch:
import org.opengis.metadata.content.PolarisationOrientation;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
index 34f33f2f92..934e3b21b1 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
@@ -30,13 +30,13 @@ import org.opengis.metadata.content.ImageDescription;
import org.opengis.metadata.content.RangeDimension;
import org.opengis.metadata.content.RangeElementDescription;
import org.opengis.util.RecordType;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.metadata.MD_Identifier;
-import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.AttributeGroup;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
index 5853bc5402..c882b7037c 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
@@ -27,12 +27,12 @@ import org.opengis.util.GenericName;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.content.FeatureCatalogueDescription;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.lan.PT_Locale;
import org.apache.sis.xml.bind.lan.LocaleAndCharset;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
-import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.FeatureTypeInfo;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
index 93c4f3e576..033f7768d9 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
@@ -23,7 +23,7 @@ import org.opengis.util.GenericName;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.ISOMetadata;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.FeatureTypeInfo;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultImageDescription.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
index 254d72f1d7..caa9140c5e 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
@@ -23,11 +23,11 @@ import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.content.ImageDescription;
import org.opengis.metadata.content.ImagingCondition;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.measure.ValueRange;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensureInRange;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensureInRange;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
index aeb259fbd8..256f864280 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
@@ -29,7 +29,7 @@ import org.opengis.metadata.content.RangeDimension;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.metadata.internal.Dependencies;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.gco.InternationalStringAdapter;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
index 2be6ff4e80..f802c57090 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
@@ -35,7 +35,7 @@ import org.apache.sis.xml.bind.gco.GO_Integer;
import org.apache.sis.xml.bind.gco.GO_Record;
import org.apache.sis.xml.bind.gco.GO_RecordType;
import org.apache.sis.xml.bind.metadata.MI_RangeElementDescription;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.SampleDimension;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/package-info.java
index 7af0844122..cad1c057c9 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/package-info.java
@@ -128,7 +128,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.lan.LocaleAdapter;
import org.apache.sis.xml.bind.gco.*;
import org.apache.sis.xml.bind.metadata.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
index ef4bfb8d08..aebcef4e83 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
@@ -28,7 +28,7 @@ import org.opengis.metadata.distribution.DataFile;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gcx.MimeFileTypeAdapter;
// Specific to the geoapi-4.0 branch:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
index d660af725c..021413f0cf 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
@@ -33,8 +33,8 @@ import org.apache.sis.measure.ValueRange;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.gts.TM_Duration;
-import org.apache.sis.util.privy.CollectionsExt;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
index e522d47dde..88d1aeab92 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
@@ -31,10 +31,10 @@ import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.metadata.MD_Medium;
import org.apache.sis.xml.bind.metadata.CI_Citation;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
index faf89f0a1c..422806af91 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
@@ -35,9 +35,9 @@ import org.apache.sis.xml.bind.metadata.CI_Citation;
import org.apache.sis.xml.bind.metadata.MD_Identifier;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
import org.apache.sis.metadata.internal.Dependencies;
-import org.apache.sis.xml.privy.LegacyNamespaces;
-import org.apache.sis.util.privy.CollectionsExt;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.AbstractSet;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/package-info.java
index 60b3a9793b..8a8f46a3f1 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/package-info.java
@@ -111,7 +111,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gco.*;
import org.apache.sis.xml.bind.metadata.*;
import org.apache.sis.xml.bind.metadata.code.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultExtent.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultExtent.java
index 54c8d8c8f6..6bd709c09a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultExtent.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultExtent.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.collection.Containers;
import org.apache.sis.pending.jdk.JDK19;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.ISOMetadata;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.xml.NilObject;
import org.apache.sis.xml.NilReason;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
index 5c307fc531..ca60a06bf5 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
@@ -33,7 +33,7 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.metadata.InvalidMetadataException;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
index 6d540c999d..ce8060ae0d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
@@ -27,8 +27,8 @@ import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.opengis.metadata.extent.SpatialTemporalExtent;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.metadata.privy.ReferencingServices;
-import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
index 4adaddf03d..7e6dce5b42 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
@@ -30,7 +30,7 @@ import org.opengis.metadata.extent.TemporalExtent;
import org.opengis.metadata.extent.SpatialTemporalExtent;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.metadata.iso.ISOMetadata;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.temporal.TemporalObjects;
import org.apache.sis.temporal.TemporalDate;
import org.apache.sis.xml.NilObject;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java
index 8e05d05367..b9d5f26882 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java
@@ -29,7 +29,7 @@ import org.opengis.metadata.extent.VerticalExtent;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.xml.NilReason;
import org.apache.sis.xml.bind.gco.GO_Real;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
index aafadf5498..82433cdde1 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
@@ -55,7 +55,7 @@ import org.opengis.referencing.datum.VerticalDatum;
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.CoordinateOperation;
import org.apache.sis.metadata.InvalidMetadataException;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Longitude;
@@ -71,9 +71,9 @@ import org.apache.sis.util.iso.Types;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.temporal.TemporalDate;
-import static org.apache.sis.util.privy.CollectionsExt.nonNull;
+import static org.apache.sis.util.internal.shared.CollectionsExt.nonNull;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-import static org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS;
+import static org.apache.sis.metadata.internal.shared.ReferencingServices.AUTHALIC_RADIUS;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.RealizationMethod;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
index f7ebb85ecd..78b5cdead8 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
@@ -46,7 +46,7 @@ import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.metadata.MD_Identifier;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.util.iso.Types;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
index 81b7e9c626..86e04f38f0 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
@@ -30,7 +30,7 @@ import org.opengis.metadata.identification.AssociationType;
import org.opengis.metadata.identification.InitiativeType;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.internal.Dependencies;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.metadata.code.DS_AssociationTypeCode;
import org.apache.sis.xml.bind.metadata.code.DS_InitiativeTypeCode;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
index a87b1a60a5..283b881342 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
@@ -29,9 +29,9 @@ import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.metadata.SV_OperationMetadata;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gco.GO_GenericName;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.iso.Names;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
index 7eccb4056d..5814310047 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
@@ -32,7 +32,7 @@ import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.lan.LocaleAndCharset;
import org.apache.sis.xml.bind.lan.OtherLocales;
import org.apache.sis.xml.bind.lan.PT_Locale;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.metadata.internal.Dependencies;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
index db362e34e3..8b1b5bbd8f 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
@@ -35,15 +35,15 @@ import org.apache.sis.xml.IdentifiedObject;
import org.apache.sis.xml.bind.ModifiableIdentifierMap;
import org.apache.sis.xml.bind.IdentifierMapAdapter;
import org.apache.sis.xml.bind.gco.GO_Integer64;
-import org.apache.sis.metadata.privy.ImplementationHelper;
import org.apache.sis.metadata.internal.Resources;
+import org.apache.sis.metadata.internal.shared.ImplementationHelper;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Emptiable;
-import org.apache.sis.util.privy.CheckedArrayList;
+import org.apache.sis.util.internal.shared.CheckedArrayList;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.util.resources.Errors;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultResolution.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultResolution.java
index 30eeff3d1b..7c0fa91be5 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultResolution.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultResolution.java
@@ -30,7 +30,7 @@ import org.apache.sis.xml.bind.gco.InternationalStringAdapter;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.util.resources.Messages;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultUsage.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultUsage.java
index 40a57128ab..b256de1433 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultUsage.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultUsage.java
@@ -30,7 +30,7 @@ import org.opengis.metadata.identification.Usage;
import org.opengis.temporal.TemporalPrimitive;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.gml.TM_Primitive;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.metadata.internal.Dependencies;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java
index 110dcdf744..b0a148ab8f 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata.iso.identification;
import java.util.Map;
import java.util.HashMap;
import java.util.Collection;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Collections;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/package-info.java
index 8aa8ff4e99..02802d204d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/package-info.java
@@ -160,7 +160,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.lan.LocaleAdapter;
import org.apache.sis.xml.bind.gco.*;
import org.apache.sis.xml.bind.gts.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/LegacyPropertyAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/LegacyPropertyAdapter.java
index e6b0d0a134..5ff7d4ab06 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/LegacyPropertyAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/LegacyPropertyAdapter.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.Objects;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.util.Emptiable;
-import org.apache.sis.util.privy.AbstractIterator;
+import org.apache.sis.util.internal.shared.AbstractIterator;
import org.apache.sis.util.resources.Messages;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
index 4087ac2a69..fd36d9464e 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
@@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlType;
import org.opengis.metadata.lineage.NominalResolution;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.measure.ValueRange;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
index 5e80d2de7e..d1772f1dd6 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
@@ -36,7 +36,7 @@ import org.apache.sis.util.iso.Types;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.gml.TM_Primitive;
import org.apache.sis.xml.bind.metadata.MD_Scope;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.temporal.TemporalObjects;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultSource.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultSource.java
index f1b4889e1d..c038678c78 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultSource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultSource.java
@@ -41,7 +41,7 @@ import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.metadata.RS_ReferenceSystem;
import org.apache.sis.xml.bind.metadata.MD_Resolution;
import org.apache.sis.xml.bind.metadata.MD_Scope;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.util.iso.Types;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/package-info.java
index e1ce766ee4..499c61f167 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/package-info.java
@@ -105,6 +105,6 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gco.*;
import org.apache.sis.xml.bind.metadata.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
index 0435e8672e..81dc199fbe 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
@@ -35,9 +35,9 @@ import org.apache.sis.metadata.iso.citation.DefaultCitationDate;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
-import org.apache.sis.util.privy.CollectionsExt;
-import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.maintenance.Scope;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/package-info.java
index e74ef43ba6..8e50d28afa 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/package-info.java
@@ -100,7 +100,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gco.*;
import org.apache.sis.xml.bind.metadata.*;
import org.apache.sis.xml.bind.metadata.code.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/package-info.java
index 533359b9db..5f16f09845 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/package-info.java
@@ -140,7 +140,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.lan.LocaleAdapter;
import org.apache.sis.xml.bind.gco.*;
import org.apache.sis.xml.bind.metadata.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractElement.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractElement.java
index 1042670b0a..53abd7d6e5 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractElement.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractElement.java
@@ -43,7 +43,7 @@ import org.apache.sis.xml.bind.gco.InternationalStringAdapter;
import org.apache.sis.metadata.iso.legacy.DateToTemporal;
import org.apache.sis.metadata.iso.legacy.TemporalToDate;
import org.apache.sis.metadata.internal.Dependencies;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
index b69dadac2d..8c37f88284 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
@@ -28,7 +28,7 @@ import org.opengis.metadata.distribution.DataFile;
import org.opengis.metadata.spatial.SpatialRepresentation;
import org.opengis.metadata.spatial.SpatialRepresentationType;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
index 544eb2b925..ba4a358249 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
@@ -25,7 +25,7 @@ import org.opengis.metadata.quality.DataQuality;
import org.opengis.metadata.quality.Element;
import org.opengis.metadata.maintenance.ScopeCode;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.quality.StandaloneQualityReportInformation;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
index 256a17165b..1a0b177c10 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
@@ -31,11 +31,11 @@ import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.quality.EvaluationMethodType;
import org.apache.sis.system.Semaphores;
import org.apache.sis.util.iso.Types;
-import org.apache.sis.util.privy.CloneAccess;
+import org.apache.sis.util.internal.shared.CloneAccess;
import org.apache.sis.util.collection.CheckedContainer;
import org.apache.sis.util.resources.Errors;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.quality.EvaluationMethod;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
index cfd4a3e88c..0b21fc965d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
@@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.util.InternationalString;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.quality.Element;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.util.iso.Types;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java
index bff97bb070..42196c64c0 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata.iso.quality;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.metadata.quality.NonQuantitativeAttributeAccuracy;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
index f30f9bcb76..64d157ee53 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
@@ -26,7 +26,7 @@ import org.opengis.util.InternationalString;
import org.opengis.util.Record;
import org.opengis.util.RecordType;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultScope.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultScope.java
index 678faae1ab..69e55016ce 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultScope.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultScope.java
@@ -25,7 +25,7 @@ import java.util.Collection;
import org.opengis.metadata.extent.Extent;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultUsability.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultUsability.java
index a92c3877f9..7e9e709e87 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultUsability.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultUsability.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata.iso.quality;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.metadata.quality.Usability;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/package-info.java
index 44b1ef0bb9..0986ddd265 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/package-info.java
@@ -98,7 +98,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gco.*;
import org.apache.sis.xml.bind.metadata.*;
import org.apache.sis.xml.bind.metadata.code.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultDimension.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
index 662f68eeda..a1f8d7fb98 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
@@ -30,7 +30,7 @@ import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.util.ArgumentChecks;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java
index 19e91f5410..cf09cdfcb6 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java
@@ -23,7 +23,7 @@ import org.opengis.metadata.spatial.GeometricObjects;
import org.opengis.metadata.spatial.GeometricObjectType;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.metadata.iso.ISOMetadata;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
index 890fcbcc1f..e40e02f591 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
@@ -28,7 +28,7 @@ import org.opengis.metadata.spatial.Georeferenceable;
import org.opengis.metadata.spatial.GridSpatialRepresentation;
import org.apache.sis.xml.bind.gco.GO_Integer;
import org.apache.sis.measure.ValueRange;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java
index ef28b60e0b..02393d9ae1 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
import org.opengis.metadata.citation.Citation;
import org.opengis.util.InternationalString;
import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
index 0c3f18d82d..02e222ad38 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
@@ -21,7 +21,7 @@ import org.opengis.metadata.extent.Extent;
import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.metadata.extent.TemporalExtent;
import org.opengis.metadata.extent.VerticalExtent;
-import static org.apache.sis.util.privy.CollectionsExt.singletonOrEmpty;
+import static org.apache.sis.util.internal.shared.CollectionsExt.singletonOrEmpty;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java
index c60f33a316..4cb3962f21 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java
@@ -20,7 +20,7 @@ import java.util.Collection;
import java.util.Collections;
import org.opengis.util.InternationalString;
import org.opengis.metadata.distribution.Format;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.citation.Citation;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index e254073a31..8c36f19271 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@ -22,10 +22,10 @@ import org.opengis.util.InternationalString;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.opengis.referencing.IdentifiedObject;
-import org.apache.sis.metadata.privy.Identifiers;
+import org.apache.sis.metadata.internal.shared.Identifiers;
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java
index 8335b1c0d9..a0900b5c3f 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java
@@ -23,7 +23,7 @@ import org.opengis.metadata.citation.Citation;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Classes;
import org.apache.sis.util.Deprecable;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
// Specific to the geoapi-4.0 branch:
import java.util.Optional;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Dispatcher.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Dispatcher.java
index 47329a4302..f7129dccaa 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Dispatcher.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Dispatcher.java
@@ -24,8 +24,8 @@ import java.util.Map;
import org.apache.sis.util.Classes;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.BackingStoreException;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.metadata.ModifiableMetadata;
import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.metadata.KeyNamePolicy;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/IdentifierGenerator.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/IdentifierGenerator.java
index f2eb02e739..c8a5657867 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/IdentifierGenerator.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/IdentifierGenerator.java
@@ -20,7 +20,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLNonTransientException;
-import org.apache.sis.metadata.sql.privy.SQLBuilder;
+import org.apache.sis.metadata.sql.internal.shared.SQLBuilder;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Installer.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Installer.java
index 82d78f034c..23687c082c 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Installer.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Installer.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata.sql;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
-import org.apache.sis.metadata.sql.privy.ScriptRunner;
+import org.apache.sis.metadata.sql.internal.shared.ScriptRunner;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.StringBuilders;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
index edee1c42fe..cf6f42f12b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
@@ -24,7 +24,7 @@ import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.iso.citation.DefaultOrganisation;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.Types;
import org.apache.sis.xml.NilReason;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java
index 804509ff65..cac410fe31 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java
@@ -58,18 +58,18 @@ import org.apache.sis.system.DelayedExecutor;
import org.apache.sis.system.DelayedRunnable;
import org.apache.sis.system.Configuration;
import org.apache.sis.system.Loggers;
-import org.apache.sis.metadata.sql.privy.Initializer;
-import org.apache.sis.metadata.sql.privy.Reflection;
-import org.apache.sis.metadata.sql.privy.SQLBuilder;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.metadata.sql.internal.shared.Initializer;
+import org.apache.sis.metadata.sql.internal.shared.Reflection;
+import org.apache.sis.metadata.sql.internal.shared.SQLBuilder;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.Classes;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.CodeLists;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.CodeLists;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.util.collection.Containers;
import org.apache.sis.util.collection.CodeListSet;
import org.apache.sis.util.collection.WeakValueHashMap;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
index ae6b925744..1eb1fd9488 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
@@ -45,10 +45,10 @@ import org.apache.sis.metadata.TypeValuePolicy;
import org.apache.sis.metadata.ValueExistencePolicy;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.metadata.sql.privy.SQLBuilder;
-import org.apache.sis.metadata.sql.privy.Reflection;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.metadata.sql.internal.shared.SQLBuilder;
+import org.apache.sis.metadata.sql.internal.shared.Reflection;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.xml.IdentifiedObject;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Dialect.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Dialect.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Dialect.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Dialect.java
index f4f6e0e7e6..f9c2497d7d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Dialect.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Dialect.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.sql.SQLException;
import java.sql.DatabaseMetaData;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Initializer.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Initializer.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Initializer.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Initializer.java
index dea1d6e2b1..ad733af259 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Initializer.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Initializer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.util.Locale;
import java.util.ServiceLoader;
@@ -45,14 +45,14 @@ import org.apache.sis.system.Shutdown;
import org.apache.sis.system.Reflect;
import org.apache.sis.util.resources.Messages;
import org.apache.sis.util.logging.Logging;
-import static org.apache.sis.util.privy.MetadataServices.EMBEDDED;
+import static org.apache.sis.util.internal.shared.MetadataServices.EMBEDDED;
/**
* Manages the unique {@link DataSource} instance to the {@code $SIS_DATA/Databases/SpatialMetadata} database.
* This includes initialization of a new database if none existed. The schemas will be created by subclasses
* of this {@code Initializer} class, which must be registered in {@code module-info.java} file as a provider
- * of the {@code org.apache.sis.metadata.sql.privy.Initializer} service.
+ * of the {@code org.apache.sis.metadata.sql.internal.shared.Initializer} service.
*
* <p>{@code Initializer} implementations should define the following methods:</p>
* <ul>
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/LocalDataSource.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/LocalDataSource.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/LocalDataSource.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/LocalDataSource.java
index d2c41b4364..a50e523e98 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/LocalDataSource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/LocalDataSource.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.util.Arrays;
import javax.sql.DataSource;
@@ -34,7 +34,7 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.system.Loggers;
import org.apache.sis.system.DataDirectory;
import org.apache.sis.system.Reflect;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Reflection.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Reflection.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Reflection.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Reflection.java
index 1069b2682a..4a8dbf1b01 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Reflection.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Reflection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.sql.DatabaseMetaData;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/SQLBuilder.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/SQLBuilder.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/SQLBuilder.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/SQLBuilder.java
index 394fdb6db1..b1bd4e096d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/SQLBuilder.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/SQLBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -25,7 +25,7 @@ import java.time.ZoneOffset;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalQueries;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/SQLUtilities.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/SQLUtilities.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/SQLUtilities.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/SQLUtilities.java
index 66d74f5a68..a238fe525a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/SQLUtilities.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/SQLUtilities.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.sql.SQLException;
import java.sql.SQLDataException;
@@ -22,7 +22,7 @@ import java.sql.DatabaseMetaData;
import org.apache.sis.util.Characters;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Workaround;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/ScriptRunner.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/ScriptRunner.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/ScriptRunner.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/ScriptRunner.java
index 788d1836b3..0223fbe946 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/ScriptRunner.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/ScriptRunner.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.util.Map;
import java.util.HashMap;
@@ -36,7 +36,7 @@ import java.sql.SQLException;
import java.sql.DatabaseMetaData;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Supports.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Supports.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Supports.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Supports.java
index 4be4e20293..9e0fe48e4b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Supports.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Supports.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Syntax.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Syntax.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Syntax.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Syntax.java
index 218e6b0d03..71abf67e19 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Syntax.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/Syntax.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/TypeMapper.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/TypeMapper.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/TypeMapper.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/TypeMapper.java
index f2e41086ae..601660b935 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/TypeMapper.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/TypeMapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.util.Date;
import java.sql.Types;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/package-info.java
similarity index 95%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/package-info.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/package-info.java
index fb157b9851..c0d36e3940 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/internal/shared/package-info.java
@@ -24,7 +24,7 @@
* may change in incompatible ways in any future version without notice.
*
* <h2>Declaring the data source in a web container</h2>
- * The {@link org.apache.sis.metadata.sql.privy.Initializer#getDataSource()} method gets the unique,
+ * The {@link org.apache.sis.metadata.sql.internal.shared.Initializer#getDataSource()} method gets the unique,
* SIS-wide, data source for JDBC connection to the {@code $SIS_DATA/Databases/SpatialMetadata}.
* The method Javadoc describes the steps for fetching that data source.
* When used in a JavaEE container, the data source can be configured as below:
@@ -74,4 +74,4 @@
* @author Martin Desruisseaux (Geomatys)
* @author Johann Sorel (Geomatys)
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java
index f5a506a08d..aceca11553 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java
@@ -24,7 +24,7 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.LazyCandidate;
+import org.apache.sis.util.internal.shared.LazyCandidate;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.temporal.Instant;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/GeneralDuration.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/GeneralDuration.java
index 6cd1724710..222fd96dd8 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/GeneralDuration.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/GeneralDuration.java
@@ -34,7 +34,7 @@ import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
import org.apache.sis.pending.jdk.JDK18;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.util.resources.Errors;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/LenientDateFormat.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/LenientDateFormat.java
index c564507a2b..6e270849f6 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/LenientDateFormat.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/LenientDateFormat.java
@@ -44,7 +44,7 @@ import java.time.format.DateTimeFormatterBuilder;
import java.time.format.DateTimeParseException;
import java.time.format.SignStyle;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/TemporalDate.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/TemporalDate.java
index 0533095386..3608a5562a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/TemporalDate.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/TemporalDate.java
@@ -32,7 +32,7 @@ import java.time.chrono.ChronoZonedDateTime;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/TimeMethods.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/TimeMethods.java
index c6efb883bf..45af8e82b2 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/TimeMethods.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/TimeMethods.java
@@ -45,7 +45,7 @@ import java.lang.reflect.Modifier;
import java.io.Serializable;
import java.io.ObjectStreamException;
import org.apache.sis.util.Classes;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java
index cdab28291a..c649b94062 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java
@@ -19,7 +19,7 @@ package org.apache.sis.util.iso;
import org.opengis.util.Factory;
import org.opengis.metadata.citation.Citation;
import org.apache.sis.metadata.simple.SimpleCitation;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
// Specific to the geoapi-4.0 branch:
import org.opengis.util.FactoryException;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameFactory.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameFactory.java
index 3ce5f70222..997a3077d3 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameFactory.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameFactory.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.UnknownNameException;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.WeakHashSet;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameSpace.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameSpace.java
index 30c6005f6d..a4e14627e3 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameSpace.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameSpace.java
@@ -29,8 +29,8 @@ import org.opengis.util.ScopedName;
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.util.collection.WeakValueHashMap;
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecord.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecord.java
index a7ef38bd9b..ac464b57cc 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecord.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecord.java
@@ -31,9 +31,9 @@ import org.opengis.util.Record;
import org.opengis.util.RecordType;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.AbstractMapEntry;
-import org.apache.sis.metadata.privy.RecordSchemaSIS;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.AbstractMapEntry;
+import org.apache.sis.metadata.internal.shared.RecordSchemaSIS;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
index 8b29bd616c..ee91574252 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.WeakValueHashMap;
import org.apache.sis.metadata.simple.SimpleAttributeType;
import org.apache.sis.converter.SurjectiveConverter;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.AttributeType;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
index 55bb94d6ef..71937351ed 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
@@ -42,7 +42,7 @@ import org.apache.sis.util.CharSequences;
import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.converter.SurjectiveConverter;
-import org.apache.sis.metadata.privy.RecordSchemaSIS;
+import org.apache.sis.metadata.internal.shared.RecordSchemaSIS;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.util.NameFactory;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultScopedName.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultScopedName.java
index 5c1282ce71..c8aafca5fd 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultScopedName.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultScopedName.java
@@ -27,7 +27,7 @@ import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java
index 2cc12414c3..b691609635 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java
@@ -28,7 +28,7 @@ import org.opengis.util.MemberName;
import org.apache.sis.util.Classes;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.pending.jdk.JDK19;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/TypeNames.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/TypeNames.java
index 5834626455..dc90f4c062 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/TypeNames.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/TypeNames.java
@@ -30,7 +30,7 @@ import org.opengis.util.NameFactory;
import org.opengis.util.InternationalString;
import org.opengis.geometry.Geometry;
import org.apache.sis.util.Numbers;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
index cebb440bc6..d3e33867d8 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
@@ -44,8 +44,8 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Messages;
import org.apache.sis.util.collection.BackingStoreException;
-import org.apache.sis.util.privy.CodeLists;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.CodeLists;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.pending.jdk.JDK19;
import org.apache.sis.system.Modules;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/MarshallerPool.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/MarshallerPool.java
index ad162dd93c..8933aeb7b4 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/MarshallerPool.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/MarshallerPool.java
@@ -36,7 +36,7 @@ import org.apache.sis.system.DelayedRunnable;
import org.apache.sis.xml.bind.AdapterReplacement;
import org.apache.sis.xml.bind.TypeRegistration;
import org.apache.sis.xml.bind.Context;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java
index 41aaea7d3f..077ac5fabe 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java
@@ -21,8 +21,8 @@ import java.util.Locale;
import java.util.Objects;
import javax.xml.XMLConstants;
import org.apache.sis.util.Static;
-import org.apache.sis.xml.privy.LegacyNamespaces;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ISO_NAMESPACE;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ISO_NAMESPACE;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/NilObjectHandler.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/NilObjectHandler.java
index e5c113a35b..bc6a6b4731 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/NilObjectHandler.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/NilObjectHandler.java
@@ -32,7 +32,7 @@ import org.apache.sis.util.Numbers;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.xml.bind.IdentifierMapAdapter;
import org.apache.sis.xml.bind.ModifiableIdentifierMap;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/OutputFactory.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/OutputFactory.java
index 61d68f4d4c..9818c0dad3 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/OutputFactory.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/OutputFactory.java
@@ -28,7 +28,7 @@ import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stax.StAXResult;
import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
-import org.apache.sis.xml.privy.StreamWriterDelegate;
+import org.apache.sis.xml.internal.shared.StreamWriterDelegate;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Pooled.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Pooled.java
index b2c170c47c..8959fc417a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Pooled.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Pooled.java
@@ -37,11 +37,11 @@ import org.apache.sis.util.Version;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.TypeRegistration;
-import org.apache.sis.xml.privy.LegacyNamespaces;
-import org.apache.sis.xml.privy.ExternalLinkHandler;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.ExternalLinkHandler;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/PooledMarshaller.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/PooledMarshaller.java
index 50f8ea8289..b9a5cce3bf 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/PooledMarshaller.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/PooledMarshaller.java
@@ -38,7 +38,7 @@ import org.xml.sax.ContentHandler;
import org.w3c.dom.Node;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.UseLegacyMetadata;
-import org.apache.sis.xml.privy.ExternalLinkHandler;
+import org.apache.sis.xml.internal.shared.ExternalLinkHandler;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/PooledUnmarshaller.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/PooledUnmarshaller.java
index 2aef14b4fa..00eead6dd6 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/PooledUnmarshaller.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/PooledUnmarshaller.java
@@ -44,7 +44,7 @@ import jakarta.xml.bind.attachment.AttachmentUnmarshaller;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
import org.apache.sis.xml.bind.Context;
-import org.apache.sis.xml.privy.ExternalLinkHandler;
+import org.apache.sis.xml.internal.shared.ExternalLinkHandler;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ReferenceResolver.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ReferenceResolver.java
index 7e653cbe86..47f2b26da1 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ReferenceResolver.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ReferenceResolver.java
@@ -27,12 +27,12 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Emptiable;
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.gcx.Anchor;
-import org.apache.sis.xml.privy.ExternalLinkHandler;
-import org.apache.sis.xml.privy.URISource;
-import org.apache.sis.xml.privy.XmlUtilities;
+import org.apache.sis.xml.internal.shared.ExternalLinkHandler;
+import org.apache.sis.xml.internal.shared.URISource;
+import org.apache.sis.xml.internal.shared.XmlUtilities;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformVersion.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformVersion.java
index 3fab62526c..5b507cfa29 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformVersion.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformVersion.java
@@ -20,7 +20,7 @@ import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Collections;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingReader.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingReader.java
index 7b49ab1e0b..2fb6283315 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingReader.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingReader.java
@@ -62,13 +62,13 @@ final class TransformingReader extends Transformer implements XMLEventReader {
* This set will contain at least the following namespaces:
*
* <ul>
- * <li>{@value org.apache.sis.xml.privy.LegacyNamespaces#GMI}</li>
- * <li>{@value org.apache.sis.xml.privy.LegacyNamespaces#GMI_ALIAS}</li>
- * <li>{@value org.apache.sis.xml.privy.LegacyNamespaces#GMD}</li>
- * <li>{@value org.apache.sis.xml.privy.LegacyNamespaces#SRV}</li>
- * <li>{@value org.apache.sis.xml.privy.LegacyNamespaces#GCO}</li>
- * <li>{@value org.apache.sis.xml.privy.LegacyNamespaces#GMX}</li>
- * <li>{@value org.apache.sis.xml.privy.LegacyNamespaces#GML}</li>
+ * <li>{@value org.apache.sis.xml.internal.shared.LegacyNamespaces#GMI}</li>
+ * <li>{@value org.apache.sis.xml.internal.shared.LegacyNamespaces#GMI_ALIAS}</li>
+ * <li>{@value org.apache.sis.xml.internal.shared.LegacyNamespaces#GMD}</li>
+ * <li>{@value org.apache.sis.xml.internal.shared.LegacyNamespaces#SRV}</li>
+ * <li>{@value org.apache.sis.xml.internal.shared.LegacyNamespaces#GCO}</li>
+ * <li>{@value org.apache.sis.xml.internal.shared.LegacyNamespaces#GMX}</li>
+ * <li>{@value org.apache.sis.xml.internal.shared.LegacyNamespaces#GML}</li>
* </ul>
*
* More namespaces may appear depending on the optional module on the module path.
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java
index 2d254cf172..7f923964b7 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java
@@ -38,8 +38,8 @@ import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import static javax.xml.stream.XMLStreamConstants.*;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ValueConverter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ValueConverter.java
index c159b75ed7..77f7437233 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ValueConverter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ValueConverter.java
@@ -29,7 +29,7 @@ import java.nio.charset.IllegalCharsetNameException;
import javax.measure.Unit;
import javax.measure.format.MeasurementParseException;
import org.apache.sis.util.Locales;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java
index 7d68c0b80e..cc5103f783 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java
@@ -50,7 +50,7 @@ import org.apache.sis.util.Workaround;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.system.Modules;
import org.apache.sis.system.SystemListener;
-import org.apache.sis.xml.privy.URISource;
+import org.apache.sis.xml.internal.shared.URISource;
import org.apache.sis.xml.bind.TypeRegistration;
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XPointer.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XPointer.java
index d12a8c1c94..19eb78a721 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XPointer.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XPointer.java
@@ -17,7 +17,7 @@
package org.apache.sis.xml;
import static org.apache.sis.util.CharSequences.*;
-import static org.apache.sis.util.privy.DefinitionURI.regionMatches;
+import static org.apache.sis.util.internal.shared.DefinitionURI.regionMatches;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java
index 4c1983815a..5df0a1d981 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java
@@ -31,7 +31,7 @@ import java.util.logging.Filter;
import org.apache.sis.util.Version;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.CorruptedObjectException;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Messages;
import org.apache.sis.util.resources.IndexedResourceBundle;
@@ -41,8 +41,8 @@ import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.xml.ValueConverter;
import org.apache.sis.xml.ReferenceResolver;
import org.apache.sis.xml.bind.gco.PropertyType;
-import org.apache.sis.xml.privy.LegacyNamespaces;
-import org.apache.sis.xml.privy.ExternalLinkHandler;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.ExternalLinkHandler;
import org.apache.sis.system.Semaphores;
import org.apache.sis.system.Loggers;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/IdentifierMapAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/IdentifierMapAdapter.java
index 044bc1dabe..d2d73d25ab 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/IdentifierMapAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/IdentifierMapAdapter.java
@@ -32,8 +32,8 @@ import org.opengis.metadata.citation.Citation;
import org.apache.sis.xml.XLink;
import org.apache.sis.xml.IdentifierMap;
import org.apache.sis.xml.IdentifierSpace;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.SetOfUnknownSize;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.SetOfUnknownSize;
import org.apache.sis.util.collection.Containers;
import org.apache.sis.pending.jdk.JDK19;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/NonMarshalledAuthority.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/NonMarshalledAuthority.java
index 749315bab6..3fa911145e 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/NonMarshalledAuthority.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/NonMarshalledAuthority.java
@@ -27,8 +27,8 @@ import java.io.ObjectStreamException;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.apache.sis.metadata.internal.CitationConstant;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.xml.IdentifierSpace;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java
index b1f6810ba2..e031ec5241 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java
@@ -28,7 +28,7 @@ import org.apache.sis.xml.IdentifierMap;
import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.ValueConverter;
import org.apache.sis.util.resources.Messages;
-import org.apache.sis.util.privy.CloneAccess;
+import org.apache.sis.util.internal.shared.CloneAccess;
import org.apache.sis.metadata.iso.citation.Citations;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
index 9adc3ef22a..cfd93a57af 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
@@ -18,7 +18,7 @@ package org.apache.sis.xml.bind.cat;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.opengis.util.CodeList;
-import org.apache.sis.util.privy.CodeLists;
+import org.apache.sis.util.internal.shared.CodeLists;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListUID.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListUID.java
index e99dd9c49c..66299ca3ee 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListUID.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListUID.java
@@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlValue;
import org.opengis.util.CodeList;
import org.apache.sis.util.iso.Types;
import org.apache.sis.xml.bind.Context;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ISO_NAMESPACE;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ISO_NAMESPACE;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.util.ControlledVocabulary;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/CharSequenceAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/CharSequenceAdapter.java
index 38e0afa27c..b50201b527 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/CharSequenceAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/CharSequenceAdapter.java
@@ -21,7 +21,7 @@ import org.opengis.util.InternationalString;
import org.apache.sis.util.CharSequences;
import org.apache.sis.xml.XLink;
import org.apache.sis.xml.ReferenceResolver;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.gcx.Anchor;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_CharacterString.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_CharacterString.java
index a6c39e4cc2..c6418e69ae 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_CharacterString.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_CharacterString.java
@@ -33,11 +33,11 @@ import org.apache.sis.xml.bind.gcx.Anchor;
import org.apache.sis.xml.bind.gcx.FileName;
import org.apache.sis.xml.bind.gcx.MimeFileType;
import org.apache.sis.xml.bind.cat.CodeListUID;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Workaround;
import org.apache.sis.util.iso.Types;
-import org.apache.sis.util.privy.CodeLists;
+import org.apache.sis.util.internal.shared.CodeLists;
import org.apache.sis.util.resources.IndexedResourceBundle;
import org.apache.sis.util.resources.Messages;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_DateTime.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_DateTime.java
index ccd7eb368a..054f358ff8 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_DateTime.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_DateTime.java
@@ -26,7 +26,7 @@ import jakarta.xml.bind.annotation.XmlSchemaType;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.XmlUtilities;
+import org.apache.sis.xml.internal.shared.XmlUtilities;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_Temporal.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_Temporal.java
index 97dd83a496..d2fbae9291 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_Temporal.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/GO_Temporal.java
@@ -27,7 +27,7 @@ import jakarta.xml.bind.annotation.XmlSchemaType;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.XmlUtilities;
+import org.apache.sis.xml.internal.shared.XmlUtilities;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/PropertyType.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/PropertyType.java
index 403f229c32..0aff422e9e 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/PropertyType.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/PropertyType.java
@@ -34,7 +34,7 @@ import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.metadata.AbstractMetadata;
import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gmi/MI_Metadata.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gmi/MI_Metadata.java
index 22d337a245..5e6cdb0d42 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gmi/MI_Metadata.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gmi/MI_Metadata.java
@@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.metadata.Metadata;
import org.apache.sis.metadata.iso.DefaultMetadata;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gmi/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gmi/package-info.java
index 8d51e164ac..be98008882 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gmi/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gmi/package-info.java
@@ -48,4 +48,4 @@ import jakarta.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/CodeListAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/CodeListAdapter.java
index b3ee0ececb..bfaa11873e 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/CodeListAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/CodeListAdapter.java
@@ -21,7 +21,7 @@ import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.opengis.util.CodeList;
import org.apache.sis.util.iso.Types;
-import org.apache.sis.util.privy.CodeLists;
+import org.apache.sis.util.internal.shared.CodeLists;
import org.apache.sis.xml.bind.Context;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/DateAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/DateAdapter.java
index 89156db1cc..e69e05ae71 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/DateAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/DateAdapter.java
@@ -21,7 +21,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.datatype.DatatypeConfigurationException;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.sis.xml.bind.Context;
-import org.apache.sis.xml.privy.XmlUtilities;
+import org.apache.sis.xml.internal.shared.XmlUtilities;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/Measure.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/Measure.java
index 332146d9bf..6f84883297 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/Measure.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/Measure.java
@@ -27,8 +27,8 @@ import javax.measure.Unit;
import javax.measure.Quantity;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.cat.CodeListUID;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.DefinitionURI;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.DefinitionURI;
import org.apache.sis.measure.UnitFormat;
import org.apache.sis.measure.Units;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TM_Primitive.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TM_Primitive.java
index 4cd2880a96..4a997176a5 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TM_Primitive.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TM_Primitive.java
@@ -20,7 +20,7 @@ import java.time.temporal.Temporal;
import java.time.temporal.ChronoField;
import jakarta.xml.bind.annotation.XmlElement;
import org.opengis.temporal.TemporalPrimitive;
-import org.apache.sis.xml.privy.XmlUtilities;
+import org.apache.sis.xml.internal.shared.XmlUtilities;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.gco.PropertyType;
import org.apache.sis.temporal.TemporalObjects;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TemporalAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TemporalAdapter.java
index 91464da718..18d6400e34 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TemporalAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TemporalAdapter.java
@@ -20,7 +20,7 @@ import java.time.temporal.Temporal;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.datatype.DatatypeConfigurationException;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-import org.apache.sis.xml.privy.XmlUtilities;
+import org.apache.sis.xml.internal.shared.XmlUtilities;
import org.apache.sis.xml.bind.Context;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java
index 520a8d9465..a74c519867 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java
@@ -23,8 +23,8 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.sis.xml.bind.Context;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.xml.privy.XmlUtilities;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.xml.internal.shared.XmlUtilities;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
index e1ce2c79d1..926abc0ced 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
@@ -21,8 +21,8 @@ import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElements;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.sis.xml.bind.Context;
-import org.apache.sis.util.privy.Strings;
-import static org.apache.sis.xml.privy.LegacyNamespaces.VERSION_3_0;
+import org.apache.sis.util.internal.shared.Strings;
+import static org.apache.sis.xml.internal.shared.LegacyNamespaces.VERSION_3_0;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.temporal.Period;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/UniversalTimeAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/UniversalTimeAdapter.java
index 1c9106557c..9fe2ce4402 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/UniversalTimeAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/UniversalTimeAdapter.java
@@ -25,7 +25,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.datatype.DatatypeConfigurationException;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.sis.xml.bind.Context;
-import org.apache.sis.xml.privy.XmlUtilities;
+import org.apache.sis.xml.internal.shared.XmlUtilities;
/**
@@ -42,7 +42,7 @@ public final class UniversalTimeAdapter extends XmlAdapter<XMLGregorianCalendar,
/**
* The timezone of the date to marshal with this adapter.
*/
- private static final TimeZone UTC = TimeZone.getTimeZone(org.apache.sis.util.privy.Constants.UTC);
+ private static final TimeZone UTC = TimeZone.getTimeZone(org.apache.sis.util.internal.shared.Constants.UTC);
/**
* Empty constructor for JAXB only.
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/TM_Duration.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/TM_Duration.java
index 6f94b03432..4b7679f3b0 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/TM_Duration.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/TM_Duration.java
@@ -26,7 +26,7 @@ import javax.xml.datatype.Duration;
import javax.xml.datatype.DatatypeConfigurationException;
import jakarta.xml.bind.annotation.XmlElement;
import org.apache.sis.xml.bind.Context;
-import org.apache.sis.xml.privy.XmlUtilities;
+import org.apache.sis.xml.internal.shared.XmlUtilities;
import org.apache.sis.xml.bind.gco.PropertyType;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/package-info.java
index fbed105b5f..0c90ce3515 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/package-info.java
@@ -35,4 +35,4 @@ import jakarta.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/Country.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/Country.java
index 2226a1bdb4..17d6347e4a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/Country.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/Country.java
@@ -22,11 +22,11 @@ import jakarta.xml.bind.annotation.XmlElement;
import org.apache.sis.util.CharSequences;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.cat.CodeListUID;
import org.apache.sis.xml.bind.gco.GO_CharacterString;
import org.apache.sis.xml.bind.gco.CharSequenceAdapter;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/LocaleAndCharset.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/LocaleAndCharset.java
index 5a338870d6..0444e982f6 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/LocaleAndCharset.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/LocaleAndCharset.java
@@ -26,9 +26,9 @@ import java.util.Locale;
import java.util.Iterator;
import java.util.Objects;
import java.nio.charset.Charset;
-import org.apache.sis.util.privy.Bag;
-import org.apache.sis.util.privy.Unsafe;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.Bag;
+import org.apache.sis.util.internal.shared.Unsafe;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.TreeTable.Node;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/PT_Locale.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/PT_Locale.java
index bff8862c6a..8a7b29f6cb 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/PT_Locale.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/PT_Locale.java
@@ -29,8 +29,8 @@ import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.metadata.code.MD_CharacterSetCode;
-import org.apache.sis.xml.privy.LegacyNamespaces;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+import org.apache.sis.util.internal.shared.CollectionsExt;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_MediumNameCode.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_MediumNameCode.java
index 71a73d4ce5..ac3f4fc37c 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_MediumNameCode.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_MediumNameCode.java
@@ -19,7 +19,7 @@ package org.apache.sis.xml.bind.metadata.code;
import jakarta.xml.bind.annotation.XmlElement;
import org.apache.sis.xml.bind.cat.CodeListAdapter;
import org.apache.sis.xml.bind.cat.CodeListUID;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
// Specific to the geoapi-4.0 branch:
import org.apache.sis.metadata.iso.legacy.MediumName;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/package-info.java
index 9c82effc63..34846b0180 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/package-info.java
@@ -59,4 +59,4 @@ import jakarta.xml.bind.annotation.XmlNs;
import jakarta.xml.bind.annotation.XmlNsForm;
import jakarta.xml.bind.annotation.XmlSchema;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/Parameter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/Parameter.java
index bc9760a5eb..d61cc24d6a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/Parameter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/Parameter.java
@@ -22,7 +22,7 @@ import org.opengis.metadata.Identifier;
import org.opengis.parameter.ParameterValue;
import org.opengis.parameter.ParameterDescriptor;
import org.apache.sis.metadata.simple.SimpleIdentifiedObject;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.util.ComparisonMode;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/RS_Identifier.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/RS_Identifier.java
index 25904c5eff..335445602a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/RS_Identifier.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/RS_Identifier.java
@@ -21,7 +21,7 @@ import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.metadata.Identifier;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.*;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java
index b84bcb2473..8a6d802ea0 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java
@@ -28,12 +28,12 @@ import org.opengis.util.InternationalString;
import org.opengis.parameter.ParameterDescriptor;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gco.GO_GenericName;
-import org.apache.sis.metadata.privy.NameToIdentifier;
+import org.apache.sis.metadata.internal.shared.NameToIdentifier;
import org.apache.sis.util.iso.DefaultMemberName;
import org.apache.sis.util.iso.Names;
-import static org.apache.sis.util.privy.CollectionsExt.nonNull;
+import static org.apache.sis.util.internal.shared.CollectionsExt.nonNull;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.parameter.ParameterDirection;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/package-info.java
index a796576d9a..dd00ba844c 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/package-info.java
@@ -63,7 +63,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.metadata.MD_Identifier;
import org.apache.sis.xml.bind.metadata.DQM_Description;
import org.apache.sis.xml.bind.gco.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/ExceptionSimplifier.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/ExceptionSimplifier.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/ExceptionSimplifier.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/ExceptionSimplifier.java
index 28c1f0dee5..39c3d31365 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/ExceptionSimplifier.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/ExceptionSimplifier.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.xml.privy;
+package org.apache.sis.xml.internal.shared;
import java.util.Locale;
import java.util.logging.Level;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/ExternalLinkHandler.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/ExternalLinkHandler.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/ExternalLinkHandler.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/ExternalLinkHandler.java
index de34f2a4fd..95228e4a88 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/ExternalLinkHandler.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/ExternalLinkHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.xml.privy;
+package org.apache.sis.xml.internal.shared;
import java.io.File;
import java.io.InputStream;
@@ -30,7 +30,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.stax.StAXSource;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.xml.ReferenceResolver;
import org.apache.sis.xml.bind.Context;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/LegacyNamespaces.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/LegacyNamespaces.java
similarity index 97%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/LegacyNamespaces.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/LegacyNamespaces.java
index 1ca9c89682..a8590bd6e9 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/LegacyNamespaces.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/LegacyNamespaces.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.xml.privy;
+package org.apache.sis.xml.internal.shared;
import org.apache.sis.util.Version;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ISO_NAMESPACE;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ISO_NAMESPACE;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/StreamWriterDelegate.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/StreamWriterDelegate.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/StreamWriterDelegate.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/StreamWriterDelegate.java
index 218193e53f..58593e319b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/StreamWriterDelegate.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/StreamWriterDelegate.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.xml.privy;
+package org.apache.sis.xml.internal.shared;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.stream.XMLStreamException;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/URISource.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/URISource.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/URISource.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/URISource.java
index 76f6bf690f..bbd64d970b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/URISource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/URISource.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.xml.privy;
+package org.apache.sis.xml.internal.shared;
import java.io.File;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import javax.xml.transform.stream.StreamSource;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/XmlUtilities.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/XmlUtilities.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/XmlUtilities.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/XmlUtilities.java
index f099eb5ac1..bfb4e0e26b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/XmlUtilities.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/XmlUtilities.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.xml.privy;
+package org.apache.sis.xml.internal.shared;
import java.io.Closeable;
import java.io.IOException;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/package-info.java
rename to endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/package-info.java
index 818e5cb58c..00e0b3c20f 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/package-info.java
@@ -31,4 +31,4 @@
* @author Cullen Rombach (Image Matters)
* @author Martin Desruisseaux (Geomatys)
*/
-package org.apache.sis.xml.privy;
+package org.apache.sis.xml.internal.shared;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
index d4b004cc8e..aebf8b988a 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
@@ -26,7 +26,7 @@ import org.opengis.metadata.lineage.Source;
import org.opengis.metadata.maintenance.ScopeCode;
import org.opengis.metadata.content.FeatureCatalogueDescription;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataCopierTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataCopierTest.java
index 61bfc965b1..15a9455015 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataCopierTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataCopierTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
*
* @author Martin Desruisseaux (Geomatys)
*
- * @see org.apache.sis.metadata.privy.MergerTest
+ * @see org.apache.sis.metadata.internal.shared.MergerTest
*/
public final class MetadataCopierTest extends TestCase {
/**
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
index 5ce77cd2e0..939c7bd1d0 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
@@ -26,7 +26,7 @@ import org.opengis.util.CodeList;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.collection.CheckedContainer;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.metadata.internal.Dependencies;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/AxisDirectionsTest.md b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/AxisDirectionsTest.md
similarity index 100%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/AxisDirectionsTest.md
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/AxisDirectionsTest.md
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/AxisNamesTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/AxisNamesTest.java
similarity index 97%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/AxisNamesTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/AxisNamesTest.java
index 5029f53fcc..c0a7b03044 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/AxisNamesTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/AxisNamesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.lang.reflect.Field;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/IdentifiersTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/IdentifiersTest.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/IdentifiersTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/IdentifiersTest.java
index 0a2c00c26b..4b44260790 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/IdentifiersTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/IdentifiersTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.List;
import java.util.Arrays;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/ImplementationHelperTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/ImplementationHelperTest.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/ImplementationHelperTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/ImplementationHelperTest.java
index 3214e5f0a0..5849662af6 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/ImplementationHelperTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/ImplementationHelperTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.List;
import java.util.Arrays;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/MergerTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/MergerTest.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/MergerTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/MergerTest.java
index 9320f39740..e33959f466 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/MergerTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/MergerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import java.util.Map;
import java.util.Set;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/NameMeaningTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/NameMeaningTest.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/NameMeaningTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/NameMeaningTest.java
index 38274a21c7..79269cbd45 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/privy/NameMeaningTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/shared/NameMeaningTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.privy;
+package org.apache.sis.metadata.internal.shared;
import javax.measure.Unit;
import org.opengis.referencing.ReferenceSystem;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
index c7f066ea78..4bb272fc32 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
@@ -28,7 +28,7 @@ import org.opengis.metadata.citation.Citation;
import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.metadata.internal.CitationConstant;
import org.apache.sis.metadata.simple.SimpleCitation;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.xml.IdentifierSpace;
import static org.apache.sis.metadata.iso.citation.Citations.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index 4778f8975a..bc77cec94c 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@ -36,7 +36,7 @@ import org.opengis.metadata.citation.OnlineResource;
import org.opengis.metadata.citation.PresentationForm;
import org.apache.sis.util.SimpleInternationalString;
import org.apache.sis.util.DefaultInternationalString;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.xml.IdentifierMap;
import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.metadata.MetadataCopier;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
index a89e97419e..eecaa90ba9 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata.iso.citation;
import java.util.Set;
import jakarta.xml.bind.JAXBException;
import org.opengis.metadata.citation.Role;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
index a75f18ab41..ecf73e185e 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
@@ -23,8 +23,8 @@ import org.opengis.metadata.citation.OnLineFunction;
import org.opengis.metadata.citation.PresentationForm;
import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.URLs;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.URLs;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
index ecd7f42146..abcad6ca96 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
@@ -20,8 +20,8 @@ import java.util.Set;
import jakarta.xml.bind.JAXBException;
import org.opengis.metadata.constraint.Restriction;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ISO_NAMESPACE;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ISO_NAMESPACE;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
index d6993c41c9..fd1540afab 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.metadata.iso.content;
import jakarta.xml.bind.JAXBException;
import org.apache.sis.util.Version;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ISO_NAMESPACE;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ISO_NAMESPACE;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/ExtentsTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/ExtentsTest.java
index 6a19364377..d40bf04d61 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/ExtentsTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/ExtentsTest.java
@@ -29,7 +29,7 @@ import org.opengis.metadata.extent.GeographicBoundingBox;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.measure.Units;
import org.apache.sis.measure.MeasurementRange;
-import static org.apache.sis.metadata.privy.ReferencingServices.NAUTICAL_MILE;
+import static org.apache.sis.metadata.internal.shared.ReferencingServices.NAUTICAL_MILE;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
index b1f9ee48d4..b316afe9fa 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata.iso.identification;
import jakarta.xml.bind.JAXBException;
import org.opengis.metadata.identification.RepresentativeFraction;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.Context;
import static org.apache.sis.xml.bind.gml.MeasureTest.UOM_URL;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
index 6bac2b3e62..64bb8ae492 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata.iso.lineage;
import jakarta.xml.bind.JAXBException;
import org.opengis.metadata.lineage.Source;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.util.SimpleInternationalString;
import org.apache.sis.metadata.iso.DefaultIdentifier;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java
index 84cc4bff45..f94f637944 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java
@@ -26,9 +26,9 @@ import org.opengis.util.RecordType;
import org.opengis.util.MemberName;
import org.opengis.metadata.quality.Element;
import org.opengis.metadata.quality.QuantitativeResult;
-import org.apache.sis.metadata.privy.RecordSchemaSIS;
+import org.apache.sis.metadata.internal.shared.RecordSchemaSIS;
import org.apache.sis.xml.XML;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.util.SimpleInternationalString;
import org.apache.sis.util.iso.DefaultRecord;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
index c46acdd0bc..a96de6e515 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata.sql;
import java.sql.Statement;
import java.sql.SQLException;
import org.apache.sis.metadata.MetadataStandard;
-import org.apache.sis.metadata.sql.privy.SQLBuilder;
+import org.apache.sis.metadata.sql.internal.shared.SQLBuilder;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
index 6ff30f8380..5ff30a2a94 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
@@ -23,8 +23,8 @@ import org.opengis.metadata.citation.Citation;
import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.metadata.internal.CitationConstant;
import org.apache.sis.metadata.iso.citation.Citations;
-import static org.apache.sis.util.privy.CollectionsExt.first;
-import org.apache.sis.util.privy.Constants;
+import static org.apache.sis.util.internal.shared.CollectionsExt.first;
+import org.apache.sis.util.internal.shared.Constants;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
index 6e0456efed..62441cc233 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
@@ -38,7 +38,7 @@ import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.opengis.metadata.citation.Contact;
import org.opengis.metadata.citation.Party;
import org.opengis.metadata.citation.Responsibility;
-import org.apache.sis.util.privy.URLs;
+import org.apache.sis.util.internal.shared.URLs;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java
index 44354c5649..bbaeff6718 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java
@@ -28,9 +28,9 @@ import java.sql.SQLException;
import java.sql.SQLDataException;
import org.postgresql.ds.PGSimpleDataSource;
import org.apache.derby.jdbc.EmbeddedDataSource;
-import org.apache.sis.metadata.sql.privy.Dialect;
-import org.apache.sis.metadata.sql.privy.LocalDataSource;
-import org.apache.sis.metadata.sql.privy.ScriptRunner;
+import org.apache.sis.metadata.sql.internal.shared.Dialect;
+import org.apache.sis.metadata.sql.internal.shared.LocalDataSource;
+import org.apache.sis.metadata.sql.internal.shared.ScriptRunner;
import org.apache.sis.util.Debug;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/SQLBuilderTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/SQLBuilderTest.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/SQLBuilderTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/SQLBuilderTest.java
index 59b2e68668..0b8787f6e0 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/SQLBuilderTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/SQLBuilderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.sql.SQLException;
import java.time.LocalDate;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/SQLUtilitiesTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/SQLUtilitiesTest.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/SQLUtilitiesTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/SQLUtilitiesTest.java
index 57ddfc8a7e..2c8a911ea9 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/SQLUtilitiesTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/SQLUtilitiesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/ScriptRunnerTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/ScriptRunnerTest.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/ScriptRunnerTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/ScriptRunnerTest.java
index 4244019edc..dbbe7cf356 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/ScriptRunnerTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/ScriptRunnerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.sql.Connection;
import java.sql.SQLException;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/SupportsTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/SupportsTest.java
similarity index 97%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/SupportsTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/SupportsTest.java
index 18b2a33d45..ddc63a9061 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/SupportsTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/SupportsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.lang.reflect.Field;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/TypeMapperTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/TypeMapperTest.java
similarity index 96%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/TypeMapperTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/TypeMapperTest.java
index f42df9b46a..b3384aa091 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/privy/TypeMapperTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/internal/shared/TypeMapperTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.metadata.sql.privy;
+package org.apache.sis.metadata.sql.internal.shared;
import java.sql.Types;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/FeatureAttributeMock.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/FeatureAttributeMock.java
index 2479491fbf..fad8649cc8 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/FeatureAttributeMock.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/FeatureAttributeMock.java
@@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.util.LocalName;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gco.Multiplicity;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java
index fba91a2b18..cfc6b13a97 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java
@@ -24,8 +24,8 @@ import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.opengis.util.GenericName;
import org.opengis.referencing.IdentifiedObject;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.xml.bind.gco.GO_GenericName;
// Specific to the geoapi-4.0 branch:
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/MetadataMock.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/MetadataMock.java
index b6584fe9b6..5b6d693d32 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/MetadataMock.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/MetadataMock.java
@@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.lan.LocaleAdapter;
import org.apache.sis.metadata.simple.SimpleMetadata;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/package-info.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/package-info.java
index f49718106b..a0eb19ca51 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/package-info.java
@@ -50,4 +50,4 @@ import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.bind.gco.GO_GenericName;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultLocalNameTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultLocalNameTest.java
index 4eb66391c9..f0a549715d 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultLocalNameTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultLocalNameTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.util.iso;
-import static org.apache.sis.util.privy.Constants.EPSG;
+import static org.apache.sis.util.internal.shared.Constants.EPSG;
import static org.apache.sis.util.iso.DefaultNameSpace.DEFAULT_SEPARATOR_STRING;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/NameMarshallingTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/NameMarshallingTest.java
index 3413c940fb..9d9dad85db 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/NameMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/NameMarshallingTest.java
@@ -29,7 +29,7 @@ import org.opengis.util.NameSpace;
import org.apache.sis.xml.XML;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.MarshallerPool;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypeNamesTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypeNamesTest.java
index 47be06bad3..d14e6edee4 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypeNamesTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypeNamesTest.java
@@ -25,7 +25,7 @@ import org.opengis.util.InternationalString;
import org.opengis.metadata.Metadata;
import org.opengis.geometry.Geometry;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import static org.apache.sis.util.privy.Constants.OGC;
+import static org.apache.sis.util.internal.shared.Constants.OGC;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java
index a77ca6c5de..58e4dbf966 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java
@@ -23,9 +23,9 @@ import org.opengis.metadata.identification.DataIdentification;
import org.opengis.metadata.identification.InitiativeType;
import org.apache.sis.xml.bind.metadata.replace.ReferenceSystemMetadata;
import org.apache.sis.xml.bind.metadata.replace.SensorType;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.util.iso.Types;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ISO_NAMESPACE;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ISO_NAMESPACE;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NamespacesTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NamespacesTest.java
index 875a9027ce..8adb8f9cd0 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NamespacesTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NamespacesTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.xml;
-import static org.apache.sis.metadata.privy.ImplementationHelper.ISO_NAMESPACE;
+import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ISO_NAMESPACE;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java
index f5327f57a6..e809e7a865 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java
@@ -30,7 +30,7 @@ import jakarta.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.geoapi.schema.SchemaException;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/TransformerTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/TransformerTest.java
index 22a09bb6f8..5bd3ad013c 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/TransformerTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/TransformerTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.xml;
import java.util.Set;
import java.util.HashSet;
import java.util.Map;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/TransformingNamespacesTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/TransformingNamespacesTest.java
index 33918d5d43..b3ef68acd9 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/TransformingNamespacesTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/TransformingNamespacesTest.java
@@ -22,7 +22,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Collection;
import javax.xml.namespace.NamespaceContext;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java
index 3f3fb32bbc..77f45a4774 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.xml.XML;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.MarshallerPool;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java
index 6c7a402e7d..6039a06282 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java
@@ -29,7 +29,7 @@ import jakarta.xml.bind.JAXBException;
import org.apache.sis.xml.XML;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.MarshallerPool;
-import org.apache.sis.xml.privy.XmlUtilities;
+import org.apache.sis.xml.internal.shared.XmlUtilities;
import org.apache.sis.temporal.TemporalObjects;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/FreeTextMarshallingTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/FreeTextMarshallingTest.java
index 9cdaeb85a3..88c4aabd40 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/FreeTextMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/FreeTextMarshallingTest.java
@@ -21,7 +21,7 @@ import jakarta.xml.bind.JAXBException;
import org.opengis.metadata.citation.Citation;
import org.apache.sis.util.DefaultInternationalString;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
index a5737d98b4..0c3be2521f 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
@@ -26,8 +26,8 @@ import org.opengis.metadata.Metadata;
import org.apache.sis.xml.XML;
import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.xml.bind.cat.CodeListUID;
-import org.apache.sis.xml.privy.LegacyNamespaces;
-import static org.apache.sis.util.privy.Constants.UTC;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+import static org.apache.sis.util.internal.shared.Constants.UTC;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/privy/DocumentComparatorTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/internal/shared/DocumentComparatorTest.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/privy/DocumentComparatorTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/internal/shared/DocumentComparatorTest.java
index 859651f7e9..fe49086c64 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/privy/DocumentComparatorTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/internal/shared/DocumentComparatorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.xml.privy;
+package org.apache.sis.xml.internal.shared;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/privy/XmlUtilitiesTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/internal/shared/XmlUtilitiesTest.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/privy/XmlUtilitiesTest.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/internal/shared/XmlUtilitiesTest.java
index b54098ad63..d2bd95a0db 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/privy/XmlUtilitiesTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/internal/shared/XmlUtilitiesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.xml.privy;
+package org.apache.sis.xml.internal.shared;
import java.time.Instant;
import java.time.LocalDate;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
index 35a356c619..64aded14db 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
@@ -36,7 +36,7 @@ import org.opengis.annotation.Specification;
import org.opengis.util.CodeList;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.cat.CodeListUID;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/DocumentComparator.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/DocumentComparator.java
index cc46d720b7..33f828e359 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/DocumentComparator.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/DocumentComparator.java
@@ -45,8 +45,8 @@ import org.w3c.dom.Text;
import org.xml.sax.SAXException;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import static org.apache.sis.util.Characters.NO_BREAK_SPACE;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
index 4eb9f6ea66..f4972b414e 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
@@ -44,7 +44,7 @@ import static org.opengis.geoapi.schema.SchemaInformation.SCHEMA_ROOT_URL;
import org.apache.sis.util.Classes;
import org.apache.sis.system.Modules;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
// Test dependencies
import static org.apache.sis.test.TestCase.PENDING_FUTURE_SIS_VERSION;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
index 4c6a54088f..567e18913f 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
@@ -32,7 +32,7 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.xml.XML;
import org.apache.sis.xml.bind.Context;
-import org.apache.sis.xml.privy.LegacyNamespaces;
+import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.cat.CodeListUID;
import org.apache.sis.util.Version;
diff --git a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/Transformer.java b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/Transformer.java
index 410e1402db..ff19878346 100644
--- a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/Transformer.java
+++ b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/Transformer.java
@@ -29,7 +29,7 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.referencing.CRS;
import org.apache.sis.util.collection.Cache;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import org.apache.sis.referencing.operation.AbstractCoordinateOperation;
import org.apache.sis.storage.DataStoreException;
diff --git a/endorsed/src/org.apache.sis.openoffice/test/org/apache/sis/openoffice/ReferencingFunctionsTest.java b/endorsed/src/org.apache.sis.openoffice/test/org/apache/sis/openoffice/ReferencingFunctionsTest.java
index 9bf8f5783b..6090798534 100644
--- a/endorsed/src/org.apache.sis.openoffice/test/org/apache/sis/openoffice/ReferencingFunctionsTest.java
+++ b/endorsed/src/org.apache.sis.openoffice/test/org/apache/sis/openoffice/ReferencingFunctionsTest.java
@@ -17,8 +17,8 @@
package org.apache.sis.openoffice;
import com.sun.star.lang.IllegalArgumentException;
-import org.apache.sis.referencing.privy.Formulas;
import org.apache.sis.referencing.internal.PositionalAccuracyConstant;
+import org.apache.sis.referencing.internal.shared.Formulas;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/map/coverage/RenderingData.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/map/coverage/RenderingData.java
index 191612b4e9..95379abcb4 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/map/coverage/RenderingData.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/map/coverage/RenderingData.java
@@ -53,15 +53,15 @@ import org.apache.sis.image.ImageLayout;
import org.apache.sis.image.PlanarImage;
import org.apache.sis.image.ErrorHandler;
import org.apache.sis.image.ImageProcessor;
-import org.apache.sis.image.privy.ColorModelType;
-import org.apache.sis.image.privy.ImageUtilities;
-import org.apache.sis.coverage.privy.SampleDimensions;
+import org.apache.sis.image.internal.shared.ColorModelType;
+import org.apache.sis.image.internal.shared.ImageUtilities;
+import org.apache.sis.coverage.internal.shared.SampleDimensions;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.WraparoundApplicator;
+import org.apache.sis.referencing.internal.shared.WraparoundApplicator;
import org.apache.sis.system.Modules;
import org.apache.sis.util.Debug;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.privy.CloneAccess;
+import org.apache.sis.util.internal.shared.CloneAccess;
import org.apache.sis.io.TableAppender;
import org.apache.sis.math.Statistics;
import org.apache.sis.measure.Quantities;
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/map/coverage/RenderingWorkaround.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/map/coverage/RenderingWorkaround.java
index 39855e321e..a75d82da42 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/map/coverage/RenderingWorkaround.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/map/coverage/RenderingWorkaround.java
@@ -25,7 +25,7 @@ import java.awt.image.RenderedImage;
import java.awt.image.SampleModel;
import java.awt.image.WritableRaster;
import java.util.Vector;
-import org.apache.sis.image.privy.TilePlaceholder;
+import org.apache.sis.image.internal.shared.TilePlaceholder;
/**
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java
index 5644549f9e..a0a1c1e71c 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java
@@ -46,10 +46,10 @@ import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.TransformSeparator;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
-import org.apache.sis.referencing.privy.DirectPositionView;
-import org.apache.sis.referencing.privy.WraparoundApplicator;
-import org.apache.sis.util.privy.DoubleDouble;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.DirectPositionView;
+import org.apache.sis.referencing.internal.shared.WraparoundApplicator;
+import org.apache.sis.util.internal.shared.DoubleDouble;
import org.apache.sis.coverage.grid.IncompleteGridGeometryException;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridExtent;
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java
index e66994e3f9..f1af2c773e 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java
@@ -33,7 +33,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
-import org.apache.sis.referencing.privy.Formulas;
+import org.apache.sis.referencing.internal.shared.Formulas;
import org.apache.sis.system.Configuration;
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasExtent.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasExtent.java
index f753c7772c..08874739cd 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasExtent.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasExtent.java
@@ -32,8 +32,8 @@ import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.PixelInCell;
import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.util.internal.shared.Numerics;
/**
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasFollower.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasFollower.java
index bf31d8024f..605e69f8d7 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasFollower.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasFollower.java
@@ -34,7 +34,7 @@ import org.apache.sis.referencing.CRS;
import org.apache.sis.util.Disposable;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.geometry.DirectPosition2D;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
import org.apache.sis.referencing.operation.matrix.AffineTransforms2D;
import org.apache.sis.referencing.operation.transform.MathTransforms;
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/PlanarCanvas.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/PlanarCanvas.java
index aae2f25571..5fc91a75e9 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/PlanarCanvas.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/PlanarCanvas.java
@@ -27,7 +27,7 @@ import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.operation.matrix.AffineTransforms2D;
import org.apache.sis.referencing.operation.transform.LinearTransform;
-import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.internal.shared.AffineTransform2D;
/**
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/StyleFactory.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/StyleFactory.java
index 90e2f83f46..66a0ba3003 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/StyleFactory.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/StyleFactory.java
@@ -19,7 +19,7 @@ package org.apache.sis.style.se1;
import java.net.URI;
import java.awt.Color;
import java.util.Objects;
-import org.apache.sis.feature.privy.AttributeConvention;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.metadata.iso.citation.DefaultOnlineResource;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java
index 887b045b1f..7468e52fe8 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java
@@ -25,7 +25,7 @@ import org.opengis.util.InternationalString;
import org.opengis.metadata.extent.Extent;
import org.opengis.metadata.extent.GeographicExtent;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.metadata.ModifiableMetadata;
import org.apache.sis.metadata.MetadataCopier;
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java
index 710917dd57..4be15d87f7 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Set;
import java.util.LinkedHashSet;
import java.util.Optional;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.referencing.gazetteer.internal.Resources;
import org.apache.sis.util.iso.AbstractFactory;
import org.apache.sis.util.iso.DefaultNameSpace;
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
index ae64ff408e..804a700ff5 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
@@ -36,7 +36,7 @@ import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.crs.DefaultGeographicCRS;
-import org.apache.sis.referencing.privy.Formulas;
+import org.apache.sis.referencing.internal.shared.Formulas;
import org.apache.sis.util.Workaround;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/LocationFormat.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/LocationFormat.java
index 8b41065610..0e2cddb7d2 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/LocationFormat.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/LocationFormat.java
@@ -48,7 +48,7 @@ import org.apache.sis.measure.Longitude;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.metadata.iso.extent.DefaultExtent;
import org.apache.sis.referencing.crs.AbstractCRS;
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
index 24b59c9ba4..0db44dc3c4 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
@@ -55,8 +55,8 @@ import org.apache.sis.referencing.gazetteer.internal.Resources;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.crs.DefaultProjectedCRS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.privy.Formulas;
-import org.apache.sis.referencing.privy.IntervalRectangle;
+import org.apache.sis.referencing.internal.shared.Formulas;
+import org.apache.sis.referencing.internal.shared.IntervalRectangle;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.math.DecimalFunctions;
import org.apache.sis.util.CharSequences;
@@ -69,7 +69,7 @@ import org.apache.sis.geometry.Shapes2D;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.geometry.DirectPosition2D;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.measure.Longitude;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Quantities;
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
index 396fb336c1..07469b8e1e 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
@@ -40,9 +40,9 @@ import org.apache.sis.io.wkt.ElementKind;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.referencing.privy.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
import org.apache.sis.system.Modules;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.resources.Vocabulary;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationViewer.java b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationViewer.java
index 211711b3df..c43edb8832 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationViewer.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationViewer.java
@@ -36,7 +36,7 @@ import org.opengis.referencing.operation.MathTransform2D;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.IntervalRectangle;
+import org.apache.sis.referencing.internal.shared.IntervalRectangle;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.util.Debug;
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
index 03a81be028..8388ad73f8 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
@@ -37,7 +37,7 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.operation.provider.TransverseMercator;
import org.apache.sis.measure.Quantities;
-import static org.apache.sis.metadata.privy.ReferencingServices.NAUTICAL_MILE;
+import static org.apache.sis.metadata.internal.shared.ReferencingServices.NAUTICAL_MILE;
import static org.apache.sis.measure.Units.ARC_MINUTE;
// Test dependencies
diff --git a/endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.metadata.privy.ReferencingServices b/endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.metadata.internal.shared.ReferencingServices
similarity index 100%
rename from endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.metadata.privy.ReferencingServices
rename to endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.metadata.internal.shared.ReferencingServices
diff --git a/endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.metadata.sql.privy.Initializer b/endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.metadata.sql.internal.shared.Initializer
similarity index 100%
rename from endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.metadata.sql.privy.Initializer
rename to endorsed/src/org.apache.sis.referencing/main/META-INF/services/org.apache.sis.metadata.sql.internal.shared.Initializer
diff --git a/endorsed/src/org.apache.sis.referencing/main/module-info.java b/endorsed/src/org.apache.sis.referencing/main/module-info.java
index 74c62c3ab7..1f07a76f22 100644
--- a/endorsed/src/org.apache.sis.referencing/main/module-info.java
+++ b/endorsed/src/org.apache.sis.referencing/main/module-info.java
@@ -30,7 +30,7 @@ module org.apache.sis.referencing {
requires transitive java.desktop;
requires transitive org.apache.sis.metadata;
- provides org.apache.sis.metadata.sql.privy.Initializer
+ provides org.apache.sis.metadata.sql.internal.shared.Initializer
with org.apache.sis.referencing.internal.DatabaseListener;
provides org.opengis.referencing.RegisterOperations
@@ -157,7 +157,7 @@ module org.apache.sis.referencing {
provides org.apache.sis.xml.bind.AdapterReplacement
with org.apache.sis.xml.bind.referencing.SC_VerticalCRS;
- provides org.apache.sis.metadata.privy.ReferencingServices
+ provides org.apache.sis.metadata.internal.shared.ReferencingServices
with org.apache.sis.referencing.internal.ServicesForMetadata;
exports org.apache.sis.coordinate;
@@ -175,7 +175,7 @@ module org.apache.sis.referencing {
exports org.apache.sis.referencing.operation.matrix;
exports org.apache.sis.referencing.operation.transform;
- exports org.apache.sis.referencing.privy to
+ exports org.apache.sis.referencing.internal.shared to
org.apache.sis.referencing.gazetteer,
org.apache.sis.feature,
org.apache.sis.geometry, // In the "incubator" sub-project.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java
index 45181647ca..e083d2d655 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java
@@ -23,10 +23,10 @@ import java.time.temporal.Temporal;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.referencing.privy.WKTKeywords;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.internal.Epoch;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
index 3c5731c819..ee791a9b88 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
@@ -34,10 +34,10 @@ import org.opengis.referencing.cs.RangeMeaning;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.WKTKeywords;
-import org.apache.sis.referencing.privy.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.math.Vector;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractEnvelope.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractEnvelope.java
index 64d805f372..3b16e6ca44 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractEnvelope.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractEnvelope.java
@@ -45,13 +45,13 @@ import org.apache.sis.util.resources.Errors;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.referencing.privy.TemporalAccessor;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.TemporalAccessor;
import org.apache.sis.measure.Range;
import org.apache.sis.math.Vector;
import static java.lang.Double.doubleToLongBits;
-import static org.apache.sis.util.privy.Numerics.SIGN_BIT_MASK;
+import static org.apache.sis.util.internal.shared.Numerics.SIGN_BIT_MASK;
import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches;
import static org.apache.sis.util.StringBuilders.trimFractionalPart;
import static org.apache.sis.math.MathFunctions.epsilonEqual;
@@ -240,7 +240,7 @@ public abstract class AbstractEnvelope extends FormattableObject implements Enve
* @param axis the axis to test, or {@code null}.
* @return {@code true} if the range meaning is {@code WRAPAROUND}.
*
- * @see org.apache.sis.referencing.privy.CoordinateOperations#isWrapAround(CoordinateSystemAxis)
+ * @see org.apache.sis.referencing.internal.shared.CoordinateOperations#isWrapAround(CoordinateSystemAxis)
*/
static boolean isWrapAround(final CoordinateSystemAxis axis) {
return (axis != null) && axis.getRangeMeaning() == RangeMeaning.WRAPAROUND;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/ArrayEnvelope.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/ArrayEnvelope.java
index 5c0193b326..c8b5fd6284 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/ArrayEnvelope.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/ArrayEnvelope.java
@@ -41,7 +41,7 @@ import org.apache.sis.util.resources.Errors;
import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches;
import static org.apache.sis.math.MathFunctions.isNegative;
-import static org.apache.sis.referencing.privy.Formulas.isPoleToPole;
+import static org.apache.sis.referencing.internal.shared.Formulas.isPoleToPole;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/CoordinateFormat.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/CoordinateFormat.java
index 2f92163477..38f7b0de0f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/CoordinateFormat.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/CoordinateFormat.java
@@ -53,17 +53,17 @@ import org.opengis.referencing.datum.Ellipsoid;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.crs.DefaultTemporalCRS;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
-import org.apache.sis.referencing.privy.Formulas;
-import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.internal.shared.Formulas;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.system.Loggers;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Characters;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.LocalizedParseException;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.LocalizedParseException;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.math.DecimalFunctions;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.temporal.TemporalDate;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java
index e676c4ecb1..569f5ba933 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java
@@ -35,7 +35,7 @@ import static org.apache.sis.math.MathFunctions.isPositive;
import static org.apache.sis.math.MathFunctions.isNegative;
import static org.apache.sis.math.MathFunctions.isNegativeZero;
import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches;
-import static org.apache.sis.referencing.privy.Formulas.isPoleToPole;
+import static org.apache.sis.referencing.internal.shared.Formulas.isPoleToPole;
import static org.apache.sis.geometry.AbstractEnvelope.getAxis;
import static org.apache.sis.geometry.AbstractEnvelope.isWrapAround;
import static org.apache.sis.geometry.AbstractEnvelope.isNegativeUnsafe;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/EnvelopeReducer.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/EnvelopeReducer.java
index 48e13d4573..26fa3f0ff0 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/EnvelopeReducer.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/EnvelopeReducer.java
@@ -21,7 +21,7 @@ import org.opengis.metadata.extent.GeographicBoundingBox;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.internal.Resources;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java
index e9e49cd511..9a6399e643 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java
@@ -44,17 +44,17 @@ import org.opengis.referencing.operation.NoninvertibleTransformException;
import org.opengis.util.FactoryException;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
-import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.parameter.Parameters;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.operation.AbstractCoordinateOperation;
import org.apache.sis.referencing.operation.transform.AbstractMathTransform;
import org.apache.sis.referencing.operation.transform.WraparoundTransform;
-import org.apache.sis.referencing.privy.CoordinateOperations;
-import org.apache.sis.referencing.privy.DirectPositionView;
-import org.apache.sis.referencing.privy.TemporalAccessor;
+import org.apache.sis.referencing.internal.shared.CoordinateOperations;
+import org.apache.sis.referencing.internal.shared.DirectPositionView;
+import org.apache.sis.referencing.internal.shared.TemporalAccessor;
import org.apache.sis.system.Loggers;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java
index 72c8a46084..da06c25a8e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java
@@ -37,8 +37,8 @@ import org.opengis.geometry.DirectPosition;
import org.opengis.coordinate.MismatchedDimensionException;
import org.opengis.coordinate.MismatchedCoordinateMetadataException;
import org.opengis.metadata.extent.GeographicBoundingBox;
-import org.apache.sis.referencing.privy.TemporalAccessor;
-import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.internal.shared.TemporalAccessor;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.util.ArgumentCheckByAssertion;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.referencing.CRS;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java
index 51d85ef749..08290f34ea 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java
@@ -33,9 +33,9 @@ import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.MathTransform2D;
import org.opengis.referencing.operation.NoninvertibleTransformException;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.referencing.privy.CoordinateOperations;
-import org.apache.sis.referencing.privy.ShapeUtilities;
-import org.apache.sis.referencing.privy.IntervalRectangle;
+import org.apache.sis.referencing.internal.shared.CoordinateOperations;
+import org.apache.sis.referencing.internal.shared.ShapeUtilities;
+import org.apache.sis.referencing.internal.shared.IntervalRectangle;
import org.apache.sis.referencing.operation.AbstractCoordinateOperation;
import org.apache.sis.referencing.operation.matrix.AffineTransforms2D;
import org.apache.sis.referencing.operation.transform.MathTransforms;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/WraparoundAdjustment.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/WraparoundAdjustment.java
index 02037979ec..25e84b73fc 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/WraparoundAdjustment.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/WraparoundAdjustment.java
@@ -28,9 +28,9 @@ import org.opengis.metadata.extent.GeographicBoundingBox;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.math.MathFunctions;
-import org.apache.sis.metadata.privy.ReferencingServices;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
-import org.apache.sis.referencing.privy.WraparoundAxesFinder;
+import org.apache.sis.metadata.internal.shared.ReferencingServices;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.WraparoundAxesFinder;
import org.apache.sis.util.logging.Logging;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/WraparoundInEnvelope.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/WraparoundInEnvelope.java
index 9e22f41a24..596a2a6301 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/WraparoundInEnvelope.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/WraparoundInEnvelope.java
@@ -26,7 +26,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.parameter.ParameterNotFoundException;
import org.opengis.referencing.operation.MathTransform;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.parameter.Parameters;
import org.apache.sis.parameter.ParameterBuilder;
import org.apache.sis.metadata.iso.citation.Citations;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Colors.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Colors.java
index eb69dc40d3..2ec0645841 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Colors.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Colors.java
@@ -19,7 +19,7 @@ package org.apache.sis.io.wkt;
import java.util.EnumMap;
import java.io.Serializable;
import java.io.ObjectStreamException;
-import org.apache.sis.util.privy.X364;
+import org.apache.sis.util.internal.shared.X364;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Element.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Element.java
index b627aaa0d0..9a54dd4b82 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Element.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Element.java
@@ -31,10 +31,10 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.referencing.privy.WKTKeywords;
import org.apache.sis.referencing.internal.Resources;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.temporal.TemporalDate;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import static org.apache.sis.util.CharSequences.skipLeadingWhitespaces;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/FormattableObject.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/FormattableObject.java
index d87c8bc983..3a7da4481e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/FormattableObject.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/FormattableObject.java
@@ -24,8 +24,8 @@ import java.util.concurrent.atomic.AtomicReference;
import jakarta.xml.bind.annotation.XmlTransient;
import org.apache.sis.util.Debug;
import org.apache.sis.util.Printable;
-import org.apache.sis.util.privy.X364;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.X364;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.system.Environment;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
index 828d83f699..7aa1e3a014 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
@@ -70,9 +70,9 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.iso.Types;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.IntegerList;
-import org.apache.sis.util.privy.X364;
-import org.apache.sis.util.privy.Numerics;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.X364;
+import org.apache.sis.util.internal.shared.Numerics;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.temporal.TemporalDate;
import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.system.Configuration;
@@ -83,10 +83,10 @@ import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.referencing.AbstractIdentifiedObject;
import org.apache.sis.referencing.DefaultObjectDomain;
import org.apache.sis.referencing.ImmutableIdentifier;
-import org.apache.sis.referencing.privy.WKTKeywords;
-import org.apache.sis.referencing.privy.WKTUtilities;
import org.apache.sis.referencing.internal.Epoch;
import org.apache.sis.referencing.internal.Resources;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
import org.apache.sis.geometry.AbstractDirectPosition;
import org.apache.sis.geometry.AbstractEnvelope;
import org.apache.sis.xml.NilObject;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index c8858f1611..6496c12629 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@ -62,27 +62,27 @@ import org.apache.sis.referencing.datum.BursaWolfParameters;
import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
import org.apache.sis.referencing.operation.provider.AbstractProvider;
-import org.apache.sis.referencing.privy.CoordinateOperations;
-import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
-import org.apache.sis.referencing.privy.EllipsoidalHeightCombiner;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.referencing.privy.WKTKeywords;
import org.apache.sis.referencing.internal.Epoch;
import org.apache.sis.referencing.internal.Legacy;
import org.apache.sis.referencing.internal.VerticalDatumTypes;
import org.apache.sis.referencing.internal.PositionalAccuracyConstant;
+import org.apache.sis.referencing.internal.shared.CoordinateOperations;
+import org.apache.sis.referencing.internal.shared.ReferencingFactoryContainer;
+import org.apache.sis.referencing.internal.shared.EllipsoidalHeightCombiner;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.metadata.iso.extent.DefaultExtent;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import org.apache.sis.metadata.iso.extent.DefaultVerticalExtent;
import org.apache.sis.metadata.iso.extent.DefaultTemporalExtent;
-import org.apache.sis.metadata.privy.AxisNames;
+import org.apache.sis.metadata.internal.shared.AxisNames;
import org.apache.sis.coordinate.DefaultCoordinateMetadata;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.Numerics;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.Numerics;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.Types;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
index 2f69b0fa00..b7b8f36dc0 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
@@ -37,12 +37,12 @@ import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.MathTransformFactory;
import org.opengis.referencing.operation.NoninvertibleTransformException;
import org.opengis.referencing.operation.OperationMethod;
-import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.ReferencingFactoryContainer;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.parameter.DefaultParameterValue;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.math.DecimalFunctions;
import org.apache.sis.measure.UnitFormat;
import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/StoredTree.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/StoredTree.java
index 546f0f2a9a..411150c6b3 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/StoredTree.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/StoredTree.java
@@ -26,7 +26,7 @@ import java.util.stream.Stream;
import java.util.function.Consumer;
import java.io.Serializable;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Transliterator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Transliterator.java
index f3359384bb..fa9c3684aa 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Transliterator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Transliterator.java
@@ -24,9 +24,9 @@ import org.opengis.referencing.cs.SphericalCS;
import org.opengis.referencing.cs.EllipsoidalCS;
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.cs.AxisDirection;
-import org.apache.sis.metadata.privy.AxisNames;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.metadata.internal.shared.AxisNames;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Characters;
import org.apache.sis.util.OptionalCandidate;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/VerticalInfo.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/VerticalInfo.java
index 89bd846962..e7a3c64ccb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/VerticalInfo.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/VerticalInfo.java
@@ -28,7 +28,7 @@ import org.opengis.referencing.cs.VerticalCS;
import org.opengis.referencing.crs.CRSFactory;
import org.opengis.referencing.crs.VerticalCRS;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
-import org.apache.sis.metadata.privy.AxisNames;
+import org.apache.sis.metadata.internal.shared.AxisNames;
import org.apache.sis.metadata.iso.extent.DefaultExtent;
import org.apache.sis.metadata.iso.extent.DefaultVerticalExtent;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java
index fdbf241c8a..9c588d1947 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java
@@ -42,17 +42,17 @@ import org.opengis.referencing.NoSuchAuthorityCodeException;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
import org.apache.sis.referencing.factory.FactoryDataException;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
-import org.apache.sis.referencing.privy.WKTKeywords;
import org.apache.sis.referencing.internal.Resources;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
index e3fa29c0a6..389ad65012 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
@@ -55,11 +55,11 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.OptionalCandidate;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.system.Loggers;
import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.referencing.ImmutableIdentifier;
-import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
+import org.apache.sis.referencing.internal.shared.ReferencingFactoryContainer;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.Identifier;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java
index 8af385034e..6aa10cde32 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java
@@ -25,7 +25,7 @@ import org.opengis.parameter.ParameterDescriptor;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.parameter.GeneralParameterDescriptor;
import org.apache.sis.referencing.AbstractIdentifiedObject;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.util.ComparisonMode;
@@ -362,7 +362,7 @@ public abstract class AbstractParameterDescriptor extends AbstractIdentifiedObje
* reserved to JAXB, which will assign values to the fields using reflection.
*/
AbstractParameterDescriptor() {
- super(org.apache.sis.referencing.privy.NilReferencingObject.INSTANCE);
+ super(org.apache.sis.referencing.internal.shared.NilReferencingObject.INSTANCE);
minimumOccurs = DEFAULT_OCCURRENCE; // Default value if XML element is omitted.
maximumOccurs = DEFAULT_OCCURRENCE;
}
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java
index 9eeaf57591..9fdeacb859 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java
@@ -33,7 +33,7 @@ import org.apache.sis.util.Utilities;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.measure.Range;
import org.apache.sis.measure.MeasurementRange;
import org.apache.sis.xml.bind.Context;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
index 0a99960b07..0f370ec20d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
@@ -30,12 +30,12 @@ import org.opengis.parameter.GeneralParameterDescriptor;
import org.opengis.parameter.ParameterNotFoundException;
import org.opengis.parameter.InvalidParameterNameException;
import org.apache.sis.xml.bind.referencing.CC_OperationParameterGroup;
-import org.apache.sis.metadata.privy.ImplementationHelper;
+import org.apache.sis.metadata.internal.shared.ImplementationHelper;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.util.resources.Errors;
import static org.apache.sis.util.Utilities.deepEquals;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java
index 4467e9c98e..196ae7b824 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java
@@ -46,11 +46,11 @@ import org.apache.sis.io.wkt.ElementKind;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.gml.Measure;
import org.apache.sis.xml.bind.gml.MeasureList;
-import org.apache.sis.xml.privy.ExternalLinkHandler;
-import org.apache.sis.metadata.privy.ImplementationHelper;
+import org.apache.sis.xml.internal.shared.ExternalLinkHandler;
+import org.apache.sis.metadata.internal.shared.ImplementationHelper;
import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.math.DecimalFunctions;
import org.apache.sis.measure.Units;
import org.apache.sis.system.Loggers;
@@ -61,7 +61,7 @@ import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.Numbers;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValueGroup.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValueGroup.java
index dad8b221ed..6bb9a6ba86 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValueGroup.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValueGroup.java
@@ -35,7 +35,7 @@ import org.opengis.parameter.GeneralParameterValue;
import org.opengis.parameter.GeneralParameterDescriptor;
import org.opengis.parameter.ParameterNotFoundException;
import org.opengis.parameter.InvalidParameterCardinalityException;
-import org.apache.sis.metadata.privy.ImplementationHelper;
+import org.apache.sis.metadata.internal.shared.ImplementationHelper;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.util.LenientComparable;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/FilteredParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/FilteredParameters.java
index 7885ce1e6a..70beec3d41 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/FilteredParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/FilteredParameters.java
@@ -22,7 +22,7 @@ import java.util.function.Predicate;
import org.opengis.parameter.GeneralParameterDescriptor;
import org.opengis.parameter.GeneralParameterValue;
import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java
index 24f064bdca..986ca22775 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operation.provider.MapProjection;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Characters;
import org.apache.sis.util.Workaround;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionParameters.java
index ab058d733a..76af01b2e9 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionParameters.java
@@ -24,9 +24,9 @@ import org.opengis.parameter.ParameterDescriptor;
import org.opengis.parameter.ParameterNotFoundException;
import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
import org.apache.sis.referencing.NamedIdentifier;
-import org.apache.sis.referencing.privy.Formulas;
+import org.apache.sis.referencing.internal.shared.Formulas;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.measure.MeasurementRange;
import org.apache.sis.measure.Units;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java
index feaf72e236..88d1d54663 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.io.ObjectStreamException;
import org.opengis.parameter.ParameterDescriptor;
import org.apache.sis.referencing.NamedIdentifier;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.referencing.operation.provider.Affine;
import org.apache.sis.metadata.iso.citation.Citations;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParametersAlphaNum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParametersAlphaNum.java
index 1d63e41bbf..dc803e16e6 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParametersAlphaNum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParametersAlphaNum.java
@@ -21,9 +21,9 @@ import java.util.HashMap;
import java.io.ObjectStreamException;
import org.opengis.util.GenericName;
import org.opengis.parameter.ParameterDescriptor;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.referencing.operation.provider.EPSGName;
-import static org.apache.sis.util.privy.CollectionsExt.first;
+import static org.apache.sis.util.internal.shared.CollectionsExt.first;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java
index 995082fed4..b00b38708e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java
@@ -53,10 +53,10 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.iso.Types;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.util.privy.X364;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.util.internal.shared.X364;
import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.metadata.privy.NameToIdentifier;
+import org.apache.sis.metadata.internal.shared.NameToIdentifier;
import org.apache.sis.pending.jdk.JDK19;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java
index 24943bf64d..c15368d442 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java
@@ -39,11 +39,11 @@ import org.apache.sis.util.Characters;
import org.apache.sis.util.Deprecable;
import org.apache.sis.measure.Range;
import org.apache.sis.measure.RangeFormat;
-import org.apache.sis.metadata.privy.NameToIdentifier;
-import org.apache.sis.util.privy.X364;
-import static org.apache.sis.util.privy.X364.*;
+import org.apache.sis.metadata.internal.shared.NameToIdentifier;
+import org.apache.sis.util.internal.shared.X364;
+import static org.apache.sis.util.internal.shared.X364.*;
import static org.apache.sis.util.CharSequences.spaces;
-import static org.apache.sis.util.privy.Constants.DEFAULT_SEPARATOR;
+import static org.apache.sis.util.internal.shared.Constants.DEFAULT_SEPARATOR;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java
index 5134018ad4..343eaafe59 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java
@@ -41,7 +41,7 @@ import org.apache.sis.referencing.operation.provider.Affine;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorValues.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorValues.java
index ebc7e4359b..e614914e86 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorValues.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorValues.java
@@ -34,15 +34,15 @@ import org.opengis.parameter.ParameterNotFoundException;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.Classes;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.CloneAccess;
-import org.apache.sis.util.privy.Numerics;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.CloneAccess;
+import org.apache.sis.util.internal.shared.Numerics;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UninitializedParameter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UninitializedParameter.java
index 96269d7752..6a885340a5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UninitializedParameter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UninitializedParameter.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import org.opengis.parameter.GeneralParameterDescriptor;
import org.opengis.parameter.GeneralParameterValue;
import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValue.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValue.java
index e3d4593a62..84bc8c1aab 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValue.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValue.java
@@ -20,7 +20,7 @@ import java.net.URI;
import jakarta.xml.bind.annotation.XmlTransient;
import javax.measure.Unit;
import org.opengis.parameter.ParameterValue;
-import org.apache.sis.util.privy.Cloner;
+import org.apache.sis.util.internal.shared.Cloner;
import org.apache.sis.util.collection.WeakHashSet;
import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
index e117928a7e..cae0a5ef22 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
@@ -33,7 +33,7 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/Verifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/Verifier.java
index 3f7191b59f..736c17384a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/Verifier.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/Verifier.java
@@ -32,7 +32,7 @@ import org.apache.sis.referencing.internal.EPSGParameterDomain;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.system.Semaphores;
import org.apache.sis.util.Numbers;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.measure.Range;
import org.apache.sis.measure.Units;
import org.apache.sis.util.logging.Logging;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 645680f0de..2e5a01df09 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@ -56,12 +56,12 @@ import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.Workaround;
import org.apache.sis.util.Classes;
import org.apache.sis.util.collection.Containers;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
-import org.apache.sis.util.privy.CollectionsExt;
-import org.apache.sis.metadata.privy.NameToIdentifier;
-import org.apache.sis.metadata.privy.ImplementationHelper;
-import org.apache.sis.referencing.privy.WKTUtilities;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.CollectionsExt;
+import org.apache.sis.metadata.internal.shared.NameToIdentifier;
+import org.apache.sis.metadata.internal.shared.ImplementationHelper;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.ElementKind;
@@ -70,9 +70,9 @@ import org.apache.sis.util.iso.DefaultNameFactory;
import org.apache.sis.util.resources.Errors;
import static org.apache.sis.util.ArgumentChecks.*;
import static org.apache.sis.util.Utilities.deepEquals;
-import static org.apache.sis.util.privy.CollectionsExt.nonNull;
-import static org.apache.sis.util.privy.CollectionsExt.nonEmpty;
-import static org.apache.sis.util.privy.CollectionsExt.immutableSet;
+import static org.apache.sis.util.internal.shared.CollectionsExt.nonNull;
+import static org.apache.sis.util.internal.shared.CollectionsExt.nonEmpty;
+import static org.apache.sis.util.internal.shared.CollectionsExt.immutableSet;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.ObjectDomain;
@@ -995,7 +995,7 @@ public class AbstractIdentifiedObject extends FormattableObject implements Ident
* elements separated by hyphens:</p>
* <ul>
* <li>The code space in lower case, retaining only characters that are valid for Unicode identifiers.</li>
- * <li>The object type as defined in OGC's URN (see {@link org.apache.sis.util.privy.DefinitionURI})</li>
+ * <li>The object type as defined in OGC's URN (see {@link org.apache.sis.util.internal.shared.DefinitionURI})</li>
* <li>The object code, retaining only characters that are valid for Unicode identifiers.</li>
* </ul>
*
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java
index 40b0671ca0..769433723a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java
@@ -30,14 +30,14 @@ import org.opengis.referencing.cs.CSAuthorityFactory;
import org.opengis.referencing.crs.CRSAuthorityFactory;
import org.opengis.referencing.datum.DatumAuthorityFactory;
import org.opengis.referencing.operation.CoordinateOperationAuthorityFactory;
-import org.apache.sis.referencing.privy.LazySet;
-import org.apache.sis.referencing.privy.FilteredIterator;
+import org.apache.sis.referencing.internal.EPSGFactoryProxy;
+import org.apache.sis.referencing.internal.shared.LazySet;
+import org.apache.sis.referencing.internal.shared.FilteredIterator;
import org.apache.sis.system.Reflect;
import org.apache.sis.system.Loggers;
import org.apache.sis.system.Modules;
import org.apache.sis.system.Configuration;
import org.apache.sis.system.SystemListener;
-import org.apache.sis.referencing.internal.EPSGFactoryProxy;
import org.apache.sis.referencing.factory.MultiAuthoritiesFactory;
import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index a534aeacc8..304dc71970 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
@@ -62,13 +62,13 @@ import org.apache.sis.system.Modules;
import org.apache.sis.system.Loggers;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.ScopedIdentifier;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.referencing.privy.EllipsoidalHeightCombiner;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
-import org.apache.sis.referencing.privy.DefinitionVerifier;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.internal.PositionalAccuracyConstant;
import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.referencing.internal.shared.EllipsoidalHeightCombiner;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.DefinitionVerifier;
import org.apache.sis.referencing.cs.AxisFilter;
import org.apache.sis.referencing.cs.CoordinateSystems;
import org.apache.sis.referencing.cs.DefaultVerticalCS;
@@ -92,8 +92,8 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.OptionalCandidate;
import org.apache.sis.util.Static;
import org.apache.sis.util.Utilities;
-import org.apache.sis.util.privy.Numerics;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Numerics;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
index 12a11b590e..a462affe0d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
@@ -69,8 +69,8 @@ import org.apache.sis.referencing.crs.DefaultEngineeringCRS;
import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
import org.apache.sis.referencing.factory.UnavailableFactoryException;
import org.apache.sis.referencing.operation.provider.TransverseMercator;
-import org.apache.sis.referencing.privy.Formulas;
import org.apache.sis.referencing.internal.Resources;
+import org.apache.sis.referencing.internal.shared.Formulas;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.system.SystemListener;
import org.apache.sis.system.Modules;
@@ -79,14 +79,14 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.Utilities;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Units;
-import static org.apache.sis.util.privy.Constants.SECONDS_PER_DAY;
+import static org.apache.sis.util.internal.shared.Constants.SECONDS_PER_DAY;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.DatumEnsemble;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/DefaultObjectDomain.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/DefaultObjectDomain.java
index bb2cd1bf2c..cafb182b67 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/DefaultObjectDomain.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/DefaultObjectDomain.java
@@ -25,7 +25,7 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.xml.NilObject;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
index 83fca7a59e..65f69c2135 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
@@ -45,9 +45,9 @@ import org.apache.sis.referencing.operation.provider.TransverseMercator;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.system.Fallback;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.privy.MetadataServices;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.URLs;
+import org.apache.sis.util.internal.shared.MetadataServices;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.URLs;
import org.apache.sis.setup.InstallationResources;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java
index 4dfad99d15..73a4a1a107 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java
@@ -29,15 +29,15 @@ import org.opengis.referencing.crs.ProjectedCRS;
import org.opengis.referencing.crs.GeodeticCRS;
import org.opengis.referencing.datum.GeodeticDatum;
import org.opengis.referencing.operation.Conversion;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.referencing.cs.CoordinateSystems;
import org.apache.sis.referencing.cs.AxisFilter;
import org.apache.sis.referencing.operation.DefaultConversion;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.referencing.factory.GeodeticObjectFactory;
-import static org.apache.sis.referencing.privy.ReferencingUtilities.getPropertiesForModifiedCRS;
+import static org.apache.sis.referencing.internal.shared.ReferencingUtilities.getPropertiesForModifiedCRS;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.DatumEnsemble;
@@ -45,11 +45,11 @@ import org.opengis.referencing.datum.DatumEnsemble;
/**
* Helper class for separating the ellipsoidal height from the horizontal part of a CRS.
- * This is the converse of {@link org.apache.sis.referencing.privy.EllipsoidalHeightCombiner}.
+ * This is the converse of {@link org.apache.sis.referencing.internal.shared.EllipsoidalHeightCombiner}.
*
* @author Martin Desruisseaux (Geomatys)
*
- * @see org.apache.sis.referencing.privy.EllipsoidalHeightCombiner
+ * @see org.apache.sis.referencing.internal.shared.EllipsoidalHeightCombiner
*/
final class EllipsoidalHeightSeparator implements AxisFilter {
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodesicsOnEllipsoid.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodesicsOnEllipsoid.java
index 206a8481a9..28c882bd00 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodesicsOnEllipsoid.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodesicsOnEllipsoid.java
@@ -21,7 +21,7 @@ import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.datum.Ellipsoid;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.referencing.privy.Formulas;
+import org.apache.sis.referencing.internal.shared.Formulas;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.util.Debug;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java
index 72778a94e4..903bf749be 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java
@@ -48,16 +48,16 @@ import org.apache.sis.referencing.operation.provider.MapProjection;
import org.apache.sis.referencing.internal.PositionTransformer;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.internal.Bezier;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
-import org.apache.sis.referencing.privy.Formulas;
-import org.apache.sis.referencing.privy.ShapeUtilities;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.Formulas;
+import org.apache.sis.referencing.internal.shared.ShapeUtilities;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.Numerics;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.io.TableAppender;
-import static org.apache.sis.metadata.privy.ReferencingServices.NAUTICAL_MILE;
+import static org.apache.sis.metadata.internal.shared.ReferencingServices.NAUTICAL_MILE;
import static org.apache.sis.referencing.operation.provider.ModifiedAzimuthalEquidistant.LATITUDE_OF_ORIGIN;
import static org.apache.sis.referencing.operation.provider.ModifiedAzimuthalEquidistant.LONGITUDE_OF_ORIGIN;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
index 67e0e6a6ae..55e7361c35 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
@@ -42,16 +42,16 @@ import org.apache.sis.util.CharSequences;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.OptionalCandidate;
import org.apache.sis.util.logging.Logging;
-import org.apache.sis.util.privy.Strings;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.util.privy.DefinitionURI;
-import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.internal.shared.Strings;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.DefinitionURI;
+import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.pending.jdk.JDK21;
import org.apache.sis.xml.IdentifierSpace;
-import org.apache.sis.metadata.privy.Identifiers;
-import org.apache.sis.metadata.privy.NameMeaning;
-import org.apache.sis.metadata.privy.NameToIdentifier;
+import org.apache.sis.metadata.internal.shared.Identifiers;
+import org.apache.sis.metadata.internal.shared.NameMeaning;
+import org.apache.sis.metadata.internal.shared.NameToIdentifier;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java
index 5ab09616c4..13184eb117 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java
@@ -28,10 +28,10 @@ import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.Types;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.metadata.privy.Identifiers;
-import org.apache.sis.metadata.privy.NameMeaning;
-import org.apache.sis.referencing.privy.WKTKeywords;
-import org.apache.sis.util.privy.Strings;
+import org.apache.sis.metadata.internal.shared.Identifiers;
+import org.apache.sis.metadata.internal.shared.NameMeaning;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.Convention;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java
index b29411d79f..3529a5a59c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java
@@ -22,9 +22,9 @@ import org.opengis.util.GenericName;
import org.opengis.referencing.IdentifiedObject;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.metadata.privy.NameMeaning;
-import org.apache.sis.referencing.privy.NilReferencingObject;
-import static org.apache.sis.util.privy.Strings.appendUnicodeIdentifier;
+import org.apache.sis.metadata.internal.shared.NameMeaning;
+import org.apache.sis.referencing.internal.shared.NilReferencingObject;
+import static org.apache.sis.util.internal.shared.Strings.appendUnicodeIdentifier;
// Specific to the geoapi-4.0 branch:
import org.opengis.metadata.Identifier;
@@ -127,7 +127,7 @@ final class NameIterator implements Iterator<Identifier> {
* Then, this method returns the concatenation of the following elements separated by hyphens:</p>
* <ul>
* <li>The code space in lower case, retaining only characters that are valid for Unicode identifiers.</li>
- * <li>The object type as defined in OGC's URN (see {@link org.apache.sis.util.privy.DefinitionURI})</li>
+ * <li>The object type as defined in OGC's URN (see {@link org.apache.sis.util.internal.shared.DefinitionURI})</li>
* <li>The object code, retaining only characters that are valid for Unicode identifiers.</li>
* </ul>
*
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java
index f96a89a977..956bf79950 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java
@@ -33,7 +33,7 @@ import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.opengis.parameter.InvalidParameterValueException;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.metadata.privy.NameToIdentifier;
+import org.apache.sis.metadata.internal.shared.NameToIdentifier;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.util.iso.DefaultNameFactory;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
index 8976492e8d..ff0fc309ec 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
@@ -28,8 +28,8 @@ import org.opengis.referencing.operation.OperationMethod;
import org.opengis.referencing.operation.SingleOperation;
import org.opengis.metadata.quality.PositionalAccuracy;
import org.apache.sis.util.Deprecable;
-import org.apache.sis.util.privy.AbstractMap;
-import org.apache.sis.referencing.privy.CoordinateOperations;
+import org.apache.sis.util.internal.shared.AbstractMap;
+import org.apache.sis.referencing.internal.shared.CoordinateOperations;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.ObjectDomain;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
index ea5b50da9c..2c0621d8eb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
@@ -45,8 +45,8 @@ import static org.opengis.referencing.IdentifiedObject.ALIAS_KEY;
import static org.opengis.referencing.IdentifiedObject.REMARKS_KEY;
import static org.opengis.referencing.IdentifiedObject.IDENTIFIERS_KEY;
import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.util.privy.Constants;
-import org.apache.sis.metadata.privy.AxisNames;
+import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.metadata.internal.shared.AxisNames;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.operation.DefaultConversion;
import org.apache.sis.referencing.operation.provider.Mercator1SP;
@@ -74,7 +74,7 @@ import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactor
import org.apache.sis.measure.Longitude;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Units;
-import static org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS;
+import static org.apache.sis.metadata.internal.shared.ReferencingServices.AUTHALIC_RADIUS;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.DatumEnsemble;
@@ -103,7 +103,7 @@ final class StandardDefinitions {
/**
* The <abbr>EPSG</abbr> code for Greenwich meridian.
*
- * @see org.apache.sis.util.privy.Constants#EPSG_GREENWICH
+ * @see org.apache.sis.util.internal.shared.Constants#EPSG_GREENWICH
*/
static final String GREENWICH = "8901";
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
index 67bbf37967..c2aeda8b6f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
@@ -36,8 +36,8 @@ import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis;
import org.apache.sis.referencing.datum.AbstractDatum;
import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
-import org.apache.sis.metadata.privy.ImplementationHelper;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
+import org.apache.sis.metadata.internal.shared.ImplementationHelper;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.io.wkt.Formatter;
@@ -594,7 +594,7 @@ public class AbstractCRS extends AbstractReferenceSystem implements CoordinateRe
* reserved to JAXB, which will assign values to the fields using reflection.
*/
AbstractCRS() {
- super(org.apache.sis.referencing.privy.NilReferencingObject.INSTANCE);
+ super(org.apache.sis.referencing.internal.shared.NilReferencingObject.INSTANCE);
forConvention = forConvention();
/*
* The coordinate system is mandatory for SIS working. We do not verify its presence here
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
index dba0e2c4c1..87a2411190 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
@@ -33,10 +33,10 @@ import org.opengis.referencing.operation.MathTransformFactory;
import org.apache.sis.referencing.GeodeticException;
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.referencing.operation.DefaultConversion;
-import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
+import org.apache.sis.referencing.internal.shared.ReferencingFactoryContainer;
import org.apache.sis.xml.bind.referencing.CC_Conversion;
-import org.apache.sis.metadata.privy.ImplementationHelper;
-import org.apache.sis.metadata.privy.Identifiers;
+import org.apache.sis.metadata.internal.shared.ImplementationHelper;
+import org.apache.sis.metadata.internal.shared.Identifiers;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.system.Semaphores;
import org.apache.sis.util.Utilities;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
index 70690e8e25..4b23a3ebda 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
@@ -32,7 +32,7 @@ import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
-import org.apache.sis.metadata.privy.ImplementationHelper;
+import org.apache.sis.metadata.internal.shared.ImplementationHelper;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.DatumEnsemble;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
index fb2ba4b411..f659e9d9e0 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
@@ -40,17 +40,17 @@ import org.apache.sis.referencing.AbstractReferenceSystem;
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.cs.DefaultCompoundCS;
-import org.apache.sis.referencing.privy.WKTKeywords;
-import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
import org.apache.sis.referencing.internal.Resources;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.collection.CheckedContainer;
import org.apache.sis.util.collection.Containers;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.xml.bind.referencing.SC_CRS;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.Convention;
@@ -60,7 +60,7 @@ import java.util.Collection;
import java.util.NoSuchElementException;
import org.opengis.referencing.crs.ParametricCRS;
import org.apache.sis.xml.NilObject;
-import org.apache.sis.metadata.privy.Identifiers;
+import org.apache.sis.metadata.internal.shared.Identifiers;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
index fb7b9fd5c6..579812d24e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
@@ -51,9 +51,9 @@ import org.apache.sis.referencing.cs.CoordinateSystems;
import org.apache.sis.xml.bind.referencing.SC_SingleCRS;
import org.apache.sis.xml.bind.referencing.SC_DerivedCRSType;
import org.apache.sis.xml.bind.referencing.CS_CoordinateSystem;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
-import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import static org.apache.sis.referencing.internal.Legacy.DERIVED_TYPE_KEY;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.io.wkt.Formatter;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
index a20f930a20..abaa0874b4 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.AbstractReferenceSystem;
import org.apache.sis.referencing.cs.*;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
import org.apache.sis.referencing.datum.DefaultEngineeringDatum;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.xml.bind.referencing.CS_CoordinateSystem;
import org.apache.sis.io.wkt.Formatter;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
index 7071186029..a28a78e3e7 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
@@ -37,10 +37,10 @@ import org.apache.sis.referencing.datum.DatumOrEnsemble;
import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
import org.apache.sis.referencing.datum.DefaultPrimeMeridian;
import org.apache.sis.referencing.internal.Legacy;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.referencing.privy.WKTKeywords;
-import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.io.wkt.Formatter;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
index 219b2fda34..ac51cf8840 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
@@ -37,11 +37,11 @@ import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.measure.Longitude;
-import static org.apache.sis.util.privy.Constants.CRS;
-import static org.apache.sis.util.privy.Constants.EPSG;
-import static org.apache.sis.util.privy.Constants.CRS27;
-import static org.apache.sis.util.privy.Constants.CRS83;
-import static org.apache.sis.util.privy.Constants.CRS84;
+import static org.apache.sis.util.internal.shared.Constants.CRS;
+import static org.apache.sis.util.internal.shared.Constants.EPSG;
+import static org.apache.sis.util.internal.shared.Constants.CRS27;
+import static org.apache.sis.util.internal.shared.Constants.CRS83;
+import static org.apache.sis.util.internal.shared.Constants.CRS84;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.DatumEnsemble;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultImageCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultImageCRS.java
index 7ecf7a1fc8..37172f5dc6 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultImageCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultImageCRS.java
@@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.referencing.cs.AffineCS;
import org.opengis.referencing.cs.CartesianCS;
import org.apache.sis.referencing.AbstractReferenceSystem;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.io.wkt.Formatter;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java
index fb35dde03a..cfa269935c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java
@@ -20,7 +20,7 @@ import java.util.Map;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.referencing.datum.DefaultParametricDatum;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
index d07064f1b0..c58440eb67 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
@@ -30,10 +30,10 @@ import org.opengis.referencing.datum.GeodeticDatum;
import org.opengis.referencing.operation.Conversion;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.cs.AbstractCS;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.referencing.privy.WKTKeywords;
-import org.apache.sis.referencing.privy.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
index b9c063073e..6c90e2b14f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
@@ -39,12 +39,12 @@ import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
import org.apache.sis.referencing.datum.DefaultTemporalDatum;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.measure.Units;
import org.apache.sis.math.Fraction;
-import static org.apache.sis.util.privy.Constants.NANOS_PER_SECOND;
-import static org.apache.sis.util.privy.Constants.MILLIS_PER_SECOND;
+import static org.apache.sis.util.internal.shared.Constants.NANOS_PER_SECOND;
+import static org.apache.sis.util.internal.shared.Constants.MILLIS_PER_SECOND;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.DatumEnsemble;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
index 75f7420703..e5ceb2785b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
import org.apache.sis.referencing.datum.DefaultVerticalDatum;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.io.wkt.Formatter;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DynamicCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DynamicCRS.java
index 23290ce2aa..8ec36c70c4 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DynamicCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DynamicCRS.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.datum.Datum;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.referencing.internal.Epoch;
-import org.apache.sis.referencing.privy.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.DynamicReferenceFrame;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/ExplicitParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/ExplicitParameters.java
index f49c4ab2eb..fb8f8ff0fb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/ExplicitParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/ExplicitParameters.java
@@ -24,9 +24,9 @@ import org.opengis.referencing.operation.Conversion;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
import org.apache.sis.referencing.operation.DefaultOperationMethod;
-import org.apache.sis.referencing.privy.WKTKeywords;
-import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.util.logging.Logging;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
index bf475d5164..ca5703ad3c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
@@ -39,15 +39,15 @@ import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.referencing.AbstractIdentifiedObject;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.referencing.privy.WKTKeywords;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
import org.apache.sis.referencing.internal.Resources;
+import org.apache.sis.referencing.internal.shared.WKTUtilities;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.referencing.internal.shared.WKTKeywords;
+import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.system.Modules;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.io.wkt.ElementKind;
@@ -678,7 +678,7 @@ next: for (final CoordinateSystemAxis axis : axes) {
*/
@SuppressWarnings("this-escape")
AbstractCS() {
- super(org.apache.sis.referencing.privy.NilReferencingObject.INSTANCE);
+ super(org.apache.sis.referencing.internal.shared.NilReferencingObject.INSTANCE);
forConvention = forConvention(this);
axes = EMPTY;
/*
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxesConvention.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxesConvention.java
index 87f8875454..ce1ff0569d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxesConvention.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxesConvention.java
@@ -20,7 +20,7 @@ import javax.measure.Unit;
import org.opengis.referencing.cs.AxisDirection;
import org.opengis.referencing.cs.CoordinateSystem; // For javadoc
import org.opengis.referencing.cs.CoordinateSystemAxis;
-import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Codes.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Codes.java
index 2e8f370670..2d4ba20552 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Codes.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Codes.java
@@ -24,8 +24,8 @@ import org.opengis.referencing.cs.AxisDirection;
import org.opengis.referencing.cs.CoordinateSystem;
import org.apache.sis.measure.Units;
import org.apache.sis.util.ArraysExt;
-import static org.apache.sis.util.privy.Constants.EPSG_METRE;
-import static org.apache.sis.util.privy.Constants.EPSG_AXIS_DEGREES;
+import static org.apache.sis.util.internal.shared.Constants.EPSG_METRE;
+import static org.apache.sis.util.internal.shared.Constants.EPSG_AXIS_DEGREES;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
index 85cabcae27..caed042182 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
@@ -41,10 +41,10 @@ import org.apache.sis.util.Static;
import org.apache.sis.util.Classes;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.logging.Logging;
-import org.apache.sis.util.privy.DoubleDouble;
-import org.apache.sis.referencing.privy.AxisDirections;
-import org.apache.sis.referencing.privy.Formulas;
+import org.apache.sis.util.internal.shared.DoubleDouble;
import org.apache.sis.referencing.internal.Resources;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
+import org.apache.sis.referencing.internal.shared.Formulas;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultAffineCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultAffineCS.java
index debcf1f61a..c8d0bdab06 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultAffineCS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultAffineCS.java
@@ -24,7 +24,7 @@ import org.opengis.referencing.cs.AffineCS;
import org.opengis.referencing.cs.CartesianCS;
import org.opengis.referencing.cs.AxisDirection;
import org.opengis.referencing.cs.CoordinateSystemAxis;
-import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java
index 7d77b4a6fa..d8b5e46217 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java
@@ -22,12 +22,12 @@ import java.util.Objects;
import jakarta.xml.bind.annotation.XmlTransient;
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.cs.CoordinateSystemAxis;
-import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.Workaround;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
... 10863 lines suppressed ...