diff --git a/cdk.context.json b/cdk.context.json
index f990db2..0b5e5fc 100644
--- a/cdk.context.json
+++ b/cdk.context.json
@@ -1,5 +1,5 @@
 {
-  "main_resources_name": "fastapi-lambda",
+  "main_resources_name": "fastapi-lambda-cdk",
   "tags": {
     "Owner": "Santiago Garcia Arango",
     "Source": "https://github.com/san99tiago/aws-fastapi-lambda",
diff --git a/cdk/stacks/cdk_lambda_fastapi_stack.py b/cdk/stacks/cdk_lambda_fastapi_stack.py
index 1abc70b..da13887 100644
--- a/cdk/stacks/cdk_lambda_fastapi_stack.py
+++ b/cdk/stacks/cdk_lambda_fastapi_stack.py
@@ -50,7 +50,8 @@ def create_lambda_layers(self):
         # Layer for "FastAPI" and "Mangum" Adapter libraries
         self.lambda_layer_fastapi = aws_lambda.LayerVersion(
             self,
-            id="LambdaLayer-FastAPI",
+            "LambdaLayer-FastAPI",
+            layer_version_name=f"{self.main_resources_name}-layer-{self.deployment_environment}",
             code=aws_lambda.Code.from_asset("lambda-layers/fastapi/modules"),
             compatible_runtimes=[
                 aws_lambda.Runtime.PYTHON_3_11,
@@ -74,7 +75,8 @@ def create_lambda_functions(self):
         )
         self.lambda_fastapi: aws_lambda.Function = aws_lambda.Function(
             self,
-            id="Lambda-FastAPI",
+            "Lambda-FastAPI",
+            function_name=f"{self.main_resources_name}-lambda-{self.deployment_environment}",
             runtime=aws_lambda.Runtime.PYTHON_3_12,
             handler="api/main.handler",
             code=aws_lambda.Code.from_asset(PATH_TO_LAMBDA_FUNCTION_FOLDER),