diff --git a/src/main/java/bdv/server/BigDataServer.java b/src/main/java/bdv/server/BigDataServer.java
index dd6dbd58c957fd8a841aae728f48021c83402d58..df2d33ed598ed918452a4859a28d8820ba2c62da 100644
--- a/src/main/java/bdv/server/BigDataServer.java
+++ b/src/main/java/bdv/server/BigDataServer.java
@@ -98,7 +98,7 @@ public class BigDataServer
 		handlers.addHandler( datasetHandlers );
 		handlers.addHandler( new ManagerHandler( baseURL, server, connectorStats, statHandler, datasetHandlers ) );
 		handlers.addHandler( new RequestLogHandler() );
-		handlers.addHandler( new JsonHandler( server, datasetHandlers ) );
+		handlers.addHandler( new JsonDatasetListHandler( server, datasetHandlers ) );
 
 		statHandler.setHandler( handlers );
 
diff --git a/src/main/java/bdv/server/JsonHandler.java b/src/main/java/bdv/server/JsonDatasetListHandler.java
similarity index 92%
rename from src/main/java/bdv/server/JsonHandler.java
rename to src/main/java/bdv/server/JsonDatasetListHandler.java
index 33f9c45cc32d896f6f9abc54101010b9b652a435..ef79cfcd98284beea51853df83a7194115aa7725 100644
--- a/src/main/java/bdv/server/JsonHandler.java
+++ b/src/main/java/bdv/server/JsonDatasetListHandler.java
@@ -18,11 +18,11 @@ import java.net.URISyntaxException;
  *
  * @author HongKee Moon <moon@mpi-cbg.de>
  */
-public class JsonHandler extends ContextHandler
+public class JsonDatasetListHandler extends ContextHandler
 {
 	private final Server server;
 
-	public JsonHandler( final Server server, final ContextHandlerCollection handlers ) throws IOException, URISyntaxException
+	public JsonDatasetListHandler( final Server server, final ContextHandlerCollection handlers ) throws IOException, URISyntaxException
 	{
 		this.server = server;
 		setContextPath( "/" + Constants.DATASETLIST_CONTEXT_NAME );