diff --git a/Solutions/vArmour Application Controller/Data Connectors/template_Connector_vArmour_AppController_CEFAMA.json b/Solutions/vArmour Application Controller/Data Connectors/template_vArmour_AppControllerAMA.json
similarity index 100%
rename from Solutions/vArmour Application Controller/Data Connectors/template_Connector_vArmour_AppController_CEFAMA.json
rename to Solutions/vArmour Application Controller/Data Connectors/template_vArmour_AppControllerAMA.json
diff --git a/Solutions/vArmour Application Controller/Data/Solution_vArmour.json b/Solutions/vArmour Application Controller/Data/Solution_vArmour.json
index 516fc4dc6b8..25ad5af3646 100644
--- a/Solutions/vArmour Application Controller/Data/Solution_vArmour.json	
+++ b/Solutions/vArmour Application Controller/Data/Solution_vArmour.json	
@@ -5,7 +5,7 @@
   "Description": "This vArmour solution enables streaming of Application Controller Violation Alerts into Microsoft Sentinel, so you can take advantage of search & correlation, alerting, & threat intelligence enrichment for each log.\n\r\n1. **vArmour Application Controller via AMA** - This data connector helps in ingesting vArmour Application Controller logs into your Log Analytics Workspace using the new Azure Monitor Agent. Learn more about ingesting using the new Azure Monitor Agent [here](https://learn.microsoft.com/azure/sentinel/connect-cef-ama). **Microsoft recommends using this Data Connector**.\n\r\n2. **vArmour Application Controller via Legacy Agent** - This data connector helps in ingesting vArmour Application Controller logs into your Log Analytics Workspace using the legacy Log Analytics agent.\n\n**NOTE:** Microsoft recommends installation of vArmour Application Controller via AMA Connector. Legacy connector uses the Log Analytics agent which is about to be deprecated by **Aug 31, 2024,** and thus should only be installed where AMA is not supported. Using MMA and AMA on same machine can cause log duplication and extra ingestion cost [more details](https://learn.microsoft.com/en-us/azure/sentinel/ama-migrate).",
   "Data Connectors": [
     "Data Connectors/Connector_vArmour_AppController_CEF.json",
-	"Data Connectors/template_Connector_vArmour_AppController_CEFAMA.json"
+	"Data Connectors/template_vArmour_AppControllerAMA.json"
   ],
   "Workbooks": [
 	"Workbooks/vArmour_AppContoller_Workbook.json"
diff --git a/Solutions/vArmour Application Controller/Package/3.0.0.zip b/Solutions/vArmour Application Controller/Package/3.0.0.zip
index 8f81e96b819..408b917367b 100644
Binary files a/Solutions/vArmour Application Controller/Package/3.0.0.zip and b/Solutions/vArmour Application Controller/Package/3.0.0.zip differ
diff --git a/Solutions/vArmour Application Controller/Package/createUiDefinition.json b/Solutions/vArmour Application Controller/Package/createUiDefinition.json
index 9a2c5337d00..f6122199738 100644
--- a/Solutions/vArmour Application Controller/Package/createUiDefinition.json	
+++ b/Solutions/vArmour Application Controller/Package/createUiDefinition.json	
@@ -63,8 +63,7 @@
               "text": "This Solution installs the data connector for vArmour Application Controller. You can get vArmour Application Controller CommonSecurityLog data in your Microsoft Sentinel workspace. After installing the solution, configure and enable this data connector by following guidance in Manage solution view."
             }
           },
-          
-          {
+        {
             "name": "dataconnectors-link2",
             "type": "Microsoft.Common.TextBlock",
             "options": {
diff --git a/Solutions/vArmour Application Controller/Package/mainTemplate.json b/Solutions/vArmour Application Controller/Package/mainTemplate.json
index 515bffe7b43..4f50161844f 100644
--- a/Solutions/vArmour Application Controller/Package/mainTemplate.json	
+++ b/Solutions/vArmour Application Controller/Package/mainTemplate.json	
@@ -957,16 +957,16 @@
                 "status": "Available",
                 "requiredDataConnectors": [
                   {
-                    "connectorId": "vArmourAC",
                     "dataTypes": [
                       "CommonSecurityLog"
-                    ]
+                    ],
+                    "connectorId": "vArmourAC"
                   },
                   {
-                    "connectorId": "vArmourACAma",
                     "dataTypes": [
                       "CommonSecurityLog"
-                    ]
+                    ],
+                    "connectorId": "vArmourACAma"
                   }
                 ],
                 "tactics": [
@@ -982,8 +982,8 @@
                     "entityType": "Host",
                     "fieldMappings": [
                       {
-                        "identifier": "HostName",
-                        "columnName": "DestinationHostName"
+                        "columnName": "DestinationHostName",
+                        "identifier": "HostName"
                       }
                     ]
                   },
@@ -991,8 +991,8 @@
                     "entityType": "IP",
                     "fieldMappings": [
                       {
-                        "identifier": "Address",
-                        "columnName": "SourceIP"
+                        "columnName": "SourceIP",
+                        "identifier": "Address"
                       }
                     ]
                   }