Service name must be same as zone

package-manifest.toml

@@ -390,15 +390,15 @@ output.type = "zone"
 output.intermediate_only = true
 
 [package.crucible-zone]
-service_name = "crucible-zone"
+service_name = "crucible"
 only_for_targets.image = "standard"
 source.type = "composite"
 source.packages = [ "crucible.tar.gz", "zone-network-setup.tar.gz" ]
 output.type = "zone"
 
 
 [package.crucible-pantry-zone]
-service_name = "crucible_pantry_zone"
+service_name = "crucible_pantry"
 only_for_targets.image = "standard"
 source.type = "composite"
 source.packages = [ "crucible-pantry.tar.gz", "zone-network-setup.tar.gz" ]
@@ -410,7 +410,7 @@ output.type = "zone"
 #   https://github.com/oxidecomputer/crucible/blob/main/package/README.md
 # for instructions on building this manually.
 [package.crucible]
-service_name = "crucible"
+service_name = "crucible-prebuilt"
 only_for_targets.image = "standard"
 # To manually override the package source (for example, to test a change in
 # both Crucible and Omicron simultaneously):
@@ -428,7 +428,7 @@ output.type = "zone"
 output.intermediate_only = true
 
 [package.crucible-pantry]
-service_name = "crucible_pantry"
+service_name = "crucible_pantry_prebuilt"
 only_for_targets.image = "standard"
 source.type = "prebuilt"
 source.repo = "crucible"