diff --git a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotUpdater.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotUpdater.kt
index 4914e1819..0778633d4 100644
--- a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotUpdater.kt
+++ b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotUpdater.kt
@@ -162,7 +162,7 @@ class SnapshotUpdater(
 
     private fun snapshotTimer(serviceName: String) = if (properties.metrics.cacheSetSnapshot) {
         meterRegistry.timer(
-            "simple-cache.duration.seconds", Tags.of("service", serviceName, "operation", "set-snapshot")
+            "simple.cache.duration.seconds", Tags.of("service", serviceName, "operation", "set-snapshot")
         )
     } else {
         noopTimer
diff --git a/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/metrics/ThreadPoolMetricTest.kt b/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/metrics/ThreadPoolMetricTest.kt
index 27ef8f273..7dfaaed6c 100644
--- a/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/metrics/ThreadPoolMetricTest.kt
+++ b/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/metrics/ThreadPoolMetricTest.kt
@@ -29,14 +29,14 @@ class ThreadPoolMetricTest {
         val metricNames = listOf("executor.completed", "executor.active", "executor.queued", "executor.pool.size")
             .map { "envoy-control.$it" }
 
-        val metricMap = listOf(
+        val executorNames = listOf(
             "grpc-server-worker",
             "grpc-worker-event-loop",
             "snapshot-update",
             "group-snapshot"
         ).associateWith { metricNames }
 
-        assertThat(metricMap.entries).allSatisfy {
+        assertThat(executorNames.entries).allSatisfy {
             assertThat(it.value.all { metricName ->
                 meterRegistry.meters.any { meter ->
                     meter.id.name == metricName && meter.id.tags.contains(