diff --git a/src/app/clusters/water-heater-management-server/water-heater-management-server.cpp b/src/app/clusters/water-heater-management-server/water-heater-management-server.cpp
index 2f5ec0800eb568..165fc94fb319a2 100644
--- a/src/app/clusters/water-heater-management-server/water-heater-management-server.cpp
+++ b/src/app/clusters/water-heater-management-server/water-heater-management-server.cpp
@@ -46,8 +46,8 @@ constexpr uint16_t kClusterRevision = 2;
  ***************************************************************************/
 
 CHIP_ERROR Delegate::GenerateBoostStartedEvent(uint32_t durationSecs, Optional<bool> oneShot, Optional<bool> emergencyBoost,
-                                               Optional<int16_t> temporarySetpoint, Optional<chip::Percent> targetPercentage,
-                                               Optional<chip::Percent> targetReheat)
+                                               Optional<int16_t> temporarySetpoint, Optional<Percent> targetPercentage,
+                                               Optional<Percent> targetReheat)
 {
     Events::BoostStarted::Type event;
     EventNumber eventNumber;
@@ -78,7 +78,7 @@ CHIP_ERROR Delegate::GenerateBoostEndedEvent()
     CHIP_ERROR err = LogEvent(event, mEndpointId, eventNumber);
     if (CHIP_NO_ERROR != err)
     {
-        ChipLogError(AppServer, "Unable to generate BoostStarted event: %" CHIP_ERROR_FORMAT, err.Format());
+        ChipLogError(AppServer, "Unable to generate BoostEnded event: %" CHIP_ERROR_FORMAT, err.Format());
         return err;
     }
 
diff --git a/src/app/clusters/water-heater-management-server/water-heater-management-server.h b/src/app/clusters/water-heater-management-server/water-heater-management-server.h
index 91c0bbb8c02008..25ff16265b6df7 100644
--- a/src/app/clusters/water-heater-management-server/water-heater-management-server.h
+++ b/src/app/clusters/water-heater-management-server/water-heater-management-server.h
@@ -122,8 +122,8 @@ class Delegate
      * @return CHIP_NO_ERROR if the event was successfully generated, otherwise an error.
      */
     CHIP_ERROR GenerateBoostStartedEvent(uint32_t durationSecs, Optional<bool> oneShot, Optional<bool> emergencyBoost,
-                                         Optional<int16_t> temporarySetpoint, Optional<chip::Percent> targetPercentage,
-                                         Optional<chip::Percent> targetReheat);
+                                         Optional<int16_t> temporarySetpoint, Optional<Percent> targetPercentage,
+                                         Optional<Percent> targetReheat);
 
     /**
      * @brief Generates a BoostEnded event.