diff --git a/src/cmd/cli/command/servicemonitor.go b/src/cmd/cli/command/servicemonitor.go
index 9fc82f2e0..42031e6fe 100644
--- a/src/cmd/cli/command/servicemonitor.go
+++ b/src/cmd/cli/command/servicemonitor.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/DefangLabs/defang/src/pkg/cli"
+	"github.com/DefangLabs/defang/src/pkg/cli/compose"
 	"github.com/DefangLabs/defang/src/pkg/term"
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 )
@@ -11,7 +12,7 @@ import (
 func waitServiceStatus(ctx context.Context, targetStatus cli.ServiceStatus, serviceInfos []*defangv1.ServiceInfo) error {
 	serviceList := []string{}
 	for _, serviceInfo := range serviceInfos {
-		serviceList = append(serviceList, cli.NormalizeServiceName(serviceInfo.Service.Name))
+		serviceList = append(serviceList, compose.NormalizeServiceName(serviceInfo.Service.Name))
 	}
 
 	// set up service status subscription (non-blocking)
diff --git a/src/protos/io/defang/v1/fabric.pb.go b/src/protos/io/defang/v1/fabric.pb.go
index 31958fd37..662d7f9f2 100644
--- a/src/protos/io/defang/v1/fabric.pb.go
+++ b/src/protos/io/defang/v1/fabric.pb.go
@@ -33,7 +33,8 @@ const (
 	ServiceState_BUILDING         ServiceState = 2 // BUILD_RUNNING
 	ServiceState_CREATED          ServiceState = 3 // BUILD_DEACTIVATING (done = true)
 	// Update states (initial state for existing image)
-	ServiceState_UPDATE_PENDING    ServiceState = 4 //  UPDATE_QUEUE
+	ServiceState_UPDATE_PENDING ServiceState = 4 //  UPDATE_QUEUE
+	// Deployment states
 	ServiceState_SERVICE_DEPLOYING ServiceState = 5
 	ServiceState_SERVICE_STARTED   ServiceState = 6
 	ServiceState_SERVICE_FAILED    ServiceState = 7