diff --git a/components/truma_inetbox/binary_sensor/TrumaCpPlusBinarySensor.cpp b/components/truma_inetbox/binary_sensor/TrumaCpPlusBinarySensor.cpp
index 4504f3c..3381790 100644
--- a/components/truma_inetbox/binary_sensor/TrumaCpPlusBinarySensor.cpp
+++ b/components/truma_inetbox/binary_sensor/TrumaCpPlusBinarySensor.cpp
@@ -5,7 +5,7 @@
 namespace esphome {
 namespace truma_inetbox {
 
-static const char *const TAG = "truma_inetbox.binary_sensor";
+static const char *const TAG = "truma_inetbox.cpplus_binary_sensor";
 
 void TrumaCpPlusBinarySensor::update() {
   if (this->parent_->get_lin_bus_fault() || (this->parent_->get_last_cp_plus_request() == 0)) {
@@ -16,6 +16,6 @@ void TrumaCpPlusBinarySensor::update() {
   this->publish_state(micros() < timeout);
 }
 
-void TrumaCpPlusBinarySensor::dump_config() { ESP_LOGCONFIG("", "Truma CP Plus Binary Sensor"); }
+void TrumaCpPlusBinarySensor::dump_config() { LOG_BINARY_SENSOR("", "Truma CP Plus Binary Sensor", this); }
 }  // namespace truma_inetbox
 }  // namespace esphome
\ No newline at end of file
diff --git a/components/truma_inetbox/binary_sensor/TrumaHeaterBinarySensor.cpp b/components/truma_inetbox/binary_sensor/TrumaHeaterBinarySensor.cpp
index b969c08..4bbd6eb 100644
--- a/components/truma_inetbox/binary_sensor/TrumaHeaterBinarySensor.cpp
+++ b/components/truma_inetbox/binary_sensor/TrumaHeaterBinarySensor.cpp
@@ -5,7 +5,7 @@
 namespace esphome {
 namespace truma_inetbox {
 
-static const char *const TAG = "truma_inetbox.binary_sensor";
+static const char *const TAG = "truma_inetbox.heater_binary_sensor";
 
 void TrumaHeaterBinarySensor::setup() {
   this->parent_->register_listener([this](const StatusFrameHeater *status_heater) {
@@ -37,7 +37,7 @@ void TrumaHeaterBinarySensor::setup() {
 }
 
 void TrumaHeaterBinarySensor::dump_config() {
-  ESP_LOGCONFIG("", "Truma Heater Binary Sensor");
+  LOG_BINARY_SENSOR("", "Truma Heater Binary Sensor", this);
   ESP_LOGCONFIG(TAG, "  Type '%s'", enum_to_c_str(this->type_));
 }
 }  // namespace truma_inetbox
diff --git a/components/truma_inetbox/binary_sensor/TrumaTimerBinarySensor.cpp b/components/truma_inetbox/binary_sensor/TrumaTimerBinarySensor.cpp
index 16d2e74..7f37ded 100644
--- a/components/truma_inetbox/binary_sensor/TrumaTimerBinarySensor.cpp
+++ b/components/truma_inetbox/binary_sensor/TrumaTimerBinarySensor.cpp
@@ -5,7 +5,7 @@
 namespace esphome {
 namespace truma_inetbox {
 
-static const char *const TAG = "truma_inetbox.binary_sensor";
+static const char *const TAG = "truma_inetbox.timer_binary_sensor";
 
 void TrumaTimerBinarySensor::setup() {
   this->parent_->register_listener([this](const StatusFrameTimer *status_timer) {
@@ -26,7 +26,7 @@ void TrumaTimerBinarySensor::setup() {
 }
 
 void TrumaTimerBinarySensor::dump_config() {
-  ESP_LOGCONFIG("", "Truma Timer Binary Sensor");
+  LOG_BINARY_SENSOR("", "Truma Timer Binary Sensor", this);
   ESP_LOGCONFIG(TAG, "  Type %s", enum_to_c_str(this->type_));
 }
 }  // namespace truma_inetbox
diff --git a/components/truma_inetbox/climate/TrumaRoomClimate.cpp b/components/truma_inetbox/climate/TrumaRoomClimate.cpp
index 54aa955..cbed2f9 100644
--- a/components/truma_inetbox/climate/TrumaRoomClimate.cpp
+++ b/components/truma_inetbox/climate/TrumaRoomClimate.cpp
@@ -4,7 +4,7 @@
 namespace esphome {
 namespace truma_inetbox {
 
-static const char *const TAG = "truma_inetbox.truma_room_climate";
+static const char *const TAG = "truma_inetbox.room_climate";
 void TrumaRoomClimate::setup() {
   this->parent_->register_listener([this](const StatusFrameHeater *status_heater) {
     // Publish updated state
@@ -32,7 +32,7 @@ void TrumaRoomClimate::setup() {
   });
 }
 
-void TrumaRoomClimate::dump_config() { ESP_LOGCONFIG(TAG, "Truma Room Climate"); }
+void TrumaRoomClimate::dump_config() { LOG_CLIMATE(TAG, "Truma Room Climate", this); }
 
 void TrumaRoomClimate::control(const climate::ClimateCall &call) {
   if (call.get_target_temperature().has_value()) {
diff --git a/components/truma_inetbox/climate/TrumaWaterClimate.cpp b/components/truma_inetbox/climate/TrumaWaterClimate.cpp
index bd28b61..e707c7a 100644
--- a/components/truma_inetbox/climate/TrumaWaterClimate.cpp
+++ b/components/truma_inetbox/climate/TrumaWaterClimate.cpp
@@ -4,7 +4,7 @@
 namespace esphome {
 namespace truma_inetbox {
 
-static const char *const TAG = "truma_inetbox.truma_water_climate";
+static const char *const TAG = "truma_inetbox.water_climate";
 void TrumaWaterClimate::setup() {
   this->parent_->register_listener([this](const StatusFrameHeater *status_heater) {
     // Publish updated state
@@ -16,7 +16,7 @@ void TrumaWaterClimate::setup() {
   });
 }
 
-void TrumaWaterClimate::dump_config() { ESP_LOGCONFIG(TAG, "Truma Climate"); }
+void TrumaWaterClimate::dump_config() { LOG_CLIMATE(TAG, "Truma Climate", this); }
 
 void TrumaWaterClimate::control(const climate::ClimateCall &call) {
   if (call.get_target_temperature().has_value()) {
diff --git a/components/truma_inetbox/number/TrumaHeaterNumber.cpp b/components/truma_inetbox/number/TrumaHeaterNumber.cpp
index 6ef53de..2c01dad 100644
--- a/components/truma_inetbox/number/TrumaHeaterNumber.cpp
+++ b/components/truma_inetbox/number/TrumaHeaterNumber.cpp
@@ -5,7 +5,7 @@
 namespace esphome {
 namespace truma_inetbox {
 
-static const char *const TAG = "truma_inetbox.sensor";
+static const char *const TAG = "truma_inetbox.heater_number";
 
 void TrumaHeaterNumber::setup() {
   this->parent_->register_listener([this](const StatusFrameHeater *status_heater) {
@@ -38,7 +38,7 @@ void TrumaHeaterNumber::control(float value) {
 }
 
 void TrumaHeaterNumber::dump_config() {
-  ESP_LOGCONFIG("", "Truma Heater Number");
+  LOG_NUMBER("", "Truma Heater Number", this);
   ESP_LOGCONFIG(TAG, "  Type '%s'", enum_to_c_str(this->type_));
 }
 }  // namespace truma_inetbox