diff --git a/core/services/workflows/engine.go b/core/services/workflows/engine.go
index fb99e9428cb..c548c2bbefb 100644
--- a/core/services/workflows/engine.go
+++ b/core/services/workflows/engine.go
@@ -436,7 +436,7 @@ func (e *Engine) registerTrigger(ctx context.Context, t *triggerCapability, trig
 		Metadata: capabilities.RequestMetadata{
 			WorkflowID:               e.workflow.id,
 			WorkflowOwner:            e.workflow.owner,
-			WorkflowName:             e.workflow.name,
+			WorkflowName:             e.workflow.hexName,
 			WorkflowDonID:            e.localNode.WorkflowDON.ID,
 			WorkflowDonConfigVersion: e.localNode.WorkflowDON.ConfigVersion,
 			ReferenceID:              t.Ref,
@@ -788,7 +788,7 @@ func (e *Engine) workerForStepRequest(ctx context.Context, msg stepRequest) {
 	if verr == nil {
 		curStepID = curStep.ID
 	} else {
-		l.Errorf("failed to resolve step in workflow; error %v", err)
+		l.Errorf("failed to resolve step in workflow; error %v", verr)
 	}
 	e.metrics.with(platform.KeyCapabilityID, curStepID).updateWorkflowStepDurationHistogram(ctx, int64(stepExecutionDuration))
 
@@ -868,7 +868,7 @@ func (e *Engine) interpolateEnvVars(config map[string]any, env exec.Env) (*value
 // registry (for capability-level configuration). It doesn't perform any caching of the config values, since
 // the two registries perform their own caching.
 func (e *Engine) configForStep(ctx context.Context, lggr logger.Logger, step *step) (*values.Map, error) {
-	secrets, err := e.secretsFetcher.SecretsFor(ctx, e.workflow.owner, e.workflow.name)
+	secrets, err := e.secretsFetcher.SecretsFor(ctx, e.workflow.owner, e.workflow.hexName)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch secrets: %w", err)
 	}
@@ -960,7 +960,7 @@ func (e *Engine) executeStep(ctx context.Context, lggr logger.Logger, msg stepRe
 			WorkflowID:               msg.state.WorkflowID,
 			WorkflowExecutionID:      msg.state.ExecutionID,
 			WorkflowOwner:            e.workflow.owner,
-			WorkflowName:             e.workflow.name,
+			WorkflowName:             e.workflow.hexName,
 			WorkflowDonID:            e.localNode.WorkflowDON.ID,
 			WorkflowDonConfigVersion: e.localNode.WorkflowDON.ConfigVersion,
 			ReferenceID:              msg.stepRef,
@@ -986,7 +986,7 @@ func (e *Engine) deregisterTrigger(ctx context.Context, t *triggerCapability, tr
 			WorkflowID:               e.workflow.id,
 			WorkflowDonID:            e.localNode.WorkflowDON.ID,
 			WorkflowDonConfigVersion: e.localNode.WorkflowDON.ConfigVersion,
-			WorkflowName:             e.workflow.name,
+			WorkflowName:             e.workflow.hexName,
 			WorkflowOwner:            e.workflow.owner,
 			ReferenceID:              t.Ref,
 		},
@@ -1286,7 +1286,7 @@ func NewEngine(ctx context.Context, cfg Config) (engine *Engine, err error) {
 
 	workflow.id = cfg.WorkflowID
 	workflow.owner = cfg.WorkflowOwner
-	workflow.name = hex.EncodeToString([]byte(cfg.WorkflowName))
+	workflow.hexName = hex.EncodeToString([]byte(cfg.WorkflowName))
 
 	engine = &Engine{
 		cma:            cma,
diff --git a/core/services/workflows/models.go b/core/services/workflows/models.go
index 0faf66d9883..e5d26a474f6 100644
--- a/core/services/workflows/models.go
+++ b/core/services/workflows/models.go
@@ -20,9 +20,9 @@ import (
 // treated differently due to their nature of being the starting
 // point of a workflow.
 type workflow struct {
-	id    string
-	owner string
-	name  string
+	id      string
+	owner   string
+	hexName string
 	graph.Graph[string, *step]
 
 	triggers []*triggerCapability