diff --git a/src/integrationCommon.py b/src/integrationCommon.py
index 6a771253..ef8e7a59 100644
--- a/src/integrationCommon.py
+++ b/src/integrationCommon.py
@@ -359,14 +359,17 @@ class NetworkGraph:
 		# Builds ShapedDevices.csv from the network tree.
 			circuits = []
 			for (i, node) in enumerate(self.nodes):
-				if node.type == NodeType.client:
+				#if node.type == NodeType.client:
 					parent = self.nodes[node.parentIndex].displayName
 					if parent == "Shaper Root": parent = ""
 					
 					if circuitNameUseAddress:
 						displayNameToUse = node.address
 					else:
-						displayNameToUse = node.customerName
+						if node.type == NodeType.client:
+							displayNameToUse = node.displayName
+						else:
+							displayNameToUse = node.customerName + " (" + nodeTypeToString(node.type) + ")"
 					circuit = {
 						"id": node.id,
 						"name": displayNameToUse,
diff --git a/src/integrationUISP.py b/src/integrationUISP.py
index e5e55001..8b4064e3 100644
--- a/src/integrationUISP.py
+++ b/src/integrationUISP.py
@@ -433,6 +433,7 @@ def buildFullGraph():
 		match type:
 			case "site":
 				nodeType = NodeType.site
+				customerName = name
 				if name in siteBandwidth:
 					# Use the CSV bandwidth values
 					download = siteBandwidth[name]["download"]