diff --git a/src/app/gui/canvas/canvas_performance_integration.cc b/src/app/gui/canvas/canvas_performance_integration.cc
index 13f7956b..13cf72c3 100644
--- a/src/app/gui/canvas/canvas_performance_integration.cc
+++ b/src/app/gui/canvas/canvas_performance_integration.cc
@@ -22,7 +22,9 @@ void CanvasPerformanceIntegration::Initialize(const std::string& canvas_id) {
   // Initialize performance profiler integration
   dashboard_ = &gfx::PerformanceDashboard::Get();
   
-  util::logf("Initialized performance integration for canvas: %s", canvas_id_.c_str());
+  LOG_INFO("CanvasPerformance",
+           "Initialized performance integration for canvas: %s",
+           canvas_id_.c_str());
 }
 
 void CanvasPerformanceIntegration::StartMonitoring() {
@@ -32,7 +34,8 @@ void CanvasPerformanceIntegration::StartMonitoring() {
   frame_timer_active_ = true;
   frame_timer_ = std::make_unique<gfx::ScopedTimer>("canvas_frame_" + canvas_id_);
   
-  util::logf("Started performance monitoring for canvas: %s", canvas_id_.c_str());
+  LOG_INFO("CanvasPerformance", "Started performance monitoring for canvas: %s",
+           canvas_id_.c_str());
 }
 
 void CanvasPerformanceIntegration::StopMonitoring() {
@@ -54,7 +57,8 @@ void CanvasPerformanceIntegration::StopMonitoring() {
     frame_timer_active_ = false;
   }
   
-  util::logf("Stopped performance monitoring for canvas: %s", canvas_id_.c_str());
+  LOG_INFO("CanvasPerformance", "Stopped performance monitoring for canvas: %s",
+           canvas_id_.c_str());
 }
 
 void CanvasPerformanceIntegration::UpdateMetrics() {
@@ -359,12 +363,12 @@ void CanvasPerformanceIntegration::AnalyzePerformance() {
   
   // Log trends
   if (std::abs(frame_time_trend) > 1.0) {
-    util::logf("Canvas %s: Frame time trend: %.2f ms/sample", 
+    LOG_INFO("CanvasPerformance", "Canvas %s: Frame time trend: %.2f ms/sample", 
                canvas_id_.c_str(), frame_time_trend);
   }
   
   if (std::abs(memory_trend) > 1.0) {
-    util::logf("Canvas %s: Memory trend: %.2f MB/sample", 
+    LOG_INFO("CanvasPerformance", "Canvas %s: Memory trend: %.2f MB/sample", 
                canvas_id_.c_str(), memory_trend);
   }
 }
@@ -528,13 +532,17 @@ CanvasPerformanceManager& CanvasPerformanceManager::Get() {
   return instance;
 }
 
-void CanvasPerformanceManager::RegisterIntegration(const std::string& canvas_id, 
-                                                  std::shared_ptr<CanvasPerformanceIntegration> integration) {
+void CanvasPerformanceManager::RegisterIntegration(
+    const std::string& canvas_id,
+    std::shared_ptr<CanvasPerformanceIntegration> integration) {
   integrations_[canvas_id] = integration;
-  util::logf("Registered performance integration for canvas: %s", canvas_id.c_str());
+  LOG_INFO("CanvasPerformance",
+           "Registered performance integration for canvas: %s",
+           canvas_id.c_str());
 }
 
-std::shared_ptr<CanvasPerformanceIntegration> CanvasPerformanceManager::GetIntegration(const std::string& canvas_id) {
+std::shared_ptr<CanvasPerformanceIntegration>
+CanvasPerformanceManager::GetIntegration(const std::string& canvas_id) {
   auto it = integrations_.find(canvas_id);
   if (it != integrations_.end()) {
     return it->second;
@@ -596,7 +604,7 @@ void CanvasPerformanceManager::ClearAllIntegrations() {
     integration->StopMonitoring();
   }
   integrations_.clear();
-  util::logf("Cleared all canvas performance integrations");
+  LOG_INFO("CanvasPerformance", "Cleared all canvas performance integrations");
 }
 
 }  // namespace canvas
diff --git a/src/app/gui/canvas/canvas_usage_tracker.cc b/src/app/gui/canvas/canvas_usage_tracker.cc
index efeb8921..57f2a3c0 100644
--- a/src/app/gui/canvas/canvas_usage_tracker.cc
+++ b/src/app/gui/canvas/canvas_usage_tracker.cc
@@ -31,8 +31,8 @@ void CanvasUsageTracker::SetUsageMode(CanvasUsage usage) {
     // Record mode change interaction
     RecordInteraction(CanvasInteraction::kModeChange, GetUsageModeName(usage));
     
-    util::logf("Canvas %s: Usage mode changed to %s", 
-               canvas_id_.c_str(), GetUsageModeName(usage).c_str());
+  LOG_INFO("CanvasUsage", "Canvas %s: Usage mode changed to %s", 
+       canvas_id_.c_str(), GetUsageModeName(usage).c_str());
   }
 }
 
@@ -267,11 +267,11 @@ void CanvasUsageTracker::EndSession() {
   // Save final stats
   SaveCurrentStats();
   
-  util::logf("Canvas %s: Session ended. Duration: %s, Operations: %d", 
-             canvas_id_.c_str(), 
-             FormatDuration(std::chrono::duration_cast<std::chrono::milliseconds>(
-                 std::chrono::steady_clock::now() - session_start_)).c_str(),
-             current_stats_.total_operations);
+  LOG_INFO("CanvasUsage", "Canvas %s: Session ended. Duration: %s, Operations: %d", 
+       canvas_id_.c_str(), 
+       FormatDuration(std::chrono::duration_cast<std::chrono::milliseconds>(
+         std::chrono::steady_clock::now() - session_start_)).c_str(),
+       current_stats_.total_operations);
 }
 
 void CanvasUsageTracker::UpdateActiveTime() {
@@ -352,7 +352,7 @@ CanvasUsageManager& CanvasUsageManager::Get() {
 void CanvasUsageManager::RegisterTracker(const std::string& canvas_id, 
                                         std::shared_ptr<CanvasUsageTracker> tracker) {
   trackers_[canvas_id] = tracker;
-  util::logf("Registered usage tracker for canvas: %s", canvas_id.c_str());
+  LOG_INFO("CanvasUsage", "Registered usage tracker for canvas: %s", canvas_id.c_str());
 }
 
 std::shared_ptr<CanvasUsageTracker> CanvasUsageManager::GetTracker(const std::string& canvas_id) {
@@ -421,7 +421,7 @@ void CanvasUsageManager::ClearAllTrackers() {
     tracker->ClearHistory();
   }
   trackers_.clear();
-  util::logf("Cleared all canvas usage trackers");
+  LOG_INFO("CanvasUsage", "Cleared all canvas usage trackers");
 }
 
 }  // namespace canvas