diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStepExecution.java
index 05189de..8c014ae 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStepExecution.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStepExecution.java
@@ -88,7 +88,11 @@ public boolean start() throws Exception {
             final ParameterizedJobMixIn.ParameterizedJob project = (ParameterizedJobMixIn.ParameterizedJob) item;
             getContext().get(TaskListener.class).getLogger().println("Scheduling project: " + ModelHyperlinkNote.encodeTo(project));
 
-            node.addAction(new LabelAction(Messages.BuildTriggerStepExecution_building_(project.getFullDisplayName())));
+            if (!step.getWait() || step.getWaitForStart()) {
+                node.addAction(new LabelAction(Messages.BuildTriggerStepExecution_scheduling_(project.getFullDisplayName())));
+            } else {
+                node.addAction(new LabelAction(Messages.BuildTriggerStepExecution_building_(project.getFullDisplayName())));
+            }
 
             if (step.getWait() || step.getWaitForStart()) {
                 StepContext context = getContext();
@@ -115,6 +119,12 @@ public boolean start() throws Exception {
             Queue.Task task = (Queue.Task) item;
             getContext().get(TaskListener.class).getLogger().println("Scheduling item: " + ModelHyperlinkNote.encodeTo(item));
             node.addAction(new LabelAction(Messages.BuildTriggerStepExecution_building_(task.getFullDisplayName())));
+            if (!step.getWait() || step.getWaitForStart()) {
+                node.addAction(new LabelAction(Messages.BuildTriggerStepExecution_scheduling_(task.getFullDisplayName())));
+            } else {
+                node.addAction(new LabelAction(Messages.BuildTriggerStepExecution_building_(task.getFullDisplayName())));    
+            }
+
             if (step.getWait() || step.getWaitForStart()) {
                 StepContext context = getContext();
                 actions.add(new BuildTriggerAction(context, step.isPropagate(), step.getWaitForStart()));
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/WaitForBuildStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/WaitForBuildStepExecution.java
index dbb936a..d8385a5 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/WaitForBuildStepExecution.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/WaitForBuildStepExecution.java
@@ -10,6 +10,9 @@
 import hudson.model.Run;
 import hudson.model.TaskListener;
 import jenkins.model.Jenkins;
+
+import org.jenkinsci.plugins.workflow.actions.LabelAction;
+import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.jenkinsci.plugins.workflow.steps.AbstractStepExecutionImpl;
 import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
@@ -39,6 +42,9 @@ public boolean start() throws Exception {
             throw new AbortException("No build exists with runId " + step.getRunId());
         }
 
+        FlowNode node = getContext().get(FlowNode.class);
+        node.addAction(new LabelAction(Messages.WaitForBuildStepExecution_waitfor_(step.getRunId())));
+
         String runHyperLink = ModelHyperlinkNote.encodeTo("/" + run.getUrl(), run.getFullDisplayName());
         TaskListener taskListener = getContext().get(TaskListener.class);
         if (run.isBuilding()) {
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/Messages.properties b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/Messages.properties
index ef80890..b66b7df 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/Messages.properties
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/Messages.properties
@@ -28,7 +28,9 @@ BuildTriggerStep.no_job_configured=No job configured
 BuildTriggerStep.cannot_find=No such job {0}
 BuildTriggerStep.unsupported=Building a {0} is not supported
 BuildTriggerStepExecution.building_=Building {0}
+BuildTriggerStepExecution.scheduling_=Scheduling {0}
 BuildTriggerStepExecution.convertedParameterDescription=\
     {0} (Automatically converted to {1} because {2} passed the parameter using a different type)
 WaitForBuildStep.cannot_find=No such run with externalizable id {0}
 WaitForBuildStep.no_run_configured=No runId configured
+WaitForBuildStepExecution.waitfor_=Wait for {0} to complete