diff --git a/README.md b/README.md
index aca526f96..614f43663 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Building continuous delivery pipelines and similarly complex tasks in Jenkins using freestyle projects and traditional plugins can be awkward.
 You need to mix Parameterized Trigger, Copy Artifact, Promoted Builds, Conditional Build Step, and more just to express what should be a simple script.
-The Pipeline plugin suite attempts to make it possible to directly write that script, what people often call a _workflow_ (sometimes abbreviated _flow_), while integrating with Jenkins features like slaves and publishers.
+The Pipeline plugin (formerly known as Workflow) suite attempts to make it possible to directly write that script, what people often call a _pipeline_, while integrating with Jenkins features like slaves and publishers.
 
 # Features
 
@@ -19,7 +19,7 @@ Plugins can add further steps.
 
 ## Pause and resume execution
 
-If Jenkins is restarted (intentionally, or because of a crash) while your workflow is running, when it comes back up, execution is resumed where it left off.
+If Jenkins is restarted (intentionally, or because of a crash) while your Pipeline is running, when it comes back up, execution is resumed where it left off.
 This applies to external processes (shell scripts) so long as the slave can be reattached, and losing the slave connection temporarily is not fatal either.
 
 Pipelines can pause in the middle and wait for a human to approve something, or enter some information.
diff --git a/TUTORIAL.md b/TUTORIAL.md
index 090d76e25..75cc85b6a 100644
--- a/TUTORIAL.md
+++ b/TUTORIAL.md
@@ -1,8 +1,8 @@
- This document is intended for new users of the Pipeline feature to learn how to write and understand pipelines.
+This document is intended for new users of the pipeline feature to learn how to write and understand pipelines.
 
 # Why Pipeline?
 
-Pipeline was built with the community’s requirements for a flexible, extensible, and script-based CD pipeline capability for Jenkins in mind. To that end, Pipeline:
+Pipeline (formerly known as Workflow) was built with the community’s requirements for a flexible, extensible, and script-based CD pipeline capability for Jenkins in mind. To that end, Pipeline:
 
 * Can support complex, real-world, CD Pipeline requirements: pipelines can fork/join, loop, *parallel*, to name a few
 * Is Resilient: pipeline executions can survive master restarts
diff --git a/aggregator/pom.xml b/aggregator/pom.xml
index c703eb93e..2297d9f87 100644
--- a/aggregator/pom.xml
+++ b/aggregator/pom.xml
@@ -32,7 +32,7 @@
     </parent>
     <artifactId>workflow-aggregator</artifactId>
     <packaging>hpi</packaging>
-    <name>Pipeline</name>
+    <name>Pipeline (formerly known as Workflow)</name>
     <url>https://wiki.jenkins-ci.org/display/JENKINS/Workflow+Plugin</url>
     <dependencies>
         <dependency>
diff --git a/job/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/newInstanceDetail.jelly b/job/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/newInstanceDetail.jelly
index 34c58eb1b..8932a5fde 100644
--- a/job/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/newInstanceDetail.jelly
+++ b/job/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/newInstanceDetail.jelly
@@ -26,6 +26,6 @@
 
 <j:jelly xmlns:j="jelly:core">
     Orchestrates long-running activities that can span multiple build slaves. Suitable for
-    building pipelines and/or organizing complex activities that do not easily fit
+    building pipelines (formerly known as workflows) and/or organizing complex activities that do not easily fit
     in free-style job type.
 </j:jelly>