diff --git a/scaffolder-templates/create-tenant/template.yaml b/scaffolder-templates/create-tenant/template.yaml
index 2191799..86c0700 100644
--- a/scaffolder-templates/create-tenant/template.yaml
+++ b/scaffolder-templates/create-tenant/template.yaml
@@ -36,8 +36,8 @@ spec:
           enum: ['dev', 'prod']
             
   steps:
-    - id: createDevTenant
-      name: Create Dev tenant
+    - id: devTenantCheck
+      name: Check if Dev tenant
       if: ${{parameters.tenant_environment === 'dev'}}
       action: http:backstage:request
       input:
@@ -52,8 +52,8 @@ spec:
                 "skipFailures": false
               }
 
-    - id: createProdTenant
-      name: Create Prod tenant
+    - id: ProdTenantCheck
+      name: Check if Prod tenant
       if: ${{parameters.tenant_environment === 'prod'}}
       action: http:backstage:request
       input:
@@ -67,6 +67,6 @@ spec:
                 "tenantEnvironment": "prod",
                 "skipFailures": false
               }
-
+  
   output:
-    resp: ${{ steps.createDevTenant.output.body }} ${{ steps.createProdTenant.output.body }}
+    resp: ${{ steps.devTenantCheck.output.body }} ${{ steps.ProdTenantCheck.output.body }}
diff --git a/scaffolder-templates/delete-tenant/template.yaml b/scaffolder-templates/delete-tenant/template.yaml
index 0a7d7bf..6e77c91 100644
--- a/scaffolder-templates/delete-tenant/template.yaml
+++ b/scaffolder-templates/delete-tenant/template.yaml
@@ -36,8 +36,8 @@ spec:
           ui:widget: radio
             
   steps:
-    - id: deleteDevTenant
-      name: Delete Dev tenant
+    - id: devTenantCheck
+      name: Check if Dev tenant
       if: ${{parameters.tenant_environment === 'dev'}}
       action: http:backstage:request
       input:
@@ -51,8 +51,8 @@ spec:
                 "skipFailures": false
               }
 
-    - id: deleteProdTenant
-      name: Delete Prod tenant
+    - id: ProdTenantCheck
+      name: Check if Prod tenant
       if: ${{parameters.tenant_environment === 'prod'}}
       action: http:backstage:request
       input:
@@ -67,4 +67,4 @@ spec:
               }
 
   output:
-    resp: ${{ steps.deleteDevTenant.output.body }} ${{ steps.deleteProdTenant.output.body }}
+    resp: ${{ steps.devTenantCheck.output.body }} ${{ steps.ProdTenantCheck.output.body }}