diff --git a/docs/devguide/creating-beat-from-metricbeat.asciidoc b/docs/devguide/creating-beat-from-metricbeat.asciidoc
index 62f437234e8..0b807737fa7 100644
--- a/docs/devguide/creating-beat-from-metricbeat.asciidoc
+++ b/docs/devguide/creating-beat-from-metricbeat.asciidoc
@@ -91,7 +91,7 @@ The first step is to get the most recent packaging tools into your beat:
 
 [source,bash]
 ----
-make package
+make release
 ----
 
 This will fetch the most recent packaging tools and start the packaging of your beat. This can take a little bit longer.
diff --git a/generator/beat/{beat}/README.md b/generator/beat/{beat}/README.md
index 97764e731cf..db9ece02471 100644
--- a/generator/beat/{beat}/README.md
+++ b/generator/beat/{beat}/README.md
@@ -111,7 +111,7 @@ For further development, check out the [beat developer guide](https://www.elasti
 The beat frameworks provides tools to crosscompile and package your beat for different platforms. This requires [docker](https://www.docker.com/) and vendoring as described above. To build packages of your beat, run the following command:
 
 ```
-make package
+make release
 ```
 
 This will fetch and create all images required for the build process. The whole process to finish can take several minutes.
diff --git a/generator/metricbeat/{beat}/README.md b/generator/metricbeat/{beat}/README.md
index 4c1677265a2..cf71741f5fe 100644
--- a/generator/metricbeat/{beat}/README.md
+++ b/generator/metricbeat/{beat}/README.md
@@ -76,7 +76,7 @@ git commit -m "Add {beat}"
 The beat frameworks provides tools to crosscompile and package your beat for different platforms. This requires [docker](https://www.docker.com/) and vendoring as described above. To build packages of your beat, run the following command:
 
 ```
-make package
+make release
 ```
 
 This will fetch and create all images required for the build process. The hole process to finish can take several minutes.
diff --git a/libbeat/common/seccomp/README.md b/libbeat/common/seccomp/README.md
index a4b4db1b775..ee78e41dfe2 100644
--- a/libbeat/common/seccomp/README.md
+++ b/libbeat/common/seccomp/README.md
@@ -20,7 +20,7 @@ profiles are built based on the binaries you plan to release. The policies are
 stored at `$beatname/include/seccomp_linux_$goarch.go`.
 
 ```sh
-make package && make seccomp-package
+make release && make seccomp-package
 ```
 
 If you are developing on Linux you can profile the binary produced by `make`.
diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile
index 14b8c2bc356..3e0f763e72a 100755
--- a/libbeat/scripts/Makefile
+++ b/libbeat/scripts/Makefile
@@ -13,7 +13,7 @@ BEAT_GOPATH=$(firstword $(subst :, ,${GOPATH}))
 BEAT_REF_YAML?=true
 ES_BEATS?=..## @community_beat Must be set to ./vendor/github.com/elastic/beats. It must always be a relative path.
 GOPACKAGES?=$(shell go list ${BEAT_PATH}/... | grep -v /vendor/ | grep -v /scripts/cmd/ )
-PACKER_TEMPLATES_DIR?=${ES_BEATS}/dev-tools/packer ## @Building Directory of templates that are used by "make package"
+PACKER_TEMPLATES_DIR?=${ES_BEATS}/dev-tools/packer ## @Building Directory of templates that are used by "make release"
 NOTICE_FILE?=../NOTICE.txt
 LICENSE_FILE?=../licenses/APACHE-LICENSE-2.0.txt
 ELASTIC_LICENSE_FILE?=../licenses/ELASTIC-LICENSE.txt