diff --git a/skills/src/csharp/experimental/musicskill/Adapters/CustomSkillAdapter.cs b/skills/src/csharp/experimental/musicskill/Adapters/CustomSkillAdapter.cs
index d61cd5c699..c0a52dc788 100644
--- a/skills/src/csharp/experimental/musicskill/Adapters/CustomSkillAdapter.cs
+++ b/skills/src/csharp/experimental/musicskill/Adapters/CustomSkillAdapter.cs
@@ -37,7 +37,7 @@ public CustomSkillAdapter(
             Use(new TelemetryLoggerMiddleware(telemetryClient, logPersonalInformation: true));
             Use(new SetLocaleMiddleware(settings.DefaultLocale ?? "en-us"));
             Use(new EventDebuggerMiddleware());
-            Use(new SkillMiddleware(userState, conversationState, conversationState.CreateProperty<DialogState>(nameof(MusicSkill))));
+            Use(new SkillMiddleware(userState, conversationState, conversationState.CreateProperty<DialogState>(nameof(DialogState))));
         }
     }
 }
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample.Tests/SkillTestBase.cs b/templates/Skill-Template/csharp/Sample/SkillSample.Tests/SkillTestBase.cs
index 4b32dbec11..48a8724f5b 100644
--- a/templates/Skill-Template/csharp/Sample/SkillSample.Tests/SkillTestBase.cs
+++ b/templates/Skill-Template/csharp/Sample/SkillSample.Tests/SkillTestBase.cs
@@ -41,7 +41,7 @@ public virtual void InitializeSkill()
                             LuisServices = new Dictionary<string, ITelemetryRecognizer>
                             {
                                 { "General", GeneralTestUtil.CreateRecognizer() },
-                                { "skill", SkillTestUtil.CreateRecognizer() }
+                                { "Skill", SkillTestUtil.CreateRecognizer() }
                             }
                         }
                     }
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Adapters/CustomSkillAdapter.cs b/templates/Skill-Template/csharp/Sample/SkillSample/Adapters/CustomSkillAdapter.cs
index 0f1d2add63..bd635b8e98 100644
--- a/templates/Skill-Template/csharp/Sample/SkillSample/Adapters/CustomSkillAdapter.cs
+++ b/templates/Skill-Template/csharp/Sample/SkillSample/Adapters/CustomSkillAdapter.cs
@@ -37,7 +37,7 @@ public CustomSkillAdapter(
             Use(new TelemetryLoggerMiddleware(telemetryClient, logPersonalInformation: true));
             Use(new SetLocaleMiddleware(settings.DefaultLocale ?? "en-us"));
             Use(new EventDebuggerMiddleware());
-            Use(new SkillMiddleware(userState, conversationState, conversationState.CreateProperty<DialogState>(nameof(SkillSample))));
+            Use(new SkillMiddleware(userState, conversationState, conversationState.CreateProperty<DialogState>(nameof(DialogState))));
         }
     }
 }
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/de/general.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/de/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/de/general.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/de/General.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/de/skill.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/de/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/de/skill.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/de/Skill.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/en/general.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/en/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/en/general.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/en/General.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/en/skill.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/en/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/en/skill.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/en/Skill.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/es/general.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/es/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/es/general.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/es/General.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/es/skill.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/es/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/es/skill.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/es/Skill.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/fr/general.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/fr/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/fr/general.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/fr/General.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/fr/skill.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/fr/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/fr/skill.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/fr/Skill.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/it/general.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/it/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/it/general.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/it/General.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/it/skill.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/it/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/it/skill.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/it/Skill.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/zh/general.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/zh/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/zh/general.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/zh/General.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/zh/skill.lu b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/zh/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/zh/skill.lu
rename to templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/LU/zh/Skill.lu
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/MainDialog.cs b/templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/MainDialog.cs
index 16ba50fb45..305ee601f5 100644
--- a/templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/MainDialog.cs
+++ b/templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/MainDialog.cs
@@ -68,7 +68,7 @@ public MainDialog(
             await PopulateStateFromSemanticAction(dc.Context);
 
             // Get skill LUIS model from configuration
-            localeConfig.LuisServices.TryGetValue("skill", out var luisService);
+            localeConfig.LuisServices.TryGetValue("Skill", out var luisService);
 
             if (luisService == null)
             {
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/SkillDialogBase.cs b/templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/SkillDialogBase.cs
index 801a33061b..1d8d9a1e98 100644
--- a/templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/SkillDialogBase.cs
+++ b/templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/SkillDialogBase.cs
@@ -148,7 +148,7 @@ protected async Task GetLuisResult(DialogContext dc)
                 // Get luis service for current locale
                 var locale = CultureInfo.CurrentUICulture.TwoLetterISOLanguageName;
                 var localeConfig = Services.CognitiveModelSets[locale];
-                var luisService = localeConfig.LuisServices["skill"];
+                var luisService = localeConfig.LuisServices["Skill"];
 
                 // Get intent and entities for activity
                 var result = await luisService.RecognizeAsync<SkillLuis>(dc.Context, CancellationToken.None);
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/cognitivemodels.json b/templates/Skill-Template/csharp/Sample/SkillSample/cognitivemodels.json
index 1dbd377c94..59ae811aef 100644
--- a/templates/Skill-Template/csharp/Sample/SkillSample/cognitivemodels.json
+++ b/templates/Skill-Template/csharp/Sample/SkillSample/cognitivemodels.json
@@ -3,7 +3,7 @@
     "en": {
       "languageModels": [
         {
-          "id": "general",
+          "id": "General",
           "name": "",
           "appid": "",
           "version": "0.1",
@@ -13,7 +13,7 @@
           "subscriptionkey": ""
         },
         {
-          "id": "skill",
+          "id": "Skill",
           "name": "",
           "appid": "",
           "version": "0.1",
diff --git a/templates/Skill-Template/csharp/Template/Skill/Adapters/CustomSkillAdapter.cs b/templates/Skill-Template/csharp/Template/Skill/Adapters/CustomSkillAdapter.cs
index 933009c100..0db49cb56b 100644
--- a/templates/Skill-Template/csharp/Template/Skill/Adapters/CustomSkillAdapter.cs
+++ b/templates/Skill-Template/csharp/Template/Skill/Adapters/CustomSkillAdapter.cs
@@ -37,7 +37,7 @@ public CustomSkillAdapter(
             Use(new TelemetryLoggerMiddleware(telemetryClient, logPersonalInformation: true));
             Use(new SetLocaleMiddleware(settings.DefaultLocale ?? "en-us"));
             Use(new EventDebuggerMiddleware());
-            Use(new SkillMiddleware(userState, conversationState, conversationState.CreateProperty<DialogState>(nameof($safeprojectname$))));
+            Use(new SkillMiddleware(userState, conversationState, conversationState.CreateProperty<DialogState>(nameof(DialogState))));
         }
     }
 }
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/de/general.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/de/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/de/general.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/de/General.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/de/skill.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/de/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/de/skill.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/de/Skill.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/en/general.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/en/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/en/general.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/en/General.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/en/skill.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/en/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/en/skill.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/en/Skill.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/es/general.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/es/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/es/general.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/es/General.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/es/skill.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/es/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/es/skill.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/es/Skill.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/fr/general.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/fr/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/fr/general.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/fr/General.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/fr/skill.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/fr/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/fr/skill.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/fr/Skill.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/it/general.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/it/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/it/general.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/it/General.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/it/skill.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/it/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/it/skill.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/it/Skill.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/zh/general.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/zh/General.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/zh/general.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/zh/General.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/zh/skill.lu b/templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/zh/Skill.lu
similarity index 100%
rename from templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/zh/skill.lu
rename to templates/Skill-Template/csharp/Template/Skill/Deployment/Resources/LU/zh/Skill.lu
diff --git a/templates/Skill-Template/csharp/Template/Skill/cognitivemodels.json b/templates/Skill-Template/csharp/Template/Skill/cognitivemodels.json
index 1dbd377c94..59ae811aef 100644
--- a/templates/Skill-Template/csharp/Template/Skill/cognitivemodels.json
+++ b/templates/Skill-Template/csharp/Template/Skill/cognitivemodels.json
@@ -3,7 +3,7 @@
     "en": {
       "languageModels": [
         {
-          "id": "general",
+          "id": "General",
           "name": "",
           "appid": "",
           "version": "0.1",
@@ -13,7 +13,7 @@
           "subscriptionkey": ""
         },
         {
-          "id": "skill",
+          "id": "Skill",
           "name": "",
           "appid": "",
           "version": "0.1",