diff --git a/schemas/vrf.yml b/schemas/vrf.yml
index 1d83ac2..18f1483 100644
--- a/schemas/vrf.yml
+++ b/schemas/vrf.yml
@@ -3,9 +3,9 @@
 ---
 version: "1.0"
 nodes:
-  # ==========================================================================
+  # ===================================================================
   # VRF (Virtual Routing and Forwarding)
-  # ==========================================================================
+  # ===================================================================
   - name: VRF
     namespace: Infra
     description: Virtual Routing and Forwarding instance
@@ -15,8 +15,7 @@ nodes:
       - name__value
     order_by:
       - name__value
-    display_labels:
-      - name__value
+    display_label: "{{ name__value }}"
     attributes:
       - name: name
         kind: Text
@@ -57,9 +56,9 @@ nodes:
         optional: true
         description: Interfaces assigned to this VRF
 
-  # ==========================================================================
+  # ===================================================================
   # Route Target
-  # ==========================================================================
+  # ===================================================================
   - name: RouteTarget
     namespace: Infra
     description: BGP Route Target for VPN import/export
@@ -69,8 +68,7 @@ nodes:
       - target__value
     order_by:
       - target__value
-    display_labels:
-      - target__value
+    display_label: "{{ target__value }}"
     attributes:
       - name: target
         kind: Text
@@ -80,9 +78,9 @@ nodes:
         kind: Text
         optional: true
 
-  # ==========================================================================
+  # ===================================================================
   # VRF Device Assignment
-  # ==========================================================================
+  # ===================================================================
   - name: VRFDeviceAssignment
     namespace: Infra
     description: VRF assignment to a specific device
@@ -91,8 +89,7 @@ nodes:
     human_friendly_id:
       - device__name__value
       - vrf__name__value
-    display_labels:
-      - route_distinguisher__value
+    display_label: "{{ device__name__value }} - {{ vrf__name__value }}"
     attributes:
       - name: route_distinguisher
         kind: Text