diff --git a/schemas/base.yml b/schemas/base.yml
index 9455494..3debdeb 100644
--- a/schemas/base.yml
+++ b/schemas/base.yml
@@ -9,7 +9,7 @@ generics:
     label: Interface
     include_in_menu: false
     hierarchical: false
-    display_label: "name__value"
+    display_label: "{{ name__value }}"
     attributes:
       - name: name
         kind: Text
@@ -37,9 +37,9 @@ generics:
         kind: Generic
 
 nodes:
-  # ==========================================================================
+  # ===================================================================
   # Location
-  # ==========================================================================
+  # ===================================================================
   - name: Site
     namespace: Location
     description: Physical site or data center
@@ -49,7 +49,7 @@ nodes:
       - name__value
     order_by:
       - name__value
-    display_label: "name__value"
+    display_label: "{{ name__value }}"
     attributes:
       - name: name
         kind: Text
@@ -62,9 +62,9 @@ nodes:
         optional: true
         description: Facility identifier or code
 
-  # ==========================================================================
+  # ===================================================================
   # Platform
-  # ==========================================================================
+  # ===================================================================
   - name: Platform
     namespace: Infra
     description: Device platform/OS (e.g., Arista EOS, Cisco NX-OS)
@@ -74,7 +74,7 @@ nodes:
       - name__value
     order_by:
       - name__value
-    display_label: "name__value"
+    display_label: "{{ name__value }}"
     attributes:
       - name: name
         kind: Text
@@ -92,9 +92,9 @@ nodes:
         optional: true
         description: Netmiko device type
 
-  # ==========================================================================
+  # ===================================================================
   # Device
-  # ==========================================================================
+  # ===================================================================
   - name: Device
     namespace: Infra
     description: Network device (spine, leaf, etc.)
@@ -104,7 +104,7 @@ nodes:
       - name__value
     order_by:
       - name__value
-    display_label: "name__value"
+    display_label: "{{ name__value }}"
     attributes:
       - name: name
         kind: Text
@@ -169,9 +169,9 @@ nodes:
         cardinality: one
         optional: true
 
-  # ==========================================================================
+  # ===================================================================
   # Interface Types (inherit from InfraInterface generic)
-  # ==========================================================================
+  # ===================================================================
   - name: InterfaceEthernet
     namespace: Infra
     description: Physical Ethernet interface
@@ -184,7 +184,7 @@ nodes:
     human_friendly_id:
       - device__name__value
       - name__value
-    display_label: "name__value"
+    display_label: "{{ name__value }}"
     attributes:
       - name: speed
         kind: Dropdown
@@ -237,7 +237,7 @@ nodes:
     human_friendly_id:
       - device__name__value
       - name__value
-    display_label: "name__value"
+    display_label: "{{ name__value }}"
 
   - name: InterfaceVlan
     namespace: Infra
@@ -251,7 +251,7 @@ nodes:
     human_friendly_id:
       - device__name__value
       - name__value
-    display_label: "name__value"
+    display_label: "{{ name__value }}"
     relationships:
       - name: vlan
         peer: InfraVLAN
@@ -270,7 +270,7 @@ nodes:
     human_friendly_id:
       - device__name__value
       - name__value
-    display_label: "name__value"
+    display_label: "{{ name__value }}"
     attributes:
       - name: lacp_mode
         kind: Dropdown
@@ -304,7 +304,7 @@ nodes:
     human_friendly_id:
       - device__name__value
       - name__value
-    display_label: "name__value"
+    display_label: "{{ name__value }}"
     attributes:
       - name: udp_port
         kind: Number
@@ -315,9 +315,9 @@ nodes:
         cardinality: one
         description: VTEP source interface (typically Loopback1)
 
-  # ==========================================================================
+  # ===================================================================
   # IP Address
-  # ==========================================================================
+  # ===================================================================
   - name: IPAddress
     namespace: Infra
     description: IP Address assignment
@@ -327,7 +327,7 @@ nodes:
       - address__value
     order_by:
       - address__value
-    display_label: "address__value"
+    display_label: "{{ address__value }}"
     attributes:
       - name: address
         kind: IPNetwork