diff --git a/MLEM.Templates/content/MLEM.Templates.DesktopGL/.template.config/dotnetcli.host.json b/MLEM.Templates/content/MLEM.Templates.DesktopGL/.template.config/dotnetcli.host.json
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/MLEM.Templates/content/MLEM.Templates.DesktopGL/.template.config/dotnetcli.host.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/MLEM.Templates/content/MLEMTemplates.DesktopGL/.template.config/template.json b/MLEM.Templates/content/MLEM.Templates.DesktopGL/.template.config/template.json
similarity index 55%
rename from MLEM.Templates/content/MLEMTemplates.DesktopGL/.template.config/template.json
rename to MLEM.Templates/content/MLEM.Templates.DesktopGL/.template.config/template.json
index 59e85c3..32ffe43 100644
--- a/MLEM.Templates/content/MLEMTemplates.DesktopGL/.template.config/template.json
+++ b/MLEM.Templates/content/MLEM.Templates.DesktopGL/.template.config/template.json
@@ -2,7 +2,8 @@
     "$schema": "http://json.schemastore.org/template",
     "author": "Ellpeck",
     "classifications": ["MLEM", "MonoGame"],
-    "identity": "MLEMTemplates.DesktopGL",
+    "groupIdentity": "MLEM.Templates.DesktopGL",
+    "identity": "MLEM.Templates.DesktopGL",
     "name": "MLEM DesktopGL",
     "shortName": "mlemdesktopgl",
     "sourceName": "TemplateNamespace",
@@ -13,7 +14,14 @@
     },
     "primaryOutputs": [
         {
-            "path": "mlemdesktopgl.csproj"
+            "path": "TemplateNamespace.csproj"
         }
-    ]
+    ],
+    "symbols": {
+        "framework": {
+            "type": "parameter",
+            "defaultValue": "net462",
+            "replaces": "net462"
+        }
+    }
 }
\ No newline at end of file
diff --git a/MLEM.Templates/content/MLEMTemplates.DesktopGL/Content/Content.mgcb b/MLEM.Templates/content/MLEM.Templates.DesktopGL/Content/Content.mgcb
similarity index 100%
rename from MLEM.Templates/content/MLEMTemplates.DesktopGL/Content/Content.mgcb
rename to MLEM.Templates/content/MLEM.Templates.DesktopGL/Content/Content.mgcb
diff --git a/MLEM.Templates/content/MLEMTemplates.DesktopGL/GameImpl.cs b/MLEM.Templates/content/MLEM.Templates.DesktopGL/GameImpl.cs
similarity index 100%
rename from MLEM.Templates/content/MLEMTemplates.DesktopGL/GameImpl.cs
rename to MLEM.Templates/content/MLEM.Templates.DesktopGL/GameImpl.cs
diff --git a/MLEM.Templates/content/MLEMTemplates.DesktopGL/Program.cs b/MLEM.Templates/content/MLEM.Templates.DesktopGL/Program.cs
similarity index 100%
rename from MLEM.Templates/content/MLEMTemplates.DesktopGL/Program.cs
rename to MLEM.Templates/content/MLEM.Templates.DesktopGL/Program.cs
diff --git a/MLEM.Templates/content/MLEMTemplates.DesktopGL/TemplateNamespace.csproj b/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
similarity index 100%
rename from MLEM.Templates/content/MLEMTemplates.DesktopGL/TemplateNamespace.csproj
rename to MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
diff --git a/MLEM.Templates/content/MLEM.Templates.Portable/.template.config/dotnetcli.host.json b/MLEM.Templates/content/MLEM.Templates.Portable/.template.config/dotnetcli.host.json
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/MLEM.Templates/content/MLEM.Templates.Portable/.template.config/dotnetcli.host.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/MLEM.Templates/content/MLEMTemplates.Portable/.template.config/template.json b/MLEM.Templates/content/MLEM.Templates.Portable/.template.config/template.json
similarity index 54%
rename from MLEM.Templates/content/MLEMTemplates.Portable/.template.config/template.json
rename to MLEM.Templates/content/MLEM.Templates.Portable/.template.config/template.json
index 12c3638..6318a3d 100644
--- a/MLEM.Templates/content/MLEMTemplates.Portable/.template.config/template.json
+++ b/MLEM.Templates/content/MLEM.Templates.Portable/.template.config/template.json
@@ -2,7 +2,8 @@
     "$schema": "http://json.schemastore.org/template",
     "author": "Ellpeck",
     "classifications": ["MLEM", "MonoGame"],
-    "identity": "MLEMTemplates.Portable",
+    "groupIdentity": "MLEM.Templates.Portable",
+    "identity": "MLEM.Templates.Portable",
     "name": "MLEM Portable",
     "shortName": "mlemportable",
     "sourceName": "TemplateNamespace",
@@ -13,7 +14,14 @@
     },
     "primaryOutputs": [
         {
-            "path": "mlemportable.csproj"
+            "path": "TemplateNamespace.csproj"
         }
-    ]
+    ],
+    "symbols": {
+        "framework": {
+            "type": "parameter",
+            "defaultValue": "netstandard2.0",
+            "replaces": "netstandard2.0"
+        }
+    }
 }
\ No newline at end of file
diff --git a/MLEM.Templates/content/MLEMTemplates.Portable/Content/Content.mgcb b/MLEM.Templates/content/MLEM.Templates.Portable/Content/Content.mgcb
similarity index 100%
rename from MLEM.Templates/content/MLEMTemplates.Portable/Content/Content.mgcb
rename to MLEM.Templates/content/MLEM.Templates.Portable/Content/Content.mgcb
diff --git a/MLEM.Templates/content/MLEMTemplates.Portable/GameImpl.cs b/MLEM.Templates/content/MLEM.Templates.Portable/GameImpl.cs
similarity index 100%
rename from MLEM.Templates/content/MLEMTemplates.Portable/GameImpl.cs
rename to MLEM.Templates/content/MLEM.Templates.Portable/GameImpl.cs
diff --git a/MLEM.Templates/content/MLEMTemplates.Portable/TemplateNamespace.csproj b/MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj
similarity index 100%
rename from MLEM.Templates/content/MLEMTemplates.Portable/TemplateNamespace.csproj
rename to MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj