diff --git a/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceParameters.json b/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceParameters.json
index 93088f5..cba041e 100644
--- a/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceParameters.json
+++ b/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceParameters.json
@@ -2,10 +2,10 @@
     "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
-        "WorkspaceResourceId": {
+        "workspaceResourceId": {
             "value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.OperationalInsights/workspaces/<WorkspaceName>"
         },
-        "WorkspaceLocation": {
+        "workspaceLocation": {
             "value": "<WorkspaceLocation>"
         }
     }
diff --git a/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceTemplate.json b/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceTemplate.json
index 2cdbfaa..6e49774 100644
--- a/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceTemplate.json
+++ b/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceTemplate.json
@@ -2,20 +2,19 @@
     "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
-        "WorkspaceResourceId": {
+        "workspaceResourceId": {
             "type": "String",
             "metadata": {
                 "description": "Workspace Resource ID."
             }
         },
-        "WorkspaceLocation": {
+        "workspaceLocation": {
             "type": "String",
             "metadata": {
                 "description": "Workspace Location."
             }
         }
     },
-    "variables": {},
     "resources": [
         {
             "type": "Microsoft.Resources/deployments",
@@ -32,13 +31,13 @@
                         {
                             "apiVersion": "2015-11-01-preview",
                             "type": "Microsoft.OperationsManagement/solutions",
-                            "location": "[parameters('WorkspaceLocation')]",
-                            "name": "[concat('VMInsights', '(', split(parameters('WorkspaceResourceId'),'/')[8], ')')]",
+                            "location": "[parameters('workspaceLocation')]",
+                            "name": "[concat('VMInsights', '(', split(parameters('workspaceResourceId'),'/')[8], ')')]",
                             "properties": {
-                                "workspaceResourceId": "[parameters('WorkspaceResourceId')]"
+                                "workspaceResourceId": "[parameters('workspaceResourceId')]"
                             },
                             "plan": {
-                                "name": "[concat('VMInsights', '(', split(parameters('WorkspaceResourceId'),'/')[8], ')')]",
+                                "name": "[concat('VMInsights', '(', split(parameters('workspaceResourceId'),'/')[8], ')')]",
                                 "product": "[concat('OMSGallery/', 'VMInsights')]",
                                 "promotionCode": "",
                                 "publisher": "Microsoft"
@@ -47,8 +46,8 @@
                     ]
                 }
             },
-            "subscriptionId": "[split(parameters('WorkspaceResourceId'),'/')[2]]",
-            "resourceGroup": "[split(parameters('WorkspaceResourceId'),'/')[4]]"
+            "subscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]",
+            "resourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]"
         }
     ],
     "outputs": {}
diff --git a/OnbordingTemplates/ExistingArcVmOnboarding/ExistingArcVmOnboardingParameters.json b/OnbordingTemplates/ExistingArcVmOnboarding/ExistingArcVmOnboardingParameters.json
index 61fef9c..102f9d4 100644
--- a/OnbordingTemplates/ExistingArcVmOnboarding/ExistingArcVmOnboardingParameters.json
+++ b/OnbordingTemplates/ExistingArcVmOnboarding/ExistingArcVmOnboardingParameters.json
@@ -2,16 +2,16 @@
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
-    "VmLocation": {
+    "vmLocation": {
       "value": "<VirtualMachineLocation>"
     },
-    "VmResourceId": {
+    "vmResourceId": {
       "value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.HybridCompute/machines/<VirtualMachineName>"
     },
     "osType": {
       "value": "<OSType>"
     },
-    "WorkspaceResourceId": {
+    "workspaceResourceId": {
       "value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.OperationalInsights/workspaces/<WorkspaceName>"
     }
   }
diff --git a/OnbordingTemplates/ExistingArcVmOnboarding/ExistingArcVmOnboardingTemplate.json b/OnbordingTemplates/ExistingArcVmOnboarding/ExistingArcVmOnboardingTemplate.json
index edfd536..1702efa 100644
--- a/OnbordingTemplates/ExistingArcVmOnboarding/ExistingArcVmOnboardingTemplate.json
+++ b/OnbordingTemplates/ExistingArcVmOnboarding/ExistingArcVmOnboardingTemplate.json
@@ -2,13 +2,13 @@
     "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
-        "VmLocation": {
+        "vmLocation": {
             "type": "String",
             "metadata": {
                 "description": "The Virtual Machine Location."
             }
         },
-        "VmResourceId": {
+        "vmResourceId": {
             "type": "String",
             "metadata": {
                 "description": "VM Resource ID."
@@ -20,7 +20,7 @@
                 "description": "OS Type, Example: Linux / Windows"
             }
         },
-        "WorkspaceResourceId": {
+        "workspaceResourceId": {
             "type": "String",
             "metadata": {
                 "description": "Workspace Resource ID."
@@ -28,30 +28,30 @@
         }
     },
     "variables": {
-        "VmName": "[split(parameters('VmResourceId'),'/')[8]]",
-        "DaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
-        "DaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
-        "MmaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OMSAgentForLinux')]",
-        "MmaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OmsAgentForLinux')]"
+        "vmName": "[split(parameters('vmResourceId'),'/')[8]]",
+        "daExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
+        "daExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
+        "mmaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OMSAgentForLinux')]",
+        "mmaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OmsAgentForLinux')]"
     },
     "resources": [
         {
             "type": "Microsoft.HybridCompute/machines",
             "apiVersion": "2020-03-11-preview",
-            "name": "[variables('VmName')]",
-            "location": "[parameters('VmLocation')]",
+            "name": "[variables('vmName')]",
+            "location": "[parameters('vmLocation')]",
             "resources": [
                 {
                     "type": "extensions",
                     "apiVersion": "2020-03-11-preview",
-                    "name": "[variables('DaExtensionName')]",
-                    "location": "[parameters('VmLocation')]",
+                    "name": "[variables('daExtensionName')]",
+                    "location": "[parameters('vmLocation')]",
                     "dependsOn": [
-                        "[concat('Microsoft.HybridCompute/machines/', variables('VmName'))]"
+                        "[concat('Microsoft.HybridCompute/machines/', variables('vmName'))]"
                     ],
                     "properties": {
                         "publisher": "Microsoft.Azure.Monitoring.DependencyAgent",
-                        "type": "[variables('DaExtensionType')]",
+                        "type": "[variables('daExtensionType')]",
                         "autoUpgradeMinorVersion": true,
                         "settings": {}
                     }
@@ -59,21 +59,21 @@
                 {
                     "type": "extensions",
                     "apiVersion": "2020-03-11-preview",
-                    "name": "[variables('MmaExtensionName')]",
-                    "location": "[parameters('VmLocation')]",
+                    "name": "[variables('mmaExtensionName')]",
+                    "location": "[parameters('vmLocation')]",
                     "dependsOn": [
-                        "[concat('Microsoft.HybridCompute/machines/', variables('VmName'))]"
+                        "[concat('Microsoft.HybridCompute/machines/', variables('vmName'))]"
                     ],
                     "properties": {
                         "publisher": "Microsoft.EnterpriseCloud.Monitoring",
-                        "type": "[variables('MmaExtensionType')]",
+                        "type": "[variables('mmaExtensionType')]",
                         "settings": {
-                            "workspaceId": "[reference(parameters('WorkspaceResourceId'), '2015-03-20').customerId]",
-                            "azureResourceId": "[parameters('VmResourceId')]",
+                            "workspaceId": "[reference(parameters('workspaceResourceId'), '2015-03-20').customerId]",
+                            "azureResourceId": "[parameters('vmResourceId')]",
                             "stopOnMultipleConnections": "true"
                         },
                         "protectedSettings": {
-                            "workspaceKey": "[listKeys(parameters('WorkspaceResourceId'), '2015-03-20').primarySharedKey]"
+                            "workspaceKey": "[listKeys(parameters('workspaceResourceId'), '2015-03-20').primarySharedKey]"
                         }
                     }
                 }
diff --git a/OnbordingTemplates/ExistingVmOnboarding/ExistingVmOnboardingTemplate.json b/OnbordingTemplates/ExistingVmOnboarding/ExistingVmOnboardingTemplate.json
index 97b9762..1065265 100644
--- a/OnbordingTemplates/ExistingVmOnboarding/ExistingVmOnboardingTemplate.json
+++ b/OnbordingTemplates/ExistingVmOnboarding/ExistingVmOnboardingTemplate.json
@@ -2,13 +2,13 @@
     "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
-        "VmResourceId": {
+        "vmResourceId": {
             "type": "String",
             "metadata": {
                 "description": "VM Resource ID."
             }
         },
-        "VmLocation": {
+        "vmLocation": {
             "type": "String",
             "metadata": {
                 "description": "The Virtual Machine Location."
@@ -20,7 +20,7 @@
                 "description": "OS Type, Example: Linux / Windows"
             }
         },
-        "WorkspaceResourceId": {
+        "workspaceResourceId": {
             "type": "String",
             "metadata": {
                 "description": "Workspace Resource ID."
@@ -28,56 +28,56 @@
         }
     },
     "variables": {
-        "VmName": "[split(parameters('VmResourceId'),'/')[8]]",
-        "DaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
-        "DaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
-        "DaExtensionVersion": "9.5",
-        "MmaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OMSAgentForLinux')]",
-        "MmaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OmsAgentForLinux')]",
-        "MmaExtensionVersion": "[if(equals(toLower(parameters('osType')), 'windows'), '1.0', '1.4')]"
+        "vmName": "[split(parameters('vmResourceId'),'/')[8]]",
+        "daExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
+        "daExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
+        "daExtensionVersion": "9.5",
+        "mmaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OMSAgentForLinux')]",
+        "mmaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OmsAgentForLinux')]",
+        "mmaExtensionVersion": "[if(equals(toLower(parameters('osType')), 'windows'), '1.0', '1.4')]"
     },
     "resources": [
         {
             "type": "Microsoft.Compute/virtualMachines",
             "apiVersion": "2018-10-01",
-            "name": "[variables('VmName')]",
-            "location": "[parameters('VmLocation')]",
+            "name": "[variables('vmName')]",
+            "location": "[parameters('vmLocation')]",
             "resources": [
                 {
                     "type": "extensions",
                     "apiVersion": "2019-12-01",
-                    "name": "[variables('DaExtensionName')]",
-                    "location": "[parameters('VmLocation')]",
+                    "name": "[variables('daExtensionName')]",
+                    "location": "[parameters('vmLocation')]",
                     "dependsOn": [
-                        "[concat('Microsoft.Compute/VirtualMachines/', variables('VmName'))]"
+                        "[concat('Microsoft.Compute/VirtualMachines/', variables('vmName'))]"
                     ],
                     "properties": {
                         "publisher": "Microsoft.Azure.Monitoring.DependencyAgent",
-                        "type": "[variables('DaExtensionType')]",
-                        "typeHandlerVersion": "[variables('DaExtensionVersion')]",
+                        "type": "[variables('daExtensionType')]",
+                        "typeHandlerVersion": "[variables('daExtensionVersion')]",
                         "autoUpgradeMinorVersion": true
                     }
                 },
                 {
                     "type": "extensions",
                     "apiVersion": "2018-10-01",
-                    "name": "[variables('MmaExtensionName')]",
-                    "location": "[parameters('VmLocation')]",
+                    "name": "[variables('mmaExtensionName')]",
+                    "location": "[parameters('vmLocation')]",
                     "dependsOn": [
-                        "[concat('Microsoft.Compute/VirtualMachines/', variables('VmName'))]"
+                        "[concat('Microsoft.Compute/VirtualMachines/', variables('vmName'))]"
                     ],
                     "properties": {
                         "publisher": "Microsoft.EnterpriseCloud.Monitoring",
-                        "type": "[variables('MmaExtensionType')]",
-                        "typeHandlerVersion": "[variables('MmaExtensionVersion')]",
+                        "type": "[variables('mmaExtensionType')]",
+                        "typeHandlerVersion": "[variables('mmaExtensionVersion')]",
                         "autoUpgradeMinorVersion": "true",
                         "settings": {
-                            "workspaceId": "[reference(parameters('WorkspaceResourceId'), '2015-03-20').customerId]",
-                            "azureResourceId": "[parameters('VmResourceId')]",
+                            "workspaceId": "[reference(parameters('workspaceResourceId'), '2015-03-20').customerId]",
+                            "azureResourceId": "[parameters('vmResourceId')]",
                             "stopOnMultipleConnections": "true"
                         },
                         "protectedSettings": {
-                            "workspaceKey": "[listKeys(parameters('WorkspaceResourceId'), '2015-03-20').primarySharedKey]"
+                            "workspaceKey": "[listKeys(parameters('workspaceResourceId'), '2015-03-20').primarySharedKey]"
                         }
                     }
                 }
diff --git a/OnbordingTemplates/ExistingVmssOnboarding/ExistingVmssOnboardingParameters.json b/OnbordingTemplates/ExistingVmssOnboarding/ExistingVmssOnboardingParameters.json
index c2fe45c..c418815 100644
--- a/OnbordingTemplates/ExistingVmssOnboarding/ExistingVmssOnboardingParameters.json
+++ b/OnbordingTemplates/ExistingVmssOnboarding/ExistingVmssOnboardingParameters.json
@@ -2,16 +2,16 @@
     "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
-        "VmssResourceId": {
+        "vmssResourceId": {
             "value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.Compute/virtualMachines/<VirtualMachineScaleSetName>"
         },
-        "VmssLocation": {
+        "vmssLocation": {
             "value": "<VirtualMachineScaleSetLocation>"
         },
-        "OsType": {
+        "osType": {
             "value": "<OSType>"
         },
-        "WorkspaceResourceId": {
+        "workspaceResourceId": {
             "value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.OperationalInsights/workspaces/<WorkspaceName>"
         }
     }
diff --git a/OnbordingTemplates/ExistingVmssOnboarding/ExistingVmssOnboardingTemplate.json b/OnbordingTemplates/ExistingVmssOnboarding/ExistingVmssOnboardingTemplate.json
index 2b6c373..d014dfc 100644
--- a/OnbordingTemplates/ExistingVmssOnboarding/ExistingVmssOnboardingTemplate.json
+++ b/OnbordingTemplates/ExistingVmssOnboarding/ExistingVmssOnboardingTemplate.json
@@ -2,13 +2,13 @@
     "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
-        "VmssResourceId": {
+        "vmssResourceId": {
             "type": "String",
             "metadata": {
                 "description": "VM Resource ID."
             }
         },
-        "VmssLocation": {
+        "vmssLocation": {
             "type": "String",
             "metadata": {
                 "description": "The Virtual Machine Location."
@@ -20,7 +20,7 @@
                 "description": "OS Type, Example: Linux / Windows"
             }
         },
-        "WorkspaceResourceId": {
+        "workspaceResourceId": {
             "type": "String",
             "metadata": {
                 "description": "Workspace Resource ID."
@@ -28,56 +28,56 @@
         }
     },
     "variables": {
-        "VmssName": "[split(parameters('VmssResourceId'),'/')[8]]",
-        "DaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
-        "DaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
-        "DaExtensionVersion": "9.5",
-        "MmaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OMSAgentForLinux')]",
-        "MmaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OmsAgentForLinux')]",
-        "MmaExtensionVersion": "[if(equals(toLower(parameters('osType')), 'windows'), '1.0', '1.4')]"
+        "vmssName": "[split(parameters('vmssResourceId'),'/')[8]]",
+        "daExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
+        "daExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'DependencyAgentWindows', 'DependencyAgentLinux')]",
+        "daExtensionVersion": "9.5",
+        "mmaExtensionName": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OMSAgentForLinux')]",
+        "mmaExtensionType": "[if(equals(toLower(parameters('osType')), 'windows'), 'MicrosoftMonitoringAgent', 'OmsAgentForLinux')]",
+        "mmaExtensionVersion": "[if(equals(toLower(parameters('osType')), 'windows'), '1.0', '1.4')]"
     },
     "resources": [
         {
             "type": "Microsoft.Compute/virtualMachineScaleSets",
             "apiVersion": "2018-10-01",
-            "name": "[variables('VmssName')]",
-            "location": "[parameters('VmssLocation')]",
+            "name": "[variables('vmssName')]",
+            "location": "[parameters('vmssLocation')]",
             "resources": [
                 {
                     "type": "extensions",
                     "apiVersion": "2019-12-01",
-                    "name": "[variables('DaExtensionName')]",
-                    "location": "[parameters('VmssLocation')]",
+                    "name": "[variables('daExtensionName')]",
+                    "location": "[parameters('vmssLocation')]",
                     "dependsOn": [
-                        "[concat('Microsoft.Compute/virtualMachineScaleSets/', variables('VmssName'))]"
+                        "[concat('Microsoft.Compute/virtualMachineScaleSets/', variables('vmssName'))]"
                     ],
                     "properties": {
                         "publisher": "Microsoft.Azure.Monitoring.DependencyAgent",
-                        "type": "[variables('DaExtensionType')]",
-                        "typeHandlerVersion": "[variables('DaExtensionVersion')]",
+                        "type": "[variables('daExtensionType')]",
+                        "typeHandlerVersion": "[variables('daExtensionVersion')]",
                         "autoUpgradeMinorVersion": true
                     }
                 },
                 {
                     "type": "extensions",
                     "apiVersion": "2018-10-01",
-                    "name": "[variables('MmaExtensionName')]",
-                    "location": "[parameters('VmssLocation')]",
+                    "name": "[variables('mmaExtensionName')]",
+                    "location": "[parameters('vmssLocation')]",
                     "dependsOn": [
-                        "[concat('Microsoft.Compute/virtualMachineScaleSets/', variables('VmssName'))]"
+                        "[concat('Microsoft.Compute/virtualMachineScaleSets/', variables('vmssName'))]"
                     ],
                     "properties": {
                         "publisher": "Microsoft.EnterpriseCloud.Monitoring",
-                        "type": "[variables('MmaExtensionType')]",
-                        "typeHandlerVersion": "[variables('MmaExtensionVersion')]",
+                        "type": "[variables('mmaExtensionType')]",
+                        "typeHandlerVersion": "[variables('mmaExtensionVersion')]",
                         "autoUpgradeMinorVersion": "true",
                         "settings": {
-                            "workspaceId": "[reference(parameters('WorkspaceResourceId'), '2015-03-20').customerId]",
-                            "azureResourceId": "[parameters('VmssResourceId')]",
+                            "workspaceId": "[reference(parameters('workspaceResourceId'), '2015-03-20').customerId]",
+                            "azureResourceId": "[parameters('vmssResourceId')]",
                             "stopOnMultipleConnections": "true"
                         },
                         "protectedSettings": {
-                            "workspaceKey": "[listKeys(parameters('WorkspaceResourceId'), '2015-03-20').primarySharedKey]"
+                            "workspaceKey": "[listKeys(parameters('workspaceResourceId'), '2015-03-20').primarySharedKey]"
                         }
                     }
                 }