diff --git a/local_agent/translation_layer/gdm_manager.py b/local_agent/translation_layer/gdm_manager.py
index 950f20e..50a9241 100644
--- a/local_agent/translation_layer/gdm_manager.py
+++ b/local_agent/translation_layer/gdm_manager.py
@@ -72,19 +72,19 @@
             if not self._mgr.is_device_connected(chip_tool_id):
                 return []
 
-            with self._mgr.create_and_close_device(chip_tool_id) as device:
-                if not isinstance(device, chip_tool.ChipTool):
+            with self._mgr.create_and_close_device(chip_tool_id) as chipTool:
+                if not isinstance(chipTool, chip_tool.ChipTool):
                     return []
 
-                device.set_property("matter_node_id", 6666)
+                chipTool.set_property("matter_node_id", 6666)
                 # devices has to be commissioned to chip tool first
 
-                endpoint_instances_and_cluster_mapping = device.matter_endpoints.get_supported_endpoint_instances_and_cluster_flavors()
+                endpoint_instances_and_cluster_mapping = chipTool.matter_endpoints.get_supported_endpoint_instances_and_cluster_flavors()
                 
                 for endpoint_instances_and_cluster_pair in endpoint_instances_and_cluster_mapping.items():
                     endpoint_instance = endpoint_instances_and_cluster_pair[0]
                     device_type = endpoint_instance.name
-                    
+
                     # Skip root node
                     if(device_type == "root_node"):
                         continue