diff --git a/pom.xml b/pom.xml
index b3a18ee35..77f28fd1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,9 @@
     <url>http://www.sirius-lib.net</url>
 
     <properties>
-        <sirius.kernel>12.0-rc25</sirius.kernel>
-        <sirius.web>19.0-rc22</sirius.web>
-        <sirius.db>5.0-rc31</sirius.db>
+        <sirius.kernel>12.0-rc26</sirius.kernel>
+        <sirius.web>19.0-rc23</sirius.web>
+        <sirius.db>5.0-rc33</sirius.db>
     </properties>
 
     <dependencies>
diff --git a/src/main/java/sirius/biz/cluster/ClusterController.java b/src/main/java/sirius/biz/cluster/ClusterController.java
index e991f8d90..035fa2512 100644
--- a/src/main/java/sirius/biz/cluster/ClusterController.java
+++ b/src/main/java/sirius/biz/cluster/ClusterController.java
@@ -49,6 +49,8 @@ public class ClusterController implements Controller {
     public static final String PERMISSION_SYSTEM_CLUSTER = "permission-system-cluster";
 
     public static final String RESPONSE_NAME = "name";
+    public static final String RESPONSE_LABEL = "label";
+    public static final String RESPONSE_CODE = "code";
     public static final String RESPONSE_DESCRIPTION = "description";
     public static final String RESPONSE_NODE_STATE = "nodeState";
     public static final String RESPONSE_UPTIME = "uptime";
@@ -104,7 +106,8 @@ public void nodeInfo(WebContext ctx, JSONStructuredOutput out) {
         out.beginArray(RESPONSE_METRICS);
         for (Metric m : metrics.getMetrics()) {
             out.beginObject(RESPONSE_METRIC);
-            out.property(RESPONSE_NAME, m.getName());
+            out.property(RESPONSE_CODE, m.getCode());
+            out.property(RESPONSE_LABEL, m.getLabel());
             out.property(RESPONSE_VALUE, m.getValue());
             out.property(RESPONSE_UNIT, m.getUnit());
             out.property(RESPONSE_STATE, m.getState().name());
diff --git a/src/main/java/sirius/biz/cluster/InterconnectClusterManager.java b/src/main/java/sirius/biz/cluster/InterconnectClusterManager.java
index a9bfc4ccd..7cda2187e 100644
--- a/src/main/java/sirius/biz/cluster/InterconnectClusterManager.java
+++ b/src/main/java/sirius/biz/cluster/InterconnectClusterManager.java
@@ -164,7 +164,7 @@ private NodeInfo parseNodeState(JSONObject response) {
         for (int i = 0; i < nodeMetrics.size(); i++) {
             try {
                 JSONObject metric = (JSONObject) nodeMetrics.get(i);
-                Metric m = new Metric(metric.getString(ClusterController.RESPONSE_NAME),
+                Metric m = new Metric(metric.getString(ClusterController.RESPONSE_CODE),metric.getString(ClusterController.RESPONSE_LABEL),
                                       metric.getDoubleValue(ClusterController.RESPONSE_VALUE),
                                       MetricState.valueOf(metric.getString(ClusterController.RESPONSE_STATE)),
                                       metric.getString(ClusterController.RESPONSE_UNIT));
diff --git a/src/main/java/sirius/biz/i5/I5MetricProvider.java b/src/main/java/sirius/biz/i5/I5MetricProvider.java
index eec03c60f..5b4ff6807 100644
--- a/src/main/java/sirius/biz/i5/I5MetricProvider.java
+++ b/src/main/java/sirius/biz/i5/I5MetricProvider.java
@@ -25,10 +25,18 @@ public class I5MetricProvider implements MetricProvider {
     @Override
     public void gather(MetricsCollector collector) {
         if (!i5.pools.isEmpty()) {
-            collector.differentialMetric("i5-use", "i5-uses", "I5 Uses", i5.borrows.getCount(), "/min");
-            collector.differentialMetric("i5-calls", "i5-calls", "I5 Calls", i5.calls.getCount(), "/min");
-            collector.metric("i5-call-duration", "I5 Call Duration", i5.callDuration.getAndClear(), "ms");
-            collector.metric("i5-call-utilization", "I5 Call Utilization", i5.callUtilization.getAndClear(), "ms");
+            collector.differentialMetric("i5_use", "i5-uses", "I5 Uses", i5.borrows.getCount(), "/min");
+            collector.differentialMetric("i5_calls", "i5-calls", "I5 Calls", i5.calls.getCount(), "/min");
+            collector.metric("i5_call_duration",
+                             "i5-call-duration",
+                             "I5 Call Duration",
+                             i5.callDuration.getAndClear(),
+                             "ms");
+            collector.metric("i5_call_utilization",
+                             "i5-call-utilization",
+                             "I5 Call Utilization",
+                             i5.callUtilization.getAndClear(),
+                             "ms");
         }
     }
 }
diff --git a/src/main/java/sirius/biz/locks/Locks.java b/src/main/java/sirius/biz/locks/Locks.java
index e8733f12f..55232aebb 100644
--- a/src/main/java/sirius/biz/locks/Locks.java
+++ b/src/main/java/sirius/biz/locks/Locks.java
@@ -113,8 +113,8 @@ public void gather(MetricsCollector collector) {
         List<LockInfo> locks = getLocks();
         LocalDateTime limitForAcquired = LocalDateTime.now().minus(LONG_RUNNING_LOGS_THRESHOLD);
 
-        collector.metric("locks-count", "Active Locks", locks.size(), null);
-        collector.metric("locks-long-running",
+        collector.metric("locks_count", "locks-count", "Active Locks", locks.size(), null);
+        collector.metric("locks_long_running","locks-long-running",
                          "Long locks",
                          locks.stream().filter(l -> l.getAcquired().isBefore(limitForAcquired)).count(),
                          null);
diff --git a/src/main/java/sirius/biz/vfs/SystemRoot.java b/src/main/java/sirius/biz/vfs/SystemRoot.java
index 070221658..82ed358b1 100644
--- a/src/main/java/sirius/biz/vfs/SystemRoot.java
+++ b/src/main/java/sirius/biz/vfs/SystemRoot.java
@@ -99,7 +99,7 @@ private VirtualFile createStatsFile(VirtualFile parent) {
         return new VirtualFile(parent, "stats").withInputStreamSupplier(() -> {
             StringBuilder sb = new StringBuilder();
             for (Metric metric : metrics.getMetrics()) {
-                sb.append(metric.getName());
+                sb.append(metric.getCode());
                 sb.append(": ");
                 sb.append(metric.getValueAsString());
                 sb.append("\n");