diff --git a/README.md b/README.md
index aecfc43..a247826 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ The s3hub command provides following features:
 |Name|README|implementation|
 |:--|:--|:--|
 |[Lambda batch with EventBridge (CloudWatch Events)](./cloudformation/lambda-batch/README.md)|✅|100%|
-|[Lambda with API Gateway](./cloudformation/api-gateway-with-lambda/README.md)|✅|100%|
+|[Lambda with API Gateway](./cloudformation/lambda-with-api-gw/README.md)|✅|100%|
 |[CloudWatch Real User Monitoring (RUM)](./cloudformation/cloudwatch-rum/README.md)|✅|100%|
 
 
diff --git a/cloudformation/Makefile b/cloudformation/Makefile
index 3fc9e32..093a7da 100644
--- a/cloudformation/Makefile
+++ b/cloudformation/Makefile
@@ -7,4 +7,5 @@ help: ## Show this help
 deploy: ## Deploy CloudFormation Template
 	cd static-web-site-distribution && make test-deploy || { echo "Deployment of static-web-site-distribution failed"; exit 1; }
 	cd lambda-batch && make test-deploy || { echo "Deployment of lambda-batch failed"; exit 1; }
+	cd lambda-with-api-gw && make test-deploy || { echo "Deployment of lambda-with-api-gw failed"; exit 1; }
 	cd cloudwatch-rum && make test-deploy || { echo "Deployment of cloudwatch-rum failed"; exit 1; }
\ No newline at end of file
diff --git a/cloudformation/api-gateway-with-lambda/.gitignore b/cloudformation/lambda-with-api-gw/.gitignore
similarity index 100%
rename from cloudformation/api-gateway-with-lambda/.gitignore
rename to cloudformation/lambda-with-api-gw/.gitignore
diff --git a/cloudformation/api-gateway-with-lambda/Makefile b/cloudformation/lambda-with-api-gw/Makefile
similarity index 97%
rename from cloudformation/api-gateway-with-lambda/Makefile
rename to cloudformation/lambda-with-api-gw/Makefile
index 0ac2fe8..8b1acdd 100644
--- a/cloudformation/api-gateway-with-lambda/Makefile
+++ b/cloudformation/lambda-with-api-gw/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 
 BINARY_NAME = bootstrap
-AWS_STACK_NAME = lambda-batch
+AWS_STACK_NAME = lambda-with-api-gw
 TEMPLATE_FILE = template.yml
 
 .PHONY: help clean dependency_check build deploy
diff --git a/cloudformation/api-gateway-with-lambda/README.md b/cloudformation/lambda-with-api-gw/README.md
similarity index 98%
rename from cloudformation/api-gateway-with-lambda/README.md
rename to cloudformation/lambda-with-api-gw/README.md
index b339be9..d9f04fe 100644
--- a/cloudformation/api-gateway-with-lambda/README.md
+++ b/cloudformation/lambda-with-api-gw/README.md
@@ -1,4 +1,4 @@
-## API Gateway with Lambda
+## Lambda with API Gateway
 ### Overview
 
 Lambda and API Gateway combined infrastructure is a powerful means for realizing serverless architecture. Lambda is a service for executing code, while API Gateway creates HTTP endpoints and forwards requests to Lambda functions.
diff --git a/cloudformation/api-gateway-with-lambda/lambda-with-apigateway.drawio b/cloudformation/lambda-with-api-gw/lambda-with-apigateway.drawio
similarity index 100%
rename from cloudformation/api-gateway-with-lambda/lambda-with-apigateway.drawio
rename to cloudformation/lambda-with-api-gw/lambda-with-apigateway.drawio
diff --git a/cloudformation/api-gateway-with-lambda/lambda-with-apigateway.png b/cloudformation/lambda-with-api-gw/lambda-with-apigateway.png
similarity index 100%
rename from cloudformation/api-gateway-with-lambda/lambda-with-apigateway.png
rename to cloudformation/lambda-with-api-gw/lambda-with-apigateway.png
diff --git a/cloudformation/api-gateway-with-lambda/main.go b/cloudformation/lambda-with-api-gw/main.go
similarity index 100%
rename from cloudformation/api-gateway-with-lambda/main.go
rename to cloudformation/lambda-with-api-gw/main.go
diff --git a/cloudformation/api-gateway-with-lambda/template.yml b/cloudformation/lambda-with-api-gw/template.yml
similarity index 100%
rename from cloudformation/api-gateway-with-lambda/template.yml
rename to cloudformation/lambda-with-api-gw/template.yml