diff --git a/domains/*.app.is-cool.dev.json b/domains/app.is-cool.dev.json
similarity index 71%
rename from domains/*.app.is-cool.dev.json
rename to domains/app.is-cool.dev.json
index ff8d838c..5859125f 100644
--- a/domains/*.app.is-cool.dev.json
+++ b/domains/app.is-cool.dev.json
@@ -1,7 +1,7 @@
 {
-    "description": "Wildcard subdomain for hosting multiple apps",
+    "description": "Subdomain for hosting multiple apps",
     "domain": "is-cool.dev",
-    "subdomain": "*.app",
+    "subdomain": "app",
     "owner": {
         "username": "JonathanXDR",
         "email": "jonathan.russ@bluewin.ch"
diff --git a/domains/*.app.is-local.org.json b/domains/app.is-local.org.json
similarity index 71%
rename from domains/*.app.is-local.org.json
rename to domains/app.is-local.org.json
index 3d38a30f..321dfa3e 100644
--- a/domains/*.app.is-local.org.json
+++ b/domains/app.is-local.org.json
@@ -1,7 +1,7 @@
 {
-    "description": "Wildcard subdomain for hosting multiple apps",
+    "description": "Subdomain for hosting multiple apps",
     "domain": "is-local.org",
-    "subdomain": "*.app",
+    "subdomain": "app",
     "owner": {
         "username": "JonathanXDR",
         "email": "jonathan.russ@bluewin.ch"
diff --git a/domains/*.jonathan.is-a-fullstack.dev.json b/domains/jonathan.is-a-fullstack.dev.json
similarity index 63%
rename from domains/*.jonathan.is-a-fullstack.dev.json
rename to domains/jonathan.is-a-fullstack.dev.json
index 82696480..9ac4e748 100644
--- a/domains/*.jonathan.is-a-fullstack.dev.json
+++ b/domains/jonathan.is-a-fullstack.dev.json
@@ -1,7 +1,7 @@
 {
-    "description": "Wildcard subdomain for hosting multiple projects, apps or sites related to JonathanXDR",
+    "description": "Subdomain for hosting multiple projects, apps or sites related to JonathanXDR",
     "domain": "is-a-fullstack.dev",
-    "subdomain": "*.jonathan",
+    "subdomain": "jonathan",
     "owner": {
         "username": "JonathanXDR",
         "email": "jonathan.russ@bluewin.ch"
diff --git a/domains/*.jonathan.is-cool.dev.json b/domains/jonathan.is-cool.dev.json
similarity index 62%
rename from domains/*.jonathan.is-cool.dev.json
rename to domains/jonathan.is-cool.dev.json
index 3a047b06..d3b59fbf 100644
--- a/domains/*.jonathan.is-cool.dev.json
+++ b/domains/jonathan.is-cool.dev.json
@@ -1,7 +1,7 @@
 {
-    "description": "Wildcard subdomain for hosting multiple projects, apps or sites related to JonathanXDR",
+    "description": "Subdomain for hosting multiple projects, apps or sites related to JonathanXDR",
     "domain": "is-cool.dev",
-    "subdomain": "*.jonathan",
+    "subdomain": "jonathan",
     "owner": {
         "username": "JonathanXDR",
         "email": "jonathan.russ@bluewin.ch"
diff --git a/domains/*.site.is-cool.dev.json b/domains/project.is-cool.dev.json
similarity index 71%
rename from domains/*.site.is-cool.dev.json
rename to domains/project.is-cool.dev.json
index 57e0e299..5ea14427 100644
--- a/domains/*.site.is-cool.dev.json
+++ b/domains/project.is-cool.dev.json
@@ -1,7 +1,7 @@
 {
-    "description": "Wildcard subdomain for hosting multiple sites",
+    "description": "Subdomain for hosting multiple projects",
     "domain": "is-cool.dev",
-    "subdomain": "*.site",
+    "subdomain": "project",
     "owner": {
         "username": "JonathanXDR",
         "email": "jonathan.russ@bluewin.ch"
diff --git a/domains/*.site.is-local.org.json b/domains/project.is-local.org.json
similarity index 71%
rename from domains/*.site.is-local.org.json
rename to domains/project.is-local.org.json
index 5cf55b5f..776ba140 100644
--- a/domains/*.site.is-local.org.json
+++ b/domains/project.is-local.org.json
@@ -1,7 +1,7 @@
 {
-    "description": "Wildcard subdomain for hosting multiple sites",
+    "description": "Subdomain for hosting multiple projects",
     "domain": "is-local.org",
-    "subdomain": "*.site",
+    "subdomain": "project",
     "owner": {
         "username": "JonathanXDR",
         "email": "jonathan.russ@bluewin.ch"
diff --git a/domains/*.project.is-cool.dev.json b/domains/site.is-cool.dev.json
similarity index 70%
rename from domains/*.project.is-cool.dev.json
rename to domains/site.is-cool.dev.json
index 7e3fb396..395abd9b 100644
--- a/domains/*.project.is-cool.dev.json
+++ b/domains/site.is-cool.dev.json
@@ -1,7 +1,7 @@
 {
-    "description": "Wildcard subdomain for hosting multiple projects",
+    "description": "Subdomain for hosting multiple sites",
     "domain": "is-cool.dev",
-    "subdomain": "*.project",
+    "subdomain": "site",
     "owner": {
         "username": "JonathanXDR",
         "email": "jonathan.russ@bluewin.ch"
diff --git a/domains/*.project.is-local.org.json b/domains/site.is-local.org.json
similarity index 70%
rename from domains/*.project.is-local.org.json
rename to domains/site.is-local.org.json
index 33952f53..cf306295 100644
--- a/domains/*.project.is-local.org.json
+++ b/domains/site.is-local.org.json
@@ -1,7 +1,7 @@
 {
-    "description": "Wildcard subdomain for hosting multiple projects",
+    "description": "Subdomain for hosting multiple sites",
     "domain": "is-local.org",
-    "subdomain": "*.project",
+    "subdomain": "site",
     "owner": {
         "username": "JonathanXDR",
         "email": "jonathan.russ@bluewin.ch"