diff --git a/src/main/java/it/unibz/inf/isoga/coverage/CoverageBuilder.java b/src/main/java/it/unibz/inf/isoga/coverage/CoverageBuilder.java
index 944ea36538368fcf468729975db150297a6f2354..d2508e85260669fae44a1d7a60f763e32c683e8e 100644
--- a/src/main/java/it/unibz/inf/isoga/coverage/CoverageBuilder.java
+++ b/src/main/java/it/unibz/inf/isoga/coverage/CoverageBuilder.java
@@ -1,7 +1,7 @@
 package it.unibz.inf.isoga.coverage;
 
 import it.unibz.inf.isochrone.util.EnumContainer.Mode;
-import it.unibz.inf.isoga.db.IsogaDatabase;
+import it.unibz.inf.isoga.db.DatabaseWeb;
 import it.unibz.inf.isoga.util.ConfigWeb;
 import it.unibz.inf.isoga.util.MathHelper;
 
@@ -21,14 +21,14 @@ public class CoverageBuilder {
 	private static final int FULL_CIRCLE_DEGREE = 360;
 	private final ConfigWeb config;
 	private final Mode mode;
-	private final IsogaDatabase db;
+	private final DatabaseWeb db;
 	private final Set<Integer> exploredEdges = new HashSet<Integer>();
 	private long timeBufferQuery;
 
 	public CoverageBuilder(final ConfigWeb config, final Mode mode) {
 		this.config = config;
 		this.mode = mode;
-		db = new IsogaDatabase(config);
+		db = new DatabaseWeb(config);
 	}
 
 	/**
diff --git a/src/main/java/it/unibz/inf/isoga/db/IsogaDatabase.java b/src/main/java/it/unibz/inf/isoga/db/DatabaseWeb.java
similarity index 98%
rename from src/main/java/it/unibz/inf/isoga/db/IsogaDatabase.java
rename to src/main/java/it/unibz/inf/isoga/db/DatabaseWeb.java
index 968cbeea968e154bc363d235ddb7972378aad2af..ec0fc9b8cc24c05fffe607cb3432b9c9ddc996c7 100644
--- a/src/main/java/it/unibz/inf/isoga/db/IsogaDatabase.java
+++ b/src/main/java/it/unibz/inf/isoga/db/DatabaseWeb.java
@@ -42,7 +42,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
  * interface. (Mostly inserting vertices and links into the tables
  * used for the GeoServer)
  */
-public class IsogaDatabase extends Database<ConfigWeb> {
+public class DatabaseWeb extends Database<ConfigWeb> {
 	private final String queryGetIsoEdges;
 	private final String queryStoreLinks;
 	private final String queryStorePartialLinks;
@@ -50,7 +50,7 @@ public class IsogaDatabase extends Database<ConfigWeb> {
 	private final String queryInsertVertexAnnotation;
 	private final String queryUpdateVertices;
 
-	public IsogaDatabase(final ConfigWeb cfg) {
+	public DatabaseWeb(final ConfigWeb cfg) {
 		// FIXME: Should we really use direction OUTGOING here? (should this be a parameter)
 		super(cfg, Direction.OUTGOING);
 
@@ -79,7 +79,7 @@ public class IsogaDatabase extends Database<ConfigWeb> {
 				+ cfg.getDestinationVertexTableEntry().getTableName() + ".\"ROUTE_ID\">=0";
 	}
 
-	public IsogaDatabase(final ConfigWeb config, final Mode mode) {
+	public DatabaseWeb(final ConfigWeb config, final Mode mode) {
 		this(config);
 		this.mode = mode;
 	}
diff --git a/src/main/java/it/unibz/inf/isoga/network/MemoryBBoxOutput.java b/src/main/java/it/unibz/inf/isoga/network/MemoryBBoxOutput.java
index ec31ba2c2575260cac416b8645a68696350c0d4c..de1d2c21dbb1e42cccebbdf52c7cf2c0a00e6301 100644
--- a/src/main/java/it/unibz/inf/isoga/network/MemoryBBoxOutput.java
+++ b/src/main/java/it/unibz/inf/isoga/network/MemoryBBoxOutput.java
@@ -2,7 +2,7 @@ package it.unibz.inf.isoga.network;
 
 import it.unibz.inf.isochrone.network.MemoryOutput;
 import it.unibz.inf.isochrone.network.Node;
-import it.unibz.inf.isoga.db.IsogaDatabase;
+import it.unibz.inf.isoga.db.DatabaseWeb;
 import it.unibz.inf.isoga.geometry.BBox;
 import it.unibz.inf.isoga.util.ConfigWeb;
 
@@ -22,7 +22,7 @@ import org.apache.commons.dbutils.DbUtils;
 public class MemoryBBoxOutput extends MemoryOutput {
 	private final Set<Node> nodes = new HashSet<Node>();
 
-	public void storeAll(final ConfigWeb config, final IsogaDatabase db) {
+	public void storeAll(final ConfigWeb config, final DatabaseWeb db) {
 		db.storeLinks(links.values(), config);
 		db.storeVertices(nodes, config);
 	}
diff --git a/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java b/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
index 086d5502ff9bfd8c4d3bd240c9506cbe408a6eaf..864e44bba632da4ae50c411575dfdc104fecf99c 100644
--- a/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
+++ b/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
@@ -11,7 +11,7 @@ import it.unibz.inf.isochrone.util.Query;
 import it.unibz.inf.isoga.coverage.CoverageBuilder;
 import it.unibz.inf.isoga.datastructure.QueryPoint;
 import it.unibz.inf.isoga.db.DbUtility;
-import it.unibz.inf.isoga.db.IsogaDatabase;
+import it.unibz.inf.isoga.db.DatabaseWeb;
 import it.unibz.inf.isoga.network.MemoryBBoxOutput;
 import it.unibz.inf.isoga.service.dto.RequestIsochrone;
 import it.unibz.inf.isoga.service.dto.ResponseIsochrone;
@@ -61,7 +61,7 @@ public class ServiceIsochrone extends AbstractService<RequestIsochrone, Response
 		// Timing start
 
 		final long start = System.currentTimeMillis();
-		final IsogaDatabase db = new IsogaDatabase(config, request.getMode());
+		final DatabaseWeb db = new DatabaseWeb(config, request.getMode());
 		truncateTables(config);
 		final Query query = new Query(request.getDirection(), request.getSpeed(), request.getDmax(), request.getDate(), true, dataset, request.getMode());
 		query.setLocations(locationsFromQueryPoints(request.getQueryPoints(), config));
@@ -129,7 +129,7 @@ public class ServiceIsochrone extends AbstractService<RequestIsochrone, Response
 		}
 
 		final Set<Location> locations = new HashSet<Location>(queryPoints.size());
-		final IsogaDatabase db = new IsogaDatabase(config);
+		final DatabaseWeb db = new DatabaseWeb(config);
 		for (final QueryPoint qPoint : queryPoints) {
 			locations.addAll(db.projectOnLinks(qPoint));
 		}
diff --git a/src/main/java/it/unibz/inf/isoga/web/ConfigContainer.java b/src/main/java/it/unibz/inf/isoga/web/ConfigContainer.java
index daacbb8e1eeac630e70ef82d915c8c07f96e59ef..9cf566b5c9d77b5bdcde93b6e5f9e7883dd89a97 100644
--- a/src/main/java/it/unibz/inf/isoga/web/ConfigContainer.java
+++ b/src/main/java/it/unibz/inf/isoga/web/ConfigContainer.java
@@ -2,7 +2,7 @@ package it.unibz.inf.isoga.web;
 
 import it.unibz.inf.isochrone.util.EnumContainer.Dataset;
 import it.unibz.inf.isochrone.util.Point;
-import it.unibz.inf.isoga.db.IsogaDatabase;
+import it.unibz.inf.isoga.db.DatabaseWeb;
 import it.unibz.inf.isoga.geometry.BBox;
 import it.unibz.inf.isoga.util.ConfigDataset;
 import it.unibz.inf.isoga.util.ConfigWeb;
@@ -140,7 +140,7 @@ public final class ConfigContainer {
 				e.printStackTrace();
 			}
 
-			final IsogaDatabase db = new IsogaDatabase(config);
+			final DatabaseWeb db = new DatabaseWeb(config);
 			final BBox clientBBox = new BBox(db.transform(serverBBox.getLowerCorner()), db.transform(serverBBox.getUpperCorner()));
 			final Point queryPoint = db.transform(clientPOI);