diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java b/rugged-core/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
index a17d742bbbe3e9c9f85a390bcf93c669526f2a77..5dfa5fd3a6f38dcb8d4145df5391127efdef5e3f 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
@@ -21,7 +21,7 @@ import org.orekit.bodies.GeodeticPoint;
 import org.orekit.errors.OrekitException;
 import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.core.dem.IntersectionAlgorithm;
+import org.orekit.rugged.core.raster.IntersectionAlgorithm;
 
 /** Intersection ignoring Digital Elevation Model.
  * <p>
diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/RuggedImpl.java b/rugged-core/src/main/java/org/orekit/rugged/core/RuggedImpl.java
index 35be86d10ca3b40f87f36d2af0e1d716011aa562..9a8fb8b2412b96b4ea0ca04f9639bbacb12720fe 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/RuggedImpl.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/RuggedImpl.java
@@ -47,8 +47,8 @@ import org.orekit.rugged.api.SatellitePV;
 import org.orekit.rugged.api.SatelliteQ;
 import org.orekit.rugged.api.SensorPixel;
 import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.core.dem.IntersectionAlgorithm;
 import org.orekit.rugged.core.duvenhage.DuvenhageAlgorithm;
+import org.orekit.rugged.core.raster.IntersectionAlgorithm;
 import org.orekit.time.AbsoluteDate;
 import org.orekit.time.TimeScale;
 import org.orekit.time.TimeScalesFactory;
diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
index 73e70f49f1bc020e88abe13b97beed30b4495296..1cc381b4a1a8299cb4a21453bfaebed76b917a2d 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
@@ -26,9 +26,9 @@ import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.RuggedMessages;
 import org.orekit.rugged.api.TileUpdater;
 import org.orekit.rugged.core.ExtendedEllipsoid;
-import org.orekit.rugged.core.dem.IntersectionAlgorithm;
-import org.orekit.rugged.core.dem.Tile;
-import org.orekit.rugged.core.dem.TilesCache;
+import org.orekit.rugged.core.raster.IntersectionAlgorithm;
+import org.orekit.rugged.core.raster.Tile;
+import org.orekit.rugged.core.raster.TilesCache;
 
 /** Digital Elevation Model intersection using Duvenhage's algorithm.
  * <p>
diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java
index 171c457ec6b5682fad6c5e6bf0542402bc69f9fd..77bc7931288d5b7939b93138a477e463334df04a 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java
@@ -19,8 +19,8 @@ package org.orekit.rugged.core.duvenhage;
 import org.apache.commons.math3.analysis.BivariateFunction;
 import org.apache.commons.math3.analysis.function.Max;
 import org.apache.commons.math3.analysis.function.Min;
-import org.orekit.rugged.core.dem.SimpleTile;
-import org.orekit.rugged.core.dem.Tile;
+import org.orekit.rugged.core.raster.SimpleTile;
+import org.orekit.rugged.core.raster.Tile;
 
 /** Simple implementation of a {@link Tile} with a min/max kd tree.
  * @see MinMaxTreeTileFactory
diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java
index 259d81acb9d4745222b501ed55ab2d1b9afb1c64..186e16b79d1085f3b536b6876fd120b054f94b36 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java
@@ -16,7 +16,7 @@
  */
 package org.orekit.rugged.core.duvenhage;
 
-import org.orekit.rugged.core.dem.TileFactory;
+import org.orekit.rugged.core.raster.TileFactory;
 
 /** Simple implementation of a {@link TileFactory} for {@link MinMaxTreeTile}.
  * @author Luc Maisonobe
diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/IntersectionAlgorithm.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java
similarity index 98%
rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/IntersectionAlgorithm.java
rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java
index 7eed2dba71810399926240a0434620ed413e3450..9a50e6bee2650bf4a94e4a2b8a6a1482b42b0b08 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/IntersectionAlgorithm.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.dem;
+package org.orekit.rugged.core.raster;
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.orekit.bodies.GeodeticPoint;
diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTile.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTile.java
similarity index 99%
rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTile.java
rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTile.java
index 832d8ae21a34d2b72b74c8bf0831f20670fc6e8f..066b3fb88d27dee4c940af9dd87dbb219eb2b966 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTile.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTile.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.dem;
+package org.orekit.rugged.core.raster;
 
 import org.apache.commons.math3.util.FastMath;
 import org.orekit.rugged.api.RuggedException;
diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTileFactory.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTileFactory.java
similarity index 92%
rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTileFactory.java
rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTileFactory.java
index ffd7a8d54c43124961d822066dc1148b7334a55e..7fa780857cd2a10fae38d40e19123ac6d7e7c347 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTileFactory.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTileFactory.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.dem;
+package org.orekit.rugged.core.raster;
 
-import org.orekit.rugged.core.dem.TileFactory;
+import org.orekit.rugged.core.raster.TileFactory;
 
 /** Simple implementation of a {@link TileFactory} for {@link SimpleTile}.
  * @author Luc Maisonobe
diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/Tile.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/Tile.java
similarity index 99%
rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/Tile.java
rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/Tile.java
index 1e02b64f42b769134613b8f5f3abc403968c1fc6..a2c9d60d7b112eb227f24ad7e447c146c56d14b3 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/Tile.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/Tile.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.dem;
+package org.orekit.rugged.core.raster;
 
 import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.UpdatableTile;
diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/TileFactory.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/TileFactory.java
similarity index 96%
rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/TileFactory.java
rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/TileFactory.java
index 14425da6bff9dc113ea63f78460328d573bf34c5..2e5c7d1fec9a416c194af17eccece1d8bd760e34 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/TileFactory.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/TileFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.dem;
+package org.orekit.rugged.core.raster;
 
 
 /** Interface representing a factory for raster tile.
diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/TilesCache.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/TilesCache.java
similarity index 99%
rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/TilesCache.java
rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/TilesCache.java
index 0d0ed1e7db6644df0c7a2a0ad55fccdf173bc775..4fe48a9d6c055ae4ce0b71cc2b39d36706ccf488 100644
--- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/TilesCache.java
+++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/TilesCache.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.dem;
+package org.orekit.rugged.core.raster;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.core.dem.Tile.Location;
+import org.orekit.rugged.core.raster.Tile.Location;
 
 /** Cache for Digital Elevation Model {@link Tile tiles}.
  * <p>
diff --git a/rugged-core/src/test/java/org/orekit/rugged/core/dem/CheckedPatternElevationUpdater.java b/rugged-core/src/test/java/org/orekit/rugged/core/raster/CheckedPatternElevationUpdater.java
similarity index 98%
rename from rugged-core/src/test/java/org/orekit/rugged/core/dem/CheckedPatternElevationUpdater.java
rename to rugged-core/src/test/java/org/orekit/rugged/core/raster/CheckedPatternElevationUpdater.java
index 1be46f08e2fcc1e50621f2225944f06f854889d1..3ea300d779f42ee29aa30e3b67690ca3d42bebb7 100644
--- a/rugged-core/src/test/java/org/orekit/rugged/core/dem/CheckedPatternElevationUpdater.java
+++ b/rugged-core/src/test/java/org/orekit/rugged/core/raster/CheckedPatternElevationUpdater.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.dem;
+package org.orekit.rugged.core.raster;
 
 import org.apache.commons.math3.util.FastMath;
 import org.orekit.rugged.api.RuggedException;
diff --git a/rugged-core/src/test/java/org/orekit/rugged/core/dem/CountingFactory.java b/rugged-core/src/test/java/org/orekit/rugged/core/raster/CountingFactory.java
similarity index 86%
rename from rugged-core/src/test/java/org/orekit/rugged/core/dem/CountingFactory.java
rename to rugged-core/src/test/java/org/orekit/rugged/core/raster/CountingFactory.java
index e48453e2b0579f5fc4cd403c3cda90382edc5ca7..c336fa4aca067c6dcf58692f854500fd3913c8cc 100644
--- a/rugged-core/src/test/java/org/orekit/rugged/core/dem/CountingFactory.java
+++ b/rugged-core/src/test/java/org/orekit/rugged/core/raster/CountingFactory.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.dem;
+package org.orekit.rugged.core.raster;
 
-import org.orekit.rugged.core.dem.SimpleTile;
-import org.orekit.rugged.core.dem.SimpleTileFactory;
-import org.orekit.rugged.core.dem.TileFactory;
+import org.orekit.rugged.core.raster.SimpleTile;
+import org.orekit.rugged.core.raster.SimpleTileFactory;
+import org.orekit.rugged.core.raster.TileFactory;
 
 public class CountingFactory implements TileFactory<SimpleTile> {
 
diff --git a/rugged-core/src/test/java/org/orekit/rugged/core/dem/SimpleTileTest.java b/rugged-core/src/test/java/org/orekit/rugged/core/raster/SimpleTileTest.java
similarity index 97%
rename from rugged-core/src/test/java/org/orekit/rugged/core/dem/SimpleTileTest.java
rename to rugged-core/src/test/java/org/orekit/rugged/core/raster/SimpleTileTest.java
index bab7daf50d3287695bfb94f2104fb29085b10573..61e05f417f814813abb9c6350c678f7ce9918601 100644
--- a/rugged-core/src/test/java/org/orekit/rugged/core/dem/SimpleTileTest.java
+++ b/rugged-core/src/test/java/org/orekit/rugged/core/raster/SimpleTileTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.dem;
+package org.orekit.rugged.core.raster;
 
 import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.RuggedMessages;
-import org.orekit.rugged.core.dem.SimpleTile;
-import org.orekit.rugged.core.dem.SimpleTileFactory;
-import org.orekit.rugged.core.dem.Tile;
-import org.orekit.rugged.core.dem.Tile.Location;
+import org.orekit.rugged.core.raster.SimpleTile;
+import org.orekit.rugged.core.raster.SimpleTileFactory;
+import org.orekit.rugged.core.raster.Tile;
+import org.orekit.rugged.core.raster.Tile.Location;
 
 public class SimpleTileTest {
 
diff --git a/rugged-core/src/test/java/org/orekit/rugged/core/dem/TilesCacheTest.java b/rugged-core/src/test/java/org/orekit/rugged/core/raster/TilesCacheTest.java
similarity index 98%
rename from rugged-core/src/test/java/org/orekit/rugged/core/dem/TilesCacheTest.java
rename to rugged-core/src/test/java/org/orekit/rugged/core/raster/TilesCacheTest.java
index ce18aee93084de5bf87cae9982c190896d8dc8cc..ea9102e33bfa6803c02f68b50158d86a0767a9e7 100644
--- a/rugged-core/src/test/java/org/orekit/rugged/core/dem/TilesCacheTest.java
+++ b/rugged-core/src/test/java/org/orekit/rugged/core/raster/TilesCacheTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.dem;
+package org.orekit.rugged.core.raster;
 
 import org.apache.commons.math3.random.RandomGenerator;
 import org.apache.commons.math3.random.Well19937a;
@@ -22,8 +22,8 @@ import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.core.dem.SimpleTile;
-import org.orekit.rugged.core.dem.TilesCache;
+import org.orekit.rugged.core.raster.SimpleTile;
+import org.orekit.rugged.core.raster.TilesCache;
 
 public class TilesCacheTest {