diff --git a/haco/pulldown.py b/haco/select.py
similarity index 100%
rename from haco/pulldown.py
rename to haco/select.py
diff --git a/haco/topics.py b/haco/topics.py
index ad491d8..aadfe3f 100644
--- a/haco/topics.py
+++ b/haco/topics.py
@@ -89,7 +89,7 @@ class AnnounceTopicState(AnnounceTopic):
                 value_raw = method(value)
 
         except NotImplementedError:
-            logger.warning(f'No method implemented for {self.__class__.__name__}.{self.callback_name}: {self.topic}')
+            logger.warning(f'No method implemented for {self.capability.control.__class__.__name__}.{self.callback_name}: {self.topic}')
             return
 
         await self.capability.control.device.client.publish(self.topic, value_raw)
@@ -120,7 +120,7 @@ class AnnounceTopicCommand(AnnounceTopic):
                 value_raw = method(value)
 
         except NotImplementedError:
-            logger.warning(f'No method implemented for {self.topic}')
+            logger.warning(f'{self.capability.control.__class__.__name__}.{self.callback_name}: {self.topic}')
             return
 
         # Echo back as new state