diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang
index 1d2a88725c1e6808970a954f3f7d94b77c59c8f0..f54e781546514717f1143d07bd17a20ebd3eb383 100755
--- a/yang-models/_3gpp-nr-nrm-ep.yang
+++ b/yang-models/_3gpp-nr-nrm-ep.yang
@@ -17,6 +17,7 @@ module _3gpp-nr-nrm-ep {
     Resource Model (NRM).";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2021-04-30 { reference CR-0489; }
   revision 2021-03-02 { reference CR-0434; }
   revision 2021-01-16 { reference CR-0447; }
   revision 2020-11-02 { reference CR-0409; }
@@ -111,7 +112,7 @@ module _3gpp-nr-nrm-ep {
 
     list EP_F1C {
       description "Represents the local end point of the control plane
-        interface (F1-C) between the DU and CU or CU-CP.";
+        interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP.";
       reference "3GPP TS 28.541, 3GPP TS 38.470";
       key id;
       uses top3gpp:Top_Grp;
@@ -122,7 +123,7 @@ module _3gpp-nr-nrm-ep {
 
     list EP_NgC {
       description "Represents the local end point of the control plane
-        interface (NG-C) between the gNB and NG-Core entity.";
+        interface (NG-C) between the gNB and AMF.";
       reference "3GPP TS 28.541, 3GPP TS 38.470";
       key id;
       uses top3gpp:Top_Grp;
@@ -173,7 +174,7 @@ module _3gpp-nr-nrm-ep {
 
     list EP_F1U {
       description "Represents the local end point of the user plane
-        interface (F1-U) between the DU and CU or CU-UP.";
+        interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP.";
       reference "3GPP TS 28.541, 3GPP TS 38.470";
       key id;
       uses top3gpp:Top_Grp;
diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang
index 19c61caad456a493ac44afa004f430aa7ceea501..6e967056f6eab6d3a8c1138914323a717447fe2b 100755
--- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang
@@ -13,6 +13,7 @@ module _3gpp-nr-nrm-gnbdufunction {
     Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2021-04-30 { reference CR-0489 ; }
   revision 2020-10-02 { reference CR-0383 ; }
   revision 2020-03-12 { reference "SP-200233 S5-201547" ; }
   revision 2020-02-14 { reference S5-20XXXX ; }
@@ -34,7 +35,6 @@ feature";
 
     leaf gNBId {
       type int64 { range "0..4294967295"; }
-      config false;
       mandatory true;
       description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID)
         is part of the NR Cell Identifier (NCI) of the gNB cells.";