diff --git a/.wordlist.txt b/.wordlist.txt
index 5d75e185d..fc63f9fe7 100644
--- a/.wordlist.txt
+++ b/.wordlist.txt
@@ -196,14 +196,12 @@ eks
 hostname
 mySqlDB
 rds
-sandboxid
 vpc
 acl
 arn
 downcase
 eks
 robotshop
-sandboxid
 BucketArn
 arn
 connectionString
@@ -216,7 +214,6 @@ objectStore
 redis
 robotShopMicroservices
 robotshop
-sandboxid
 storageClassName
 OIDC
 MSI
diff --git a/docs/blueprint-designer-guide/blueprint-quickstart-guide.md b/docs/blueprint-designer-guide/blueprint-quickstart-guide.md
index a28069584..a8e9f566e 100644
--- a/docs/blueprint-designer-guide/blueprint-quickstart-guide.md
+++ b/docs/blueprint-designer-guide/blueprint-quickstart-guide.md
@@ -104,7 +104,7 @@ grains:
       agent:
         name: eks-demo
       inputs:
-        - sandbox_id: '{{ sandboxid | downcase }}'
+        - sandbox_id: '{{ envId | downcase }}'
         - size: small 
         - allocated_storage: 20
         - db_name: demo_db
@@ -127,7 +127,7 @@ grains:
       inputs:
         - region: eu-west-1
         - acl: public-read
-        - name: 'robotshop-s3-{{ sandboxid | downcase }}'
+        - name: 'robotshop-s3-{{ envId | downcase }}'
       outputs:
         - s3_bucket_arn
 
@@ -140,7 +140,7 @@ grains:
       agent:
         name: eks-demo
       inputs:
-        - hostname: 'robotshop-{{ sandboxid | downcase }}'
+        - hostname: 'robotshop-{{ envId | downcase }}'
         - version: 0.4.3
         - connectionString: '{{ .grains.mySqlDB.outputs.connection_string }}'
         - objectStore.s3BucketArn: '{{ .grains.s3Bucket.outputs.s3_bucket_arn }}'
@@ -192,7 +192,7 @@ grains:
         service-account: app-sa
       inputs:
         - AccessControl: '{{ .inputs.["Access Control"] }}'
-        - BucketName: '{{ .inputs.["Bucket Name"] }}-{{ sandboxid | downcase }}'
+        - BucketName: '{{ .inputs.["Bucket Name"] }}-{{ envId | downcase }}'
       outputs:
          - Arn
          - DomainName
@@ -208,7 +208,7 @@ grains:
         name: demo-prod
         service-account: app-sa
       inputs:
-      - bucket_name: '{{ .inputs.["Bucket Name"] }}-{{ sandboxid | downcase }}'
+      - bucket_name: '{{ .inputs.["Bucket Name"] }}-{{ envId | downcase }}'
       - region: '{{ .inputs.["AWS Region"] }}'
       outputs:
       - website_link
diff --git a/docs/blueprint-designer-guide/blueprints/blueprint-grain.md b/docs/blueprint-designer-guide/blueprints/blueprint-grain.md
index b8654370a..64ab2a1fd 100644
--- a/docs/blueprint-designer-guide/blueprints/blueprint-grain.md
+++ b/docs/blueprint-designer-guide/blueprints/blueprint-grain.md
@@ -65,7 +65,7 @@ grains:
       inputs:
         - domain: 'torque-demo.click'
         - redis.storageClassName: gp2
-        - hostname: 'app--{{ sandboxid | downcase }}'
+        - hostname: 'app--{{ envId | downcase }}'
         - version: '{{ .inputs.version }}'
         - connectionString: '{{ .grains.infra.outputs.connection_string }}'
         - objectStore.s3BucketArn: '{{ .grains.infra.outputs.s3_bucket_arn }}'
diff --git a/docs/blueprint-designer-guide/blueprints/blueprints-yaml-structure.md b/docs/blueprint-designer-guide/blueprints/blueprints-yaml-structure.md
index af3568091..48944beb5 100644
--- a/docs/blueprint-designer-guide/blueprints/blueprints-yaml-structure.md
+++ b/docs/blueprint-designer-guide/blueprints/blueprints-yaml-structure.md
@@ -285,7 +285,7 @@ Outputs are a dictionary composed by the output name and the output value.
 ```yaml
 outputs:
   website-url:
-    value: 'https://application-name-{{ sandboxid | downcase }}.quali.click'
+    value: 'https://application-name-{{ envId | downcase }}.quali.click'
     quick: true # optional. default false
     kind: link
   db-hostname:
@@ -1161,7 +1161,7 @@ Example:
 * Reference an output from a grain as an input or attribute of another grain (mandates "depends-on:" relationship between the grains)
 
 
-In the below example the [downcase](https://shopify.github.io/liquid/filters/downcase/) and [strip](https://shopify.github.io/liquid/filters/strip/) keywords are used with concatenation of the sandbox id to create a new S3 bucket (AWS) using Terraform while making sure the bucket name will be valid and unique.
+In the below example the [downcase](https://shopify.github.io/liquid/filters/downcase/) and [strip](https://shopify.github.io/liquid/filters/strip/) keywords are used with concatenation of the environment id to create a new S3 bucket (AWS) using Terraform while making sure the bucket name will be valid and unique.
 
 ```yaml 
   s3_bucket:
@@ -1173,7 +1173,7 @@ In the below example the [downcase](https://shopify.github.io/liquid/filters/dow
       agent:
         name: '{{ .inputs.agent_name }}'
       inputs:
-        - bucket_name: '{{ .inputs.bucket_name | strip }}-bucket-{{ envid | downcase }}'
+        - bucket_name: '{{ .inputs.bucket_name | strip }}-bucket-{{ envId | downcase }}'
 ```
 
 For details and examples of how to use the parameters from the parameter store inside blueprints, check [this article](#parameters).
diff --git a/docs/blueprint-designer-guide/blueprints/cloudformation-grain.md b/docs/blueprint-designer-guide/blueprints/cloudformation-grain.md
index 4496de35a..5187e68ae 100644
--- a/docs/blueprint-designer-guide/blueprints/cloudformation-grain.md
+++ b/docs/blueprint-designer-guide/blueprints/cloudformation-grain.md
@@ -90,7 +90,7 @@ grains:
         - '{{ .inputs.aws_credentials }}'
       inputs:
         - AccessControl: '{{ .inputs.access_control }}'
-        - BucketName: '{{ .inputs.bucket_name }}-{{ sandboxid | downcase }}'
+        - BucketName: '{{ .inputs.bucket_name }}-{{ envId | downcase }}'
       outputs:
         - Arn
         - DomainName
diff --git a/docs/blueprint-designer-guide/blueprints/helm-grain.md b/docs/blueprint-designer-guide/blueprints/helm-grain.md
index cbdc4c1c8..b235f0d35 100644
--- a/docs/blueprint-designer-guide/blueprints/helm-grain.md
+++ b/docs/blueprint-designer-guide/blueprints/helm-grain.md
@@ -50,14 +50,14 @@ grains:
       agent:
         name: '{{ .inputs.agent }}'
       inputs:
-        - nameOverride: '{{ envid | downcase }}'
+        - nameOverride: '{{ envId | downcase }}'
         - tracking.auth.password: '{{ .inputs.admin-password }}'
       scripts:
         post-helm-install:
           source:
             store: ml-repo
             path: scripts/get-url.sh
-          arguments: '{{ envid | downcase }} {{ .inputs.target-namespace }}'
+          arguments: '{{ envId | downcase }} {{ .inputs.target-namespace }}'
           outputs:
             - url
       commands:
@@ -286,14 +286,14 @@ grains:
       agent:
         name: '{{ .inputs.agent }}'
       inputs:
-      - nameOverride: '{{ envid | downcase }}'
+      - nameOverride: '{{ envId | downcase }}'
       - tracking.auth.password: '{{ .inputs.admin-password }}'
       scripts:
         post-helm-install:
           source:
             store: ml-repo
             path:  scripts/get-url.sh
-          arguments: '{{ envid | downcase }} {{ .inputs.target-namespace }}'
+          arguments: '{{ envId | downcase }} {{ .inputs.target-namespace }}'
           outputs:
             - url
       commands: