diff --git a/pyvoltha/adapters/extensions/alarms/adapter_alarms.py b/pyvoltha/adapters/extensions/alarms/adapter_alarms.py
index 178bc3b..00e74de 100644
--- a/pyvoltha/adapters/extensions/alarms/adapter_alarms.py
+++ b/pyvoltha/adapters/extensions/alarms/adapter_alarms.py
@@ -49,7 +49,7 @@
         self.adapter_agent = adapter_agent
         self.device_id = device_id
         self.logical_device_id = logical_device_id
-        self.adapter_name = adapter_agent.adapter_name
+        self.adapter_name = adapter_agent.listening_topic
         self.lc = None
 
     def format_id(self, alarm):
diff --git a/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py b/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py
index c4bdd62..5337d53 100644
--- a/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py
+++ b/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py
@@ -53,9 +53,8 @@
         self.log = structlog.get_logger(device_id=device_id)
         self.device_id = device_id
         self.adapter_agent = adapter_agent
-        self.name = adapter_agent.adapter_name
-        # Sanitize the vcore ID in the logical device ID
-        self.logical_device_id = '0000' + logical_device_id[4:]
+        self.name = adapter_agent.listening_topic
+        self.logical_device_id = logical_device_id
         device = self.adapter_agent.get_device(self.device_id)
         self.serial_number = device.serial_number