diff --git a/app/src/main/java/com/inou/clawdnode/ClawdNodeApp.kt b/app/src/main/java/com/inou/clawdnode/ClawdNodeApp.kt
index d9d9a59..cde9372 100644
--- a/app/src/main/java/com/inou/clawdnode/ClawdNodeApp.kt
+++ b/app/src/main/java/com/inou/clawdnode/ClawdNodeApp.kt
@@ -9,7 +9,7 @@ import com.inou.clawdnode.gateway.DirectGateway
 import com.inou.clawdnode.security.AuditLog
 import com.inou.clawdnode.security.DeviceIdentity
 import com.inou.clawdnode.security.TokenStore
-import com.inou.clawdnode.service.NotificationManager
+import com.inou.clawdnode.service.NotificationManager as AppNotificationManager
 
 /**
  * ClawdNode Application
@@ -53,7 +53,7 @@ class ClawdNodeApp : Application() {
         // Set up command handlers
         DirectGateway.onNotificationAction = { notificationId, action, replyText ->
             auditLog.log("COMMAND_RECEIVED", "notification.action: $action on $notificationId")
-            NotificationManager.getInstance()?.triggerAction(notificationId, action, replyText)
+            AppNotificationManager.getInstance()?.triggerAction(notificationId, action, replyText)
         }
         
         DirectGateway.onCallAnswer = { callId ->