diff --git a/mapsforge-maps/src/main/java/slash/navigation/maps/mapsforge/MapsforgeMapManager.java b/mapsforge-maps/src/main/java/slash/navigation/maps/mapsforge/MapsforgeMapManager.java
index ed14c12f09..727dd20225 100644
--- a/mapsforge-maps/src/main/java/slash/navigation/maps/mapsforge/MapsforgeMapManager.java
+++ b/mapsforge-maps/src/main/java/slash/navigation/maps/mapsforge/MapsforgeMapManager.java
@@ -31,7 +31,7 @@
 import slash.navigation.maps.mapsforge.helpers.ThemeForMapMediator;
 import slash.navigation.maps.mapsforge.helpers.TileServerToTileMapMediator;
 import slash.navigation.maps.mapsforge.impl.*;
-import slash.navigation.maps.mapsforge.models.JoinedTableModel;
+import slash.navigation.maps.item.JoinedItemTableModel;
 import slash.navigation.maps.mapsforge.models.OpenStreetMap;
 import slash.navigation.maps.mapsforge.models.TileMapTableModel;
 import slash.navigation.maps.tileserver.TileServerMapManager;
@@ -78,7 +78,7 @@ public class MapsforgeMapManager {
     private final DataSourceManager dataSourceManager;
     private final ItemTableModel<TileDownloadMap> availableOnlineMapsModel = new TileMapTableModel();
     private final ItemTableModel<LocalMap> availableOfflineMapsModel = new ItemTableModel<>(1);
-    private final JoinedTableModel<LocalMap> availableMapsModel = new JoinedTableModel<>(availableOfflineMapsModel,
+    private final JoinedItemTableModel<LocalMap> availableMapsModel = new JoinedItemTableModel<>(availableOfflineMapsModel,
             new FilteringTableModel<>(availableOnlineMapsModel, new ActiveTileMapPredicate()));
     private final ItemTableModel<LocalTheme> availableThemesModel = new ItemTableModel<>(1);
     private final ItemTableModel<RemoteMap> downloadableMapsModel = new ItemTableModel<>(3);
@@ -126,7 +126,7 @@ public void dispose() {
         tileServerToTileMapMediator = null;
     }
 
-    public JoinedTableModel<LocalMap> getAvailableMapsModel() {
+    public JoinedItemTableModel<LocalMap> getAvailableMapsModel() {
         return availableMapsModel;
     }
 
diff --git a/mapsforge-maps/src/main/java/slash/navigation/maps/mapsforge/models/JoinedTableModel.java b/tileserver-maps/src/main/java/slash/navigation/maps/item/JoinedItemTableModel.java
similarity index 67%
rename from mapsforge-maps/src/main/java/slash/navigation/maps/mapsforge/models/JoinedTableModel.java
rename to tileserver-maps/src/main/java/slash/navigation/maps/item/JoinedItemTableModel.java
index 424dc58895..d7fc8ea35b 100644
--- a/mapsforge-maps/src/main/java/slash/navigation/maps/mapsforge/models/JoinedTableModel.java
+++ b/tileserver-maps/src/main/java/slash/navigation/maps/item/JoinedItemTableModel.java
@@ -17,9 +17,7 @@
 
     Copyright (C) 2007 Christian Pesch. All Rights Reserved.
 */
-package slash.navigation.maps.mapsforge.models;
-
-import slash.navigation.maps.item.Item;
+package slash.navigation.maps.item;
 
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
@@ -27,33 +25,25 @@
 import javax.swing.table.TableModel;
 
 /**
- * Joins two {@link TableModel} into one.
+ * Joins two {@link ItemTableModel} into one.
  *
  * @author Christian Pesch
  */
 
-public class JoinedTableModel<T extends Item> extends AbstractTableModel {
+public class JoinedItemTableModel<T extends Item> extends AbstractTableModel {
     private final TableModel first;
     private final TableModel second;
 
-    public JoinedTableModel(final TableModel first, TableModel second) {
+    public JoinedItemTableModel(final TableModel first, TableModel second) {
         this.first = first;
         this.second = second;
 
-        first.addTableModelListener(new TableModelListener() {
-            public void tableChanged(TableModelEvent e) {
-                fireTableChanged(new TableModelEvent(JoinedTableModel.this, e.getFirstRow(), e.getLastRow(),
-                        e.getColumn(), e.getType()));
-            }
-        });
+        first.addTableModelListener(e -> fireTableChanged(new TableModelEvent(JoinedItemTableModel.this,
+                e.getFirstRow(), e.getLastRow(), e.getColumn(), e.getType())));
 
-        second.addTableModelListener(new TableModelListener() {
-            public void tableChanged(TableModelEvent e) {
-                fireTableChanged(new TableModelEvent(JoinedTableModel.this,
-                        first.getRowCount() + e.getFirstRow(),
-                        first.getRowCount() + e.getLastRow(), e.getColumn(), e.getType()));
-            }
-        });
+        second.addTableModelListener(e -> fireTableChanged(new TableModelEvent(JoinedItemTableModel.this,
+                first.getRowCount() + e.getFirstRow(), first.getRowCount() + e.getLastRow(),
+                e.getColumn(), e.getType())));
     }
 
     public int getRowCount() {