diff --git a/Solutions/Netskopev2/Data Connectors/Netskope-CCP/data_connector_definition.json b/Solutions/Netskopev2/Data Connectors/NetskopeAlertsEvents_RestAPI_CCP/NetskopeAlertsEvents_ConnectorDefination.json
similarity index 99%
rename from Solutions/Netskopev2/Data Connectors/Netskope-CCP/data_connector_definition.json
rename to Solutions/Netskopev2/Data Connectors/NetskopeAlertsEvents_RestAPI_CCP/NetskopeAlertsEvents_ConnectorDefination.json
index 80b62e06dc8..0b12439cc53 100644
--- a/Solutions/Netskopev2/Data Connectors/Netskope-CCP/data_connector_definition.json	
+++ b/Solutions/Netskopev2/Data Connectors/NetskopeAlertsEvents_RestAPI_CCP/NetskopeAlertsEvents_ConnectorDefination.json	
@@ -6,7 +6,7 @@
     "kind": "Customizable",
     "properties": {
         "connectorUiConfig": {
-            "id": "NetskopeCCP",
+            "id": "NetskopeAlertsEvents",
             "title": "Netskope Alerts and Events",
             "publisher": "Netskope",
             "descriptionMarkdown": "Netskope Security Alerts and Events",
diff --git a/Solutions/Netskopev2/Data Connectors/Netskope-CCP/dcr.json b/Solutions/Netskopev2/Data Connectors/NetskopeAlertsEvents_RestAPI_CCP/NetskopeAlertsEvents_DCR.json
similarity index 100%
rename from Solutions/Netskopev2/Data Connectors/Netskope-CCP/dcr.json
rename to Solutions/Netskopev2/Data Connectors/NetskopeAlertsEvents_RestAPI_CCP/NetskopeAlertsEvents_DCR.json
diff --git a/Solutions/Netskopev2/Data Connectors/Netskope-CCP/data_connector_poller.json b/Solutions/Netskopev2/Data Connectors/NetskopeAlertsEvents_RestAPI_CCP/NetskopeAlertsEvents_Poller.json
similarity index 95%
rename from Solutions/Netskopev2/Data Connectors/Netskope-CCP/data_connector_poller.json
rename to Solutions/Netskopev2/Data Connectors/NetskopeAlertsEvents_RestAPI_CCP/NetskopeAlertsEvents_Poller.json
index 6abe4edcf73..a4579de6108 100644
--- a/Solutions/Netskopev2/Data Connectors/Netskope-CCP/data_connector_poller.json	
+++ b/Solutions/Netskopev2/Data Connectors/NetskopeAlertsEvents_RestAPI_CCP/NetskopeAlertsEvents_Poller.json	
@@ -6,7 +6,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -44,7 +44,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -82,7 +82,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -120,7 +120,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -158,7 +158,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -196,7 +196,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -234,7 +234,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -272,7 +272,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -310,7 +310,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -348,7 +348,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -386,7 +386,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -424,7 +424,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -462,7 +462,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeAlerts_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeAlerts",
@@ -500,7 +500,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeEventsApplication_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeEventsApplication",
@@ -538,7 +538,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeEventsAudit_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeEventsAudit",
@@ -576,7 +576,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeEventsConnection_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeEventsConnection",
@@ -614,7 +614,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeEventsDLP_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeEventsDLP",
@@ -652,7 +652,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeEventsEndpoint_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeEventsEndpoint",
@@ -690,7 +690,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeEventsInfrastructure_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeEventsInfrastructure",
@@ -728,7 +728,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeEventsNetwork_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeEventsNetwork",
@@ -766,7 +766,7 @@
         "location": "{{location}}",
         "kind": "RestApiPoller",
         "properties": {
-            "connectorDefinitionName": "NetskopeCCP",
+            "connectorDefinitionName": "NetskopeAlertsEvents",
             "dataType": "NetskopeEventsPage_CL",
             "dcrConfig": {
                 "streamName": "Custom-NetskopeEventsPage",
diff --git a/Solutions/Netskopev2/Data Connectors/Netskope-CCP/table.json b/Solutions/Netskopev2/Data Connectors/NetskopeAlertsEvents_RestAPI_CCP/NetskopeAlertsEvents_Table.json
similarity index 100%
rename from Solutions/Netskopev2/Data Connectors/Netskope-CCP/table.json
rename to Solutions/Netskopev2/Data Connectors/NetskopeAlertsEvents_RestAPI_CCP/NetskopeAlertsEvents_Table.json