diff --git a/README.md b/README.md
index a11d523..2fd2f0d 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 [![GitHub release](https://img.shields.io/github/release/jenkinsci/cloudbees-disk-usage-simple-plugin.svg?label=changelog)](https://github.com/jenkinsci/cloudbees-disk-usage-simple-plugin/releases/latest)
 [![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/cloudbees-disk-usage-simple.svg?color=blue)](https://plugins.jenkins.io/cloudbees-disk-usage-simple)
 
-Simple disk usage plugin that calculates disk usage while limiting the performance impact on the Jenkins master.
+Simple disk usage plugin that calculates disk usage while limiting the performance impact on the Jenkins controller.
 
 # Features
 * uses Java 7 NIO directory walker API to calculate the size of jobs and 1st level directories under `$JENKINS_HOME`
diff --git a/pom.xml b/pom.xml
index 1a4c1eb..579f621 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
   <packaging>hpi</packaging>
 
   <name>CloudBees Disk Usage Simple Plugin</name>
-  <description>This is a simple disk usage plugin that calculates job disk usage while limiting the performance impact on the Jenkins master.</description>
+  <description>This is a simple disk usage plugin that calculates job disk usage while limiting the performance impact on the Jenkins controller.</description>
   <url>https://github.com/jenkinsci/cloudbees-disk-usage-simple-plugin</url>
 
   <properties>
diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/index.jelly b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/index.jelly
index 87e59d1..3edfe6f 100644
--- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/index.jelly
+++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/index.jelly
@@ -79,7 +79,7 @@
                 
                 <p> 
                     e.g. A 100MB WAR file is archived and 30 builds are retained in the build history - this will result in 3GB of
-                    usage for a single Jenkins job.  By default builds are retained forever - thus the storage requirement for Jenkins master is unbounded.
+                    usage for a single Jenkins job.  By default builds are retained forever - thus the storage requirement for the Jenkins controller is unbounded.
                 </p>
 
                 <h4>Limiting Disk Usage</h4>
diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
index 23dc18b..0804772 100644
--- a/src/main/resources/index.jelly
+++ b/src/main/resources/index.jelly
@@ -25,5 +25,5 @@
 -->
 <?jelly escape-by-default='true'?>
 <div>
-    Alternative to disk-usage plugin, to compute in the background per job disk usage on jenkins master
+    Alternative to disk-usage plugin, to compute in the background per job disk usage on the Jenkins controller
 </div>
\ No newline at end of file