diff --git a/BUILDING.md b/BUILDING.md
index da9284fa4..5867e2aab 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -102,13 +102,13 @@ the environment variable `BUILDTAGS`.
 <dd>Compiles without resumable digest support</dd>
 </dl>
 
-### Local cloud storage environment
+### Local S3 store environment
 
-You can run an S3 API compatible storage locally with [minio](https://min.io/).
+You can run an S3 API compatible store locally with [minio](https://min.io/).
 
 You must have a [docker compose](https://docs.docker.com/compose/) compatible tool installed on your workstation.
 
-Start the local cloud environment:
+Start the local S3 store environment:
 ```
 make start-s3-storage
 ```
@@ -121,9 +121,9 @@ AWS_ACCESS_KEY=distribution \
         S3_ENCRYPT=false \
         REGION_ENDPOINT=http://127.0.0.1:9000 \
         S3_SECURE=false \
-./bin/registry serve tests/conf-local-cloud.yml
+./bin/registry serve tests/conf-local-s3.yml
 ```
-Stop the local storage when done:
+Stop the local S3 store when done:
 ```
 make stop-s3-storage
 ```
diff --git a/Makefile b/Makefile
index 452cd6fa7..9647ed9a0 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ stop-s3-storage: ## stop local s3 storage (minio)
 	$(COMPOSE) -f tests/docker-compose-storage.yml down
 
 .PHONY: reset-s3-storage
-reset-s3-storage: ## reset (stop, delete, start) local cloud storage (minio)
+reset-s3-storage: ## reset (stop, delete, start) local s3 storage (minio)
 	$(COMPOSE) -f tests/docker-compose-storage.yml down
 	@mkdir -p tests/miniodata/distribution
 	@rm -rf tests/miniodata/distribution/* tests/miniodata/.minio.sys
diff --git a/tests/conf-local-cloud.yml b/tests/conf-local-s3.yml
similarity index 100%
rename from tests/conf-local-cloud.yml
rename to tests/conf-local-s3.yml