diff --git a/internal/assets/contents/shells/zshrc_global.sh b/internal/assets/contents/shells/zshrc_global.sh
index 9f19cbfbe8..c2cee91028 100644
--- a/internal/assets/contents/shells/zshrc_global.sh
+++ b/internal/assets/contents/shells/zshrc_global.sh
@@ -8,4 +8,4 @@ export {{$K}}="{{$V}}:$PATH"
 {{- else}}
 export {{$K}}="{{$V}}"
 {{- end}}
-{{- end}}
\ No newline at end of file
+{{- end}}
diff --git a/pkg/buildplan/artifact.go b/pkg/buildplan/artifact.go
index 8a2c58436e..9bf0745618 100644
--- a/pkg/buildplan/artifact.go
+++ b/pkg/buildplan/artifact.go
@@ -124,11 +124,7 @@ func (a Artifacts) ToIDSlice() []strfmt.UUID {
 func (a Artifacts) ToNameMap() ArtifactNameMap {
 	result := make(map[string]*Artifact, len(a))
 	for _, a := range a {
-		name := a.DisplayName
-		if len(a.Ingredients) == 0 {
-			name = a.Ingredients[0].Name
-		}
-		result[name] = a
+		result[a.Name()] = a
 	}
 	return result
 }