diff --git a/plugins/mapdb-monitoring/build.gradle b/plugins/inmemory-monitoring/build.gradle
similarity index 93%
rename from plugins/mapdb-monitoring/build.gradle
rename to plugins/inmemory-monitoring/build.gradle
index 918da538f2..8d1f764adc 100644
--- a/plugins/mapdb-monitoring/build.gradle
+++ b/plugins/inmemory-monitoring/build.gradle
@@ -11,9 +11,6 @@ dependencies {
     compileOnly project(":monitoring")
 
     implementation group: "com.google.guava", name: "guava", version: guava_version
-    implementation(group: "org.mapdb", name: "mapdb", version: mapdb_version) {  // Apache 2.0
-        exclude group: "com.google.guava"
-    }
 
 
     // --- Test Compile ---
diff --git a/plugins/mapdb-monitoring/gradle.properties b/plugins/inmemory-monitoring/gradle.properties
similarity index 86%
rename from plugins/mapdb-monitoring/gradle.properties
rename to plugins/inmemory-monitoring/gradle.properties
index 68a09369d4..ef2e0ca0ba 100644
--- a/plugins/mapdb-monitoring/gradle.properties
+++ b/plugins/inmemory-monitoring/gradle.properties
@@ -16,12 +16,12 @@
 
 pluginVersion = 0.0.1
 
-pluginId = mapdb-monitoring
-pluginClass = org.polypheny.db.monitoring.MapDBMonitoringPlugin
+pluginId = inmemory-monitoring
+pluginClass = org.polypheny.db.monitoring.InMemoryMonitoringPlugin
 pluginProvider = The Polypheny Project
 pluginDependencies =
 pluginUrlPath =
 pluginCategories = monitoring
 pluginPolyDependencies =
 pluginIsSystemComponent = true
-pluginIsUiVisible = true
\ No newline at end of file
+pluginIsUiVisible = true
diff --git a/plugins/mapdb-monitoring/src/main/java/org/polypheny/db/monitoring/MapDBMonitoringPlugin.java b/plugins/inmemory-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryMonitoringPlugin.java
similarity index 90%
rename from plugins/mapdb-monitoring/src/main/java/org/polypheny/db/monitoring/MapDBMonitoringPlugin.java
rename to plugins/inmemory-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryMonitoringPlugin.java
index 59ff28567f..fa4ebce7a8 100644
--- a/plugins/mapdb-monitoring/src/main/java/org/polypheny/db/monitoring/MapDBMonitoringPlugin.java
+++ b/plugins/inmemory-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryMonitoringPlugin.java
@@ -20,13 +20,13 @@
 import org.polypheny.db.plugins.PolyPlugin;
 import org.polypheny.db.plugins.PolyPluginManager;
 
-public class MapDBMonitoringPlugin extends PolyPlugin {
+public class InMemoryMonitoringPlugin extends PolyPlugin {
 
     /**
      * Constructor to be used by plugin manager for plugin instantiation.
      * Your plugins have to provide constructor with this exact signature to be successfully loaded by manager.
      */
-    public MapDBMonitoringPlugin( PluginContext context ) {
+    public InMemoryMonitoringPlugin( PluginContext context ) {
         super( context );
     }
 
diff --git a/plugins/mapdb-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryRepository.java b/plugins/inmemory-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryRepository.java
similarity index 100%
rename from plugins/mapdb-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryRepository.java
rename to plugins/inmemory-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryRepository.java
diff --git a/plugins/mapdb-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplIntegrationTest.java b/plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplIntegrationTest.java
similarity index 100%
rename from plugins/mapdb-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplIntegrationTest.java
rename to plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplIntegrationTest.java
diff --git a/plugins/mapdb-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplTest.java b/plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplTest.java
similarity index 100%
rename from plugins/mapdb-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplTest.java
rename to plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplTest.java
diff --git a/plugins/mapdb-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringServiceImplTest.java b/plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringServiceImplTest.java
similarity index 100%
rename from plugins/mapdb-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringServiceImplTest.java
rename to plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringServiceImplTest.java
diff --git a/plugins/mapdb-monitoring/src/test/java/org/polypheny/db/monitoring/core/TestInMemoryRepository.java b/plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/TestInMemoryRepository.java
similarity index 100%
rename from plugins/mapdb-monitoring/src/test/java/org/polypheny/db/monitoring/core/TestInMemoryRepository.java
rename to plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/TestInMemoryRepository.java
diff --git a/settings.gradle b/settings.gradle
index 79fc272bff..bfd1aee10c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -27,10 +27,7 @@ include 'dbms'
 
 include 'plugins'
 
-// catalog
-// include 'plugins:mapdb-catalog'
-
-include 'plugins:mapdb-monitoring'
+include 'plugins:inmemory-monitoring'
 
 // language plugins
 include 'plugins:sql-language'