diff --git a/geowebcache/georss/src/main/java/org/geowebcache/georss/GeometryRasterMaskBuilder.java b/geowebcache/georss/src/main/java/org/geowebcache/georss/GeometryRasterMaskBuilder.java
index 29536a15f..413d69854 100644
--- a/geowebcache/georss/src/main/java/org/geowebcache/georss/GeometryRasterMaskBuilder.java
+++ b/geowebcache/georss/src/main/java/org/geowebcache/georss/GeometryRasterMaskBuilder.java
@@ -23,21 +23,21 @@
 import java.awt.image.BufferedImage;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.geotools.api.geometry.MismatchedDimensionException;
+import org.geotools.api.referencing.datum.PixelInCell;
+import org.geotools.api.referencing.operation.MathTransform;
+import org.geotools.api.referencing.operation.NoninvertibleTransformException;
+import org.geotools.api.referencing.operation.TransformException;
 import org.geotools.coverage.grid.GridEnvelope2D;
-import org.geotools.geometry.Envelope2D;
 import org.geotools.geometry.jts.JTS;
 import org.geotools.geometry.jts.LiteShape;
+import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.operation.builder.GridToEnvelopeMapper;
 import org.geotools.util.logging.Logging;
 import org.geowebcache.grid.BoundingBox;
 import org.geowebcache.grid.GridSubset;
 import org.locationtech.jts.geom.Envelope;
 import org.locationtech.jts.geom.Geometry;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.datum.PixelInCell;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.NoninvertibleTransformException;
-import org.opengis.referencing.operation.TransformException;
 
 /**
  * An object that builds a mask of tiles affected by geometries
@@ -222,7 +222,7 @@ private MathTransform getWorldToGridTransform(
         // Convert the JTS envelope and get the transform
         //
         // //
-        final Envelope2D genvelope = new Envelope2D();
+        final ReferencedEnvelope genvelope = new ReferencedEnvelope();
         {
             // genvelope.setCoordinateReferenceSystem(layerCrs);
             double x = coverageBounds.getMinX();
diff --git a/geowebcache/mbtiles/src/main/java/org/geowebcache/mbtiles/layer/MBTilesInfo.java b/geowebcache/mbtiles/src/main/java/org/geowebcache/mbtiles/layer/MBTilesInfo.java
index 9d61726ad..e767daf7c 100644
--- a/geowebcache/mbtiles/src/main/java/org/geowebcache/mbtiles/layer/MBTilesInfo.java
+++ b/geowebcache/mbtiles/src/main/java/org/geowebcache/mbtiles/layer/MBTilesInfo.java
@@ -24,6 +24,10 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.geotools.api.geometry.Bounds;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.operation.TransformException;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.mbtiles.MBTilesFile;
 import org.geotools.mbtiles.MBTilesMetadata;
@@ -32,10 +36,6 @@
 import org.geowebcache.grid.BoundingBox;
 import org.geowebcache.layer.meta.TileJSON;
 import org.geowebcache.layer.meta.VectorLayerMetadata;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.TransformException;
 
 /** Info Object storing basic MBTiles Cached info */
 public class MBTilesInfo {
@@ -96,7 +96,7 @@ public MBTilesInfo(MBTilesFile file) throws IOException {
         minZoom = metadata.getMinZoom();
         maxZoom = metadata.getMaxZoom();
 
-        Envelope env = metadata.getBounds();
+        Bounds env = metadata.getBounds();
         ReferencedEnvelope envelope = null;
         if (env != null) {
             try {
@@ -122,7 +122,7 @@ public MBTilesInfo(MBTilesFile file) throws IOException {
         bounds = getBBoxFromEnvelope(envelope);
     }
 
-    private BoundingBox getBBoxFromEnvelope(Envelope envelope) {
+    private BoundingBox getBBoxFromEnvelope(Bounds envelope) {
         BoundingBox bbox = null;
         if (envelope != null) {
             bbox =