diff --git a/templates/app/angular/src/environments/environment.hmr.ts b/templates/app/angular/src/environments/environment.hmr.ts
index b5fd9712b0..5be77755c7 100644
--- a/templates/app/angular/src/environments/environment.hmr.ts
+++ b/templates/app/angular/src/environments/environment.hmr.ts
@@ -3,7 +3,7 @@ export const environment = {
   hmr: true,
   oAuthConfig: {
     issuer: 'https://localhost:44305',
-    clientId: 'MyProjectName_ConsoleTestApp',
+    clientId: 'MyProjectName_App',
     dummyClientSecret: '1q2w3e*',
     scope: 'MyProjectName',
     showDebugInformation: true,
diff --git a/templates/app/angular/src/environments/environment.prod.ts b/templates/app/angular/src/environments/environment.prod.ts
index cb992e2ee0..d490bd4b38 100644
--- a/templates/app/angular/src/environments/environment.prod.ts
+++ b/templates/app/angular/src/environments/environment.prod.ts
@@ -3,7 +3,7 @@ export const environment = {
   hmr: false,
   oAuthConfig: {
     issuer: 'https://localhost:44305',
-    clientId: 'MyProjectName_ConsoleTestApp',
+    clientId: 'MyProjectName_App',
     dummyClientSecret: '1q2w3e*',
     scope: 'MyProjectName',
     showDebugInformation: true,
diff --git a/templates/app/angular/src/environments/environment.ts b/templates/app/angular/src/environments/environment.ts
index f280ae3e8e..51dfdf4080 100644
--- a/templates/app/angular/src/environments/environment.ts
+++ b/templates/app/angular/src/environments/environment.ts
@@ -3,7 +3,7 @@ export const environment = {
   hmr: false,
   oAuthConfig: {
     issuer: 'https://localhost:44305',
-    clientId: 'MyProjectName_ConsoleTestApp',
+    clientId: 'MyProjectName_App',
     dummyClientSecret: '1q2w3e*',
     scope: 'MyProjectName',
     showDebugInformation: true,
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
index 2ccb7a6103..dd942783d6 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
@@ -9,8 +9,8 @@
         "ClientSecret": "1q2w3e*",
         "RootUrl": "https://localhost:44302"
       },
-      "MyProjectName_ConsoleTestApp": {
-        "ClientId": "MyProjectName_ConsoleTestApp",
+      "MyProjectName_App": {
+        "ClientId": "MyProjectName_App",
         "ClientSecret": "1q2w3e*"
       }
     }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
index 16d4a88dd1..b8ee88b061 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
@@ -126,14 +126,14 @@ namespace MyCompanyName.MyProjectName.IdentityServer
             }
 
             //Console Test Client
-            var consoleClientId = configurationSection["MyProjectName_ConsoleTestApp:ClientId"];
+            var consoleClientId = configurationSection["MyProjectName_App:ClientId"];
             if (!consoleClientId.IsNullOrWhiteSpace())
             {
                 await CreateClientAsync(
                     consoleClientId,
                     commonScopes,
                     new[] { "password", "client_credentials" },
-                    (configurationSection["MyProjectName_ConsoleTestApp:ClientSecret"] ?? "1q2w3e*").Sha256()
+                    (configurationSection["MyProjectName_App:ClientSecret"] ?? "1q2w3e*").Sha256()
                 );
             }
         }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json
index 085db27e0b..828ea38e60 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json
@@ -10,8 +10,8 @@
   },
   "IdentityServer": {
     "Clients": {
-      "MyProjectName_ConsoleTestApp": {
-        "ClientId": "MyProjectName_ConsoleTestApp"
+      "MyProjectName_App": {
+        "ClientId": "MyProjectName_App"
       }
     }
   }
diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json
index 22fd42a0ae..4c81233d9c 100644
--- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json
+++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json
@@ -7,7 +7,7 @@
   "IdentityClients": {
     "Default": {
       "GrantType": "password",
-      "ClientId": "MyProjectName_ConsoleTestApp",
+      "ClientId": "MyProjectName_App",
       "ClientSecret": "1q2w3e*",
       "UserName": "admin",
       "UserPassword": "1q2w3E*",
diff --git a/templates/common.DotSettings b/templates/common.DotSettings
deleted file mode 100644
index e7d45a2a84..0000000000
--- a/templates/common.DotSettings
+++ /dev/null
@@ -1 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" />
\ No newline at end of file