diff --git a/examples/all-clusters-app/linux/ValveControlDelegate.cpp b/examples/all-clusters-app/linux/ValveControlDelegate.cpp
index 9c51aff..d0ce1b4 100644
--- a/examples/all-clusters-app/linux/ValveControlDelegate.cpp
+++ b/examples/all-clusters-app/linux/ValveControlDelegate.cpp
@@ -70,7 +70,7 @@
     sLastOpenDuration = duration;
 }
 
-void ExtendedTimeSyncDelegate::UTCTimeChanged(uint64_t time)
+void ExtendedTimeSyncDelegate::UTCTimeAvailabilityChanged(uint64_t time)
 {
     ValveConfigurationAndControl::UpdateAutoCloseTime(time);
 }
diff --git a/examples/all-clusters-app/linux/ValveControlDelegate.h b/examples/all-clusters-app/linux/ValveControlDelegate.h
index 76f0f17..8781137 100644
--- a/examples/all-clusters-app/linux/ValveControlDelegate.h
+++ b/examples/all-clusters-app/linux/ValveControlDelegate.h
@@ -40,7 +40,7 @@
 class ExtendedTimeSyncDelegate : public DefaultTimeSyncDelegate
 {
 public:
-    void UTCTimeChanged(uint64_t time) override;
+    void UTCTimeAvailabilityChanged(uint64_t time) override;
 };
 
 } // namespace TimeSynchronization
diff --git a/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.cpp b/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.cpp
index 3f97c57..e436d19 100644
--- a/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.cpp
+++ b/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.cpp
@@ -74,7 +74,7 @@
     return CHIP_ERROR_NOT_IMPLEMENTED;
 }
 
-void DefaultTimeSyncDelegate::UTCTimeChanged(uint64_t time)
+void DefaultTimeSyncDelegate::UTCTimeAvailabilityChanged(uint64_t time)
 {
     // placeholder implementation
 }
diff --git a/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.h b/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.h
index 826f1d2..01f156e 100644
--- a/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.h
+++ b/src/app/clusters/time-synchronization-server/DefaultTimeSyncDelegate.h
@@ -36,7 +36,7 @@
     CHIP_ERROR UpdateTimeFromPlatformSource(chip::Callback::Callback<OnTimeSyncCompletion> * callback) override;
     CHIP_ERROR UpdateTimeUsingNTPFallback(const CharSpan & fallbackNTP,
                                           chip::Callback::Callback<OnFallbackNTPCompletion> * callback) override;
-    void UTCTimeChanged(uint64_t time) override;
+    void UTCTimeAvailabilityChanged(uint64_t time) override;
 };
 
 } // namespace TimeSynchronization
diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-delegate.h b/src/app/clusters/time-synchronization-server/time-synchronization-delegate.h
index 1f424e3..6ef37f2 100644
--- a/src/app/clusters/time-synchronization-server/time-synchronization-delegate.h
+++ b/src/app/clusters/time-synchronization-server/time-synchronization-delegate.h
@@ -108,7 +108,7 @@
     /**
      * @brief Signals application that UTCTime has changed through the timesync cluster.
      */
-    virtual void UTCTimeChanged(uint64_t time) = 0;
+    virtual void UTCTimeAvailabilityChanged(uint64_t time) = 0;
 
     virtual ~Delegate() = default;
 
diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
index fae9565..217f44a 100644
--- a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
+++ b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
@@ -776,7 +776,7 @@
         ChipLogError(Zcl, "Error setting UTC time on the device");
         return err;
     }
-    GetDelegate()->UTCTimeChanged(utcTime);
+    GetDelegate()->UTCTimeAvailabilityChanged(utcTime);
     mGranularity         = granularity;
     EmberAfStatus status = TimeSource::Set(ep, source);
     if (!(status == EMBER_ZCL_STATUS_SUCCESS || status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE))
diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.h b/src/app/clusters/time-synchronization-server/time-synchronization-server.h
index 5eee8e5..c6012b1 100644
--- a/src/app/clusters/time-synchronization-server/time-synchronization-server.h
+++ b/src/app/clusters/time-synchronization-server/time-synchronization-server.h
@@ -29,7 +29,7 @@
 #include "time-synchronization-delegate.h"
 
 #if TIME_SYNC_ENABLE_TSC_FEATURE
-#include <app/ClusterStateCache.h>
+#include <app/ReadClient.h>
 #endif
 #include <app/server/Server.h>
 #include <app/util/af-types.h>