diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index d150a1405fb04a857b5b517e547881a432c6d664..a9b4c34188f8a624d8f26785c318e90b4a4e7880 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -825,16 +825,18 @@ components:
                       $ref: '#/components/schemas/GnbName'
                     plmnId:
                       $ref: '#/components/schemas/PlmnId'
-                    x2BlackList:
+                    x2BlockList:
                       $ref: '#/components/schemas/GGnbIdList'
-                    xnBlackList:
+                    xnBlockList:
                       $ref: '#/components/schemas/GGnbIdList'
-                    x2WhiteList:
+                    x2AllowList:
                       $ref: '#/components/schemas/GGnbIdList'
-                    xnWhiteList:
+                    xnAllowList:
                       $ref: '#/components/schemas/GGnbIdList'
-                    x2XnHOBlackList:
+                    x2HOBlockList:
                       $ref: '#/components/schemas/GEnbIdList'
+                    xnHOBlackList:
+                      $ref: '#/components/schemas/GGnbIdList'
                     mappingSetIDBackhaulAddress:
                       $ref: '#/components/schemas/MappingSetIDBackhaulAddress'
                     tceMappingInfoList:
diff --git a/README.md b/README.md
index d48cceab2b334389757d4ede3e3dcd52e487d41c..7ded0d216c1cc376503d336bf96c6b157f41a712 100644
--- a/README.md
+++ b/README.md
@@ -2,18 +2,20 @@
 
 The Rel-16 branch represents the latest Rel-16 content approved and published after each TSG SA plenary. 
 
-Rel17-draft branch represents the current working in progress release status.
+The Rel-17 branch represents the latest Rel-17 content approved and published after each TSG SA plenary. 
+
+Rel-18 branch represents the current working in progress release status.
 
 (c) 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). 
 All rights reserved.
 
-Branch {+Rel17-draft+} validation status:
+Branch {+Rel-18+} validation status:
 
-[![pipeline status](https://forge.3gpp.org/rep/SA5/MnS/badges/Rel17-draft/pipeline.svg)](https://forge.3gpp.org/rep/SA5/MnS/commits/Rel17-draft)
+[![pipeline status](https://forge.3gpp.org/rep/SA5/MnS/badges/Rel-18/pipeline.svg)](https://forge.3gpp.org/rep/SA5/MnS/commits/Rel-18)
 
 ## Data models validation
 
 The YANG data models in the present projects are validated by an automated CI agent. Learn more at:
 
-* [Jenkins job run for this project](https://forge.3gpp.org/jenkins/view/SA5/)
-* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts)
+* [Management And Orchestration APIs Wiki](https://forge.3gpp.org/rep/sa5/MnS/-/wikis/home)
+* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts/sa5)