diff --git a/entity-types/ext-port/definition.stg.yml b/entity-types/ext-port/definition.stg.yml
index 12981c4d0..db0403b23 100644
--- a/entity-types/ext-port/definition.stg.yml
+++ b/entity-types/ext-port/definition.stg.yml
@@ -9,7 +9,11 @@ synthesis:
         - deviceName
         - port
     encodeIdentifierInGUID: true
-    name: port
+    compositeName:
+      fragments:
+        - attribute: deviceName
+        - value: ":"
+        - attribute: port
     conditions:
     - attribute: eventType
       value: NetworkTopology
diff --git a/relationships/synthesis/EXT-NETWORK_DEVICE-to-EXT-NETWORK_DEVICE.stg.yml b/relationships/synthesis/EXT-NETWORK_DEVICE-to-EXT-NETWORK_DEVICE.stg.yml
index 109c85c0a..98854f00d 100644
--- a/relationships/synthesis/EXT-NETWORK_DEVICE-to-EXT-NETWORK_DEVICE.stg.yml
+++ b/relationships/synthesis/EXT-NETWORK_DEVICE-to-EXT-NETWORK_DEVICE.stg.yml
@@ -1,7 +1,7 @@
 relationships:
   - name: extSwitchConnectsToDeviceByMac
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -39,7 +39,7 @@ relationships:
 
   - name: extSwitchConnectsToDeviceByManagementIp
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -77,7 +77,7 @@ relationships:
 
   - name: extSwitchConnectsToDeviceByNormalizedName
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -113,7 +113,7 @@ relationships:
 
   - name: extRouterConnectsToDeviceByMac
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -151,7 +151,7 @@ relationships:
 
   - name: extRouterConnectsToDeviceByManagementIp
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -189,7 +189,7 @@ relationships:
 
   - name: extRouterConnectsToDeviceByNormalizedName
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -225,7 +225,7 @@ relationships:
 
   - name: extAccessPointConnectsToDeviceByMac
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -263,7 +263,7 @@ relationships:
 
   - name: extAccessPointConnectsToDeviceByManagementIp
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -301,7 +301,7 @@ relationships:
 
   - name: extAccessPointConnectsToDeviceByNormalizedName
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -337,7 +337,7 @@ relationships:
 
   - name: extNetworkDeviceConnectsToDeviceByMac
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -375,7 +375,7 @@ relationships:
 
   - name: extNetworkDeviceConnectsToDeviceByManagementIp
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -413,7 +413,7 @@ relationships:
 
   - name: extNetworkDeviceConnectsToDeviceByNormalizedName
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
diff --git a/relationships/synthesis/EXT-NETWORK_DEVICE-to-EXT-PORT.stg.yml b/relationships/synthesis/EXT-NETWORK_DEVICE-to-EXT-PORT.stg.yml
index f87cdcdde..352303d87 100644
--- a/relationships/synthesis/EXT-NETWORK_DEVICE-to-EXT-PORT.stg.yml
+++ b/relationships/synthesis/EXT-NETWORK_DEVICE-to-EXT-PORT.stg.yml
@@ -1,7 +1,7 @@
 relationships:
   - name: extSwitchContainsPort
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -43,7 +43,7 @@ relationships:
 
   - name: extRouterContainsPort
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -85,7 +85,7 @@ relationships:
 
   - name: extAccessPointContainsPort
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -127,7 +127,7 @@ relationships:
 
   - name: extNetworkDeviceContainsPort
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
diff --git a/relationships/synthesis/EXT-PORT-to-EXT-PORT.stg.yml b/relationships/synthesis/EXT-PORT-to-EXT-PORT.stg.yml
index 0c8d598f5..27a4e7581 100644
--- a/relationships/synthesis/EXT-PORT-to-EXT-PORT.stg.yml
+++ b/relationships/synthesis/EXT-PORT-to-EXT-PORT.stg.yml
@@ -1,7 +1,7 @@
 relationships:
   - name: extPortConnectsToPortByMac
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -41,7 +41,7 @@ relationships:
 
   - name: extPortConnectsToPortByManagementIp
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]
@@ -81,7 +81,7 @@ relationships:
 
   - name: extPortConnectsToPortByNormalizedHostname
     version: "1"
-    origins: [Event API]
+    origins: [Network Monitoring]
     conditions:
       - attribute: eventType
         anyOf: ["NetworkTopology"]