diff --git a/config-models/aether-2.0.x/files/yang/onf-upf.yang b/config-models/aether-2.0.x/files/yang/onf-upf.yang
index 4d27f31..32bee7a 100755
--- a/config-models/aether-2.0.x/files/yang/onf-upf.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-upf.yang
@@ -43,6 +43,8 @@
         description "ID for this upf.";
       }
 
+      uses at:desc-display-name;
+
       leaf address {
         type inet:host;
         mandatory true;
@@ -61,18 +63,6 @@
         type inet:uri;
         description "url for configuring the UPF";
       }
-
-      leaf display-name {
-        type string {
-            length 1..80;
-        }
-        description "display name to use in GUI or CLI";
-      }
-
-      leaf description {
-        type at:description;
-        description "description of this UPF";
-      }
     }
   }
 }