25 files changed, 45 insertions, 36 deletions
diff --git a/out/phase-1/vimscore-application/ci.yaml b/out/phase-1/acme-application/ci.yaml
index aaf8edf..2feec10 100644
--- a/out/phase-1/vimscore-application/ci.yaml
+++ b/out/phase-1/acme-application/ci.yaml
@@ -1,4 +1,4 @@
 env: ci
 key: ci
 tag: development
-type: vimscore-application
+type: acme-application
diff --git a/out/phase-1/vimscore-application/production.yaml b/out/phase-1/acme-application/production.yaml
index b9217d7..6054cec 100644
--- a/out/phase-1/vimscore-application/production.yaml
+++ b/out/phase-1/acme-application/production.yaml
@@ -1,4 +1,4 @@
 env: production
 key: production
 tag: master
-type: vimscore-application
+type: acme-application
diff --git a/out/phase-1/acme-ops/acme-ops.yaml b/out/phase-1/acme-ops/acme-ops.yaml
new file mode 100644
index 0000000..15680bd
--- /dev/null
+++ b/out/phase-1/acme-ops/acme-ops.yaml
@@ -0,0 +1,2 @@
+key: acme-ops
+type: acme-ops
diff --git a/out/phase-1/dba-cluster/vimscore-ci.yaml b/out/phase-1/dba-cluster/acme-ci.yaml
index e871ca0..fccc7ed 100644
--- a/out/phase-1/dba-cluster/vimscore-ci.yaml
+++ b/out/phase-1/dba-cluster/acme-ci.yaml
@@ -1,2 +1,2 @@
-key: vimscore-ci
+key: acme-ci
 type: dba-cluster
diff --git a/out/phase-1/dba-cluster/vimscore-ops.yaml b/out/phase-1/dba-cluster/acme-ops.yaml
index 1aaefc9..2735ff3 100644
--- a/out/phase-1/dba-cluster/vimscore-ops.yaml
+++ b/out/phase-1/dba-cluster/acme-ops.yaml
@@ -1,2 +1,2 @@
-key: vimscore-ops
+key: acme-ops
 type: dba-cluster
diff --git a/out/phase-1/dba-cluster/acme-production.yaml b/out/phase-1/dba-cluster/acme-production.yaml
new file mode 100644
index 0000000..3b7eb5a
--- /dev/null
+++ b/out/phase-1/dba-cluster/acme-production.yaml
@@ -0,0 +1,2 @@
+key: acme-production
+type: dba-cluster
diff --git a/out/phase-1/dba-cluster/vimscore-production.yaml b/out/phase-1/dba-cluster/vimscore-production.yaml
deleted file mode 100644
index 4390af6..0000000
--- a/out/phase-1/dba-cluster/vimscore-production.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-key: vimscore-production
-type: dba-cluster
diff --git a/out/phase-1/dba-container/vimscore-ci_4tune-api.yaml b/out/phase-1/dba-container/acme-ci_4tune-api.yaml
index f26244d..94e265f 100644
--- a/out/phase-1/dba-container/vimscore-ci_4tune-api.yaml
+++ b/out/phase-1/dba-container/acme-ci_4tune-api.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-ci
+cluster: acme-ci
 image: 4tune-api
-key: vimscore-ci/4tune-api
+key: acme-ci/4tune-api
 machineRole: app
 name: 4tune-api
 tag: development
diff --git a/out/phase-1/dba-container/vimscore-ci_4tune-web.yaml b/out/phase-1/dba-container/acme-ci_4tune-web.yaml
index a49e586..9127420 100644
--- a/out/phase-1/dba-container/vimscore-ci_4tune-web.yaml
+++ b/out/phase-1/dba-container/acme-ci_4tune-web.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-ci
+cluster: acme-ci
 image: 4tune-web
-key: vimscore-ci/4tune-web
+key: acme-ci/4tune-web
 machineRole: app
 name: 4tune-web
 tag: development
diff --git a/out/phase-1/dba-container/vimscore-ci_mdb.yaml b/out/phase-1/dba-container/acme-ci_mdb.yaml
index f8983a7..b49853b 100644
--- a/out/phase-1/dba-container/vimscore-ci_mdb.yaml
+++ b/out/phase-1/dba-container/acme-ci_mdb.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-ci
+cluster: acme-ci
 image: mongodb
-key: vimscore-ci/mdb
+key: acme-ci/mdb
 machineRole: db
 name: mdb
 tag: '3.2'
diff --git a/out/phase-1/dba-container/vimscore-ci_pdb.yaml b/out/phase-1/dba-container/acme-ci_pdb.yaml
index 81d0f47..d9ea55a 100644
--- a/out/phase-1/dba-container/vimscore-ci_pdb.yaml
+++ b/out/phase-1/dba-container/acme-ci_pdb.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-ci
+cluster: acme-ci
 image: postgresql
-key: vimscore-ci/pdb
+key: acme-ci/pdb
 machineRole: db
 name: pdb
 tag: '13'
diff --git a/out/phase-1/dba-container/vimscore-ci_statera-console.yaml b/out/phase-1/dba-container/acme-ci_statera-console.yaml
index 974333b..0cb0cc4 100644
--- a/out/phase-1/dba-container/vimscore-ci_statera-console.yaml
+++ b/out/phase-1/dba-container/acme-ci_statera-console.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-ci
+cluster: acme-ci
 image: statera-console
-key: vimscore-ci/statera-console
+key: acme-ci/statera-console
 machineRole: app
 name: statera-console
 ports:
diff --git a/out/phase-1/dba-container/vimscore-ci_statera.yaml b/out/phase-1/dba-container/acme-ci_statera.yaml
index 883dd2d..6a3eb98 100644
--- a/out/phase-1/dba-container/vimscore-ci_statera.yaml
+++ b/out/phase-1/dba-container/acme-ci_statera.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-ci
+cluster: acme-ci
 image: statera
-key: vimscore-ci/statera
+key: acme-ci/statera
 machineRole: app
 name: statera
 ports:
diff --git a/out/phase-1/dba-container/vimscore-ops_n8n.yaml b/out/phase-1/dba-container/acme-ops_n8n.yaml
index f82b4ba..d34efda 100644
--- a/out/phase-1/dba-container/vimscore-ops_n8n.yaml
+++ b/out/phase-1/dba-container/acme-ops_n8n.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-ops
+cluster: acme-ops
 image: n8n
-key: vimscore-ops/n8n
+key: acme-ops/n8n
 machineRole: app
 name: n8n
 tag: 0.84.1
diff --git a/out/phase-1/dba-container/vimscore-ops_pdb.yaml b/out/phase-1/dba-container/acme-ops_pdb.yaml
index 6c3bad0..a3aa769 100644
--- a/out/phase-1/dba-container/vimscore-ops_pdb.yaml
+++ b/out/phase-1/dba-container/acme-ops_pdb.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-ops
+cluster: acme-ops
 image: postgresql
-key: vimscore-ops/pdb
+key: acme-ops/pdb
 machineRole: app
 name: pdb
 tag: '11'
diff --git a/out/phase-1/dba-container/vimscore-production_4tune-api.yaml b/out/phase-1/dba-container/acme-production_4tune-api.yaml
index 3bb27ff..aa80827 100644
--- a/out/phase-1/dba-container/vimscore-production_4tune-api.yaml
+++ b/out/phase-1/dba-container/acme-production_4tune-api.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-production
+cluster: acme-production
 image: 4tune-api
-key: vimscore-production/4tune-api
+key: acme-production/4tune-api
 machineRole: app
 name: 4tune-api
 tag: master
diff --git a/out/phase-1/dba-container/vimscore-production_4tune-web.yaml b/out/phase-1/dba-container/acme-production_4tune-web.yaml
index 2c7591f..6ba5f0d 100644
--- a/out/phase-1/dba-container/vimscore-production_4tune-web.yaml
+++ b/out/phase-1/dba-container/acme-production_4tune-web.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-production
+cluster: acme-production
 image: 4tune-web
-key: vimscore-production/4tune-web
+key: acme-production/4tune-web
 machineRole: app
 name: 4tune-web
 tag: master
diff --git a/out/phase-1/dba-container/vimscore-production_mdb.yaml b/out/phase-1/dba-container/acme-production_mdb.yaml
index 56feafe..45206fe 100644
--- a/out/phase-1/dba-container/vimscore-production_mdb.yaml
+++ b/out/phase-1/dba-container/acme-production_mdb.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-production
+cluster: acme-production
 image: mongodb
-key: vimscore-production/mdb
+key: acme-production/mdb
 machineRole: db
 name: mdb
 tag: '3.2'
diff --git a/out/phase-1/dba-container/vimscore-production_pdb.yaml b/out/phase-1/dba-container/acme-production_pdb.yaml
index 6d29602..112c678 100644
--- a/out/phase-1/dba-container/vimscore-production_pdb.yaml
+++ b/out/phase-1/dba-container/acme-production_pdb.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-production
+cluster: acme-production
 image: postgresql
-key: vimscore-production/pdb
+key: acme-production/pdb
 machineRole: db
 name: pdb
 tag: '13'
diff --git a/out/phase-1/dba-container/vimscore-production_statera-console.yaml b/out/phase-1/dba-container/acme-production_statera-console.yaml
index 3bece40..0f4fbf4 100644
--- a/out/phase-1/dba-container/vimscore-production_statera-console.yaml
+++ b/out/phase-1/dba-container/acme-production_statera-console.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-production
+cluster: acme-production
 image: statera-console
-key: vimscore-production/statera-console
+key: acme-production/statera-console
 machineRole: app
 name: statera-console
 ports:
diff --git a/out/phase-1/dba-container/vimscore-production_statera.yaml b/out/phase-1/dba-container/acme-production_statera.yaml
index fb2d5d4..a509810 100644
--- a/out/phase-1/dba-container/vimscore-production_statera.yaml
+++ b/out/phase-1/dba-container/acme-production_statera.yaml
@@ -1,6 +1,6 @@
-cluster: vimscore-production
+cluster: acme-production
 image: statera
-key: vimscore-production/statera
+key: acme-production/statera
 machineRole: app
 name: statera
 ports:
diff --git a/out/phase-1/machine/acme-1.yaml b/out/phase-1/machine/acme-1.yaml
new file mode 100644
index 0000000..9e4356e
--- /dev/null
+++ b/out/phase-1/machine/acme-1.yaml
@@ -0,0 +1,3 @@
+key: acme-1
+name: acme-1
+type: machine
diff --git a/out/phase-1/machine/acme-2.yaml b/out/phase-1/machine/acme-2.yaml
new file mode 100644
index 0000000..24655d8
--- /dev/null
+++ b/out/phase-1/machine/acme-2.yaml
@@ -0,0 +1,3 @@
+key: acme-2
+name: acme-2
+type: machine
diff --git a/out/phase-1/machine/acme-3.yaml b/out/phase-1/machine/acme-3.yaml
new file mode 100644
index 0000000..d7d75ff
--- /dev/null
+++ b/out/phase-1/machine/acme-3.yaml
@@ -0,0 +1,3 @@
+key: acme-3
+name: acme-3
+type: machine
diff --git a/out/phase-1/vimscore-ops/vimscore-ops.yaml b/out/phase-1/vimscore-ops/vimscore-ops.yaml
deleted file mode 100644
index cf90d11..0000000
--- a/out/phase-1/vimscore-ops/vimscore-ops.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-key: vimscore-ops
-type: vimscore-ops