diff --git a/README.md b/README.md
index 8e1da3b86..4a25b4fb9 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ For a deep dive into the project, refer to the Spring Cloud AWS documentation:
## Sponsors
-Big thanks to [Localstack](https://localstack.cloud) for providing PRO licenses to the development team!
+Big thanks to [LocalStack](https://localstack.cloud) for providing PRO licenses to the development team!
diff --git a/docs/src/main/asciidoc/core.adoc b/docs/src/main/asciidoc/core.adoc
index fb88e3fde..91095a154 100644
--- a/docs/src/main/asciidoc/core.adoc
+++ b/docs/src/main/asciidoc/core.adoc
@@ -199,7 +199,7 @@ class CustomRegionProviderConfiguration {
=== Endpoint
-To simplify using services with AWS compatible APIs, or running applications against https://localstack.cloud/[Localstack], it is possible to configure an endpoint set on all auto-configured AWS clients:
+To simplify using services with AWS compatible APIs, or running applications against https://localstack.cloud/[LocalStack], it is possible to configure an endpoint set on all auto-configured AWS clients:
[cols="3*", options="header"]
|===
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientTests.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientTests.java
index 81f78d9b6..b99e5bf9e 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientTests.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientTests.java
@@ -45,7 +45,7 @@
import software.amazon.awssdk.services.s3.waiters.S3Waiter;
/**
- * Unit tests for {@link CrossRegionS3Client}. Integration testing with Localstack is not possible due to:
+ * Unit tests for {@link CrossRegionS3Client}. Integration testing with LocalStack is not possible due to:
* ...
*
* @author Maciej Walkowiak
diff --git a/spring-cloud-aws-samples/readme.md b/spring-cloud-aws-samples/readme.md
index f2aa59974..60a869228 100644
--- a/spring-cloud-aws-samples/readme.md
+++ b/spring-cloud-aws-samples/readme.md
@@ -1,8 +1,8 @@
# Spring Cloud AWS Samples
-Samples are prepared to run on Localstack - a local equivalent of AWS.
+Samples are prepared to run on LocalStack - a local equivalent of AWS.
-To start Localstack locally:
+To start LocalStack locally:
```
$ docker-compose up
@@ -30,7 +30,7 @@ Samples are regular Spring Boot applications. The best way to run them is to run
## How to destroy infrastructure?
-Infrastructure is destroyed once Localstack container shuts down. If you want to destroy infrastructure manually, run:
+Infrastructure is destroyed once LocalStack container shuts down. If you want to destroy infrastructure manually, run:
```
$ cdklocal destroy
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-dynamodb-sample/src/main/resources/application.properties b/spring-cloud-aws-samples/spring-cloud-aws-dynamodb-sample/src/main/resources/application.properties
index ff20e53b4..3aad6fe67 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-dynamodb-sample/src/main/resources/application.properties
+++ b/spring-cloud-aws-samples/spring-cloud-aws-dynamodb-sample/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-# Localstack configuration
+# LocalStack configuration
spring.cloud.aws.endpoint=http://localhost:4566
spring.cloud.aws.region.static=us-east-1
spring.cloud.aws.credentials.access-key=noop
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-parameter-store-sample/src/main/resources/application.properties b/spring-cloud-aws-samples/spring-cloud-aws-parameter-store-sample/src/main/resources/application.properties
index da13bc1c3..6528c609d 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-parameter-store-sample/src/main/resources/application.properties
+++ b/spring-cloud-aws-samples/spring-cloud-aws-parameter-store-sample/src/main/resources/application.properties
@@ -2,7 +2,7 @@
spring.config.import=aws-parameterstore:/config/spring/
logging.level.io.awspring.cloud=debug
-# Localstack configuration
+# LocalStack configuration
spring.cloud.aws.endpoint=http://localhost:4566
spring.cloud.aws.region.static=us-east-1
spring.cloud.aws.credentials.access-key=noop
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/src/main/resources/application.properties b/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/src/main/resources/application.properties
index ff20e53b4..3aad6fe67 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/src/main/resources/application.properties
+++ b/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-# Localstack configuration
+# LocalStack configuration
spring.cloud.aws.endpoint=http://localhost:4566
spring.cloud.aws.region.static=us-east-1
spring.cloud.aws.credentials.access-key=noop
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-secrets-manager-sample/src/main/resources/application.yml b/spring-cloud-aws-samples/spring-cloud-aws-secrets-manager-sample/src/main/resources/application.yml
index aac593456..079bd3956 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-secrets-manager-sample/src/main/resources/application.yml
+++ b/spring-cloud-aws-samples/spring-cloud-aws-secrets-manager-sample/src/main/resources/application.yml
@@ -2,7 +2,7 @@
spring.config.import: aws-secretsmanager:/secrets/spring-cloud-aws-sample-app
logging.level.io.awspring.cloud.secretsmanager: debug
-# Localstack configuration
+# LocalStack configuration
spring.cloud.aws.endpoint: http://localhost:4566
spring.cloud.aws.region.static: us-east-1
spring.cloud.aws.credentials.access-key: noop
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-ses-sample/src/main/resources/application.properties b/spring-cloud-aws-samples/spring-cloud-aws-ses-sample/src/main/resources/application.properties
index ff20e53b4..3aad6fe67 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-ses-sample/src/main/resources/application.properties
+++ b/spring-cloud-aws-samples/spring-cloud-aws-ses-sample/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-# Localstack configuration
+# LocalStack configuration
spring.cloud.aws.endpoint=http://localhost:4566
spring.cloud.aws.region.static=us-east-1
spring.cloud.aws.credentials.access-key=noop
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-sns-sample/src/main/resources/application.properties b/spring-cloud-aws-samples/spring-cloud-aws-sns-sample/src/main/resources/application.properties
index ff20e53b4..3aad6fe67 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-sns-sample/src/main/resources/application.properties
+++ b/spring-cloud-aws-samples/spring-cloud-aws-sns-sample/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-# Localstack configuration
+# LocalStack configuration
spring.cloud.aws.endpoint=http://localhost:4566
spring.cloud.aws.region.static=us-east-1
spring.cloud.aws.credentials.access-key=noop
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-sqs-sample/src/main/resources/application.properties b/spring-cloud-aws-samples/spring-cloud-aws-sqs-sample/src/main/resources/application.properties
index ff20e53b4..3aad6fe67 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-sqs-sample/src/main/resources/application.properties
+++ b/spring-cloud-aws-samples/spring-cloud-aws-sqs-sample/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-# Localstack configuration
+# LocalStack configuration
spring.cloud.aws.endpoint=http://localhost:4566
spring.cloud.aws.region.static=us-east-1
spring.cloud.aws.credentials.access-key=noop
diff --git a/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java b/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java
index f6e88c179..bd7189beb 100644
--- a/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java
+++ b/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java
@@ -65,7 +65,7 @@ static synchronized void beforeAll() {
@DynamicPropertySource
static void registerSqsProperties(DynamicPropertyRegistry registry) {
- // overwrite SQS endpoint with one provided by Localstack
+ // overwrite SQS endpoint with one provided by LocalStack
registry.add("spring.cloud.aws.endpoint", () -> localstack.getEndpointOverride(SQS).toString());
}
diff --git a/spring-cloud-aws-test/src/test/java/io/awspring/cloud/test/sqs/BaseSqsIntegrationTest.java b/spring-cloud-aws-test/src/test/java/io/awspring/cloud/test/sqs/BaseSqsIntegrationTest.java
index 53603cf3d..9b6e8a0bc 100644
--- a/spring-cloud-aws-test/src/test/java/io/awspring/cloud/test/sqs/BaseSqsIntegrationTest.java
+++ b/spring-cloud-aws-test/src/test/java/io/awspring/cloud/test/sqs/BaseSqsIntegrationTest.java
@@ -42,7 +42,7 @@ static void beforeAll() throws IOException, InterruptedException {
@DynamicPropertySource
static void registerSqsProperties(DynamicPropertyRegistry registry) {
- // overwrite SQS endpoint with one provided by Localstack
+ // overwrite SQS endpoint with one provided by LocalStack
registry.add("spring.cloud.aws.sqs.endpoint", () -> localstack.getEndpointOverride(SQS).toString());
}