diff --git a/README.md b/README.md
index a453f0e3..b2cb9576 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# PEPPOL BIS Upgrade
+# Peppol BIS Upgrade
-This repository is used for the PEPPOL BIS Upgrade project.
+This repository is used for the Peppol BIS Upgrade project.
diff --git a/guides/compliance/main.adoc b/guides/compliance/main.adoc
index f8c5fc88..23bd4b22 100644
--- a/guides/compliance/main.adoc
+++ b/guides/compliance/main.adoc
@@ -1,5 +1,5 @@
= Compliance to BIS
-openPeppol AISBL
+OpenPeppol AISBL
:icons: font
:source-highlighter: coderay
:toc: left
diff --git a/guides/methodology/main.adoc b/guides/methodology/main.adoc
index 19109890..12821176 100644
--- a/guides/methodology/main.adoc
+++ b/guides/methodology/main.adoc
@@ -1,7 +1,7 @@
include::links.adoc[]
= image:../shared/images/peppol.png[float="right"]Peppol Documentation Methodology
-OpenPeppol AISBL, Post-Award Coordinating Community
+OpenPeppol AISBL, Post-Award Community
v0.1.0
:doctype: book
:icons: font
diff --git a/guides/methodology/schematron/main.adoc b/guides/methodology/schematron/main.adoc
index ecf63ee9..3ee291e4 100644
--- a/guides/methodology/schematron/main.adoc
+++ b/guides/methodology/schematron/main.adoc
@@ -10,7 +10,7 @@
:sectnums:
:last-update-label!:
-This document gives a guidance in how to develop schematron artefacts in openPeppol Post Award Coordinating Community.
+This document gives a guidance in how to develop schematron artefacts in OpenPeppol Post Award Community.
NOTE: This document is work in progress and will be further developed. If you have any feedback, please provide them as an issue in https://github.com/OpenPEPPOL/poacc-upgrade-3/issues[GitHub].
diff --git a/guides/migration/main.adoc b/guides/migration/main.adoc
index e4020b78..23bfc5ab 100644
--- a/guides/migration/main.adoc
+++ b/guides/migration/main.adoc
@@ -2,7 +2,7 @@ include::../shared/links.adoc[]
include::settings.adoc[]
= Migration plan
-Draft, OpenPeppol AISBL, Post-Award Coordinating Community
+Draft, OpenPeppol AISBL, Post-Award Community
:doctype: book
:icons: font
:toc: left
diff --git a/guides/migration/overview.adoc b/guides/migration/overview.adoc
index b76542c4..af7ae4cf 100644
--- a/guides/migration/overview.adoc
+++ b/guides/migration/overview.adoc
@@ -15,7 +15,7 @@ This migration plan addresses the migration of the Peppol BIS specifications fro
* BIS 63A Invoice Response
A - Phase In::
-* “Phase in” is defined as the start date for the optional use of Peppol BIS version 3.0 specifications corresponding to the publication date when the new Peppol BIS specifications become available for download at www.peppol.eu.
+* “Phase in” is defined as the start date for the optional use of Peppol BIS version 3.0 specifications corresponding to the publication date when the new Peppol BIS specifications become available for download at peppol.org.
* The date is set to *{phase-in}*
B - Transition::
diff --git a/guides/profiles/1-catalogueonly/introduction/index.adoc b/guides/profiles/1-catalogueonly/introduction/index.adoc
index 8e704c6c..72f4f64b 100644
--- a/guides/profiles/1-catalogueonly/introduction/index.adoc
+++ b/guides/profiles/1-catalogueonly/introduction/index.adoc
@@ -1,7 +1,7 @@
[[introduction-to-openpeppol-and-bis]]
-= Introduction to openPeppol and BIS
+= Introduction to OpenPeppol and BIS
-This BIS is a result of work within openPeppol and is published as part of the Peppol specifications.
+This BIS is a result of work within OpenPeppol and is published as part of the Peppol specifications.
This Peppol BIS provides a set of specifications for implementing a Peppol business process.
The document is concerned with clarifying requirements for ensuring interoperability of pan-European Public eProcurement and provides guidelines for supporting these requirements and how to implement them.
diff --git a/guides/profiles/18-punchout/introduction/index.adoc b/guides/profiles/18-punchout/introduction/index.adoc
index c6787320..6e2d3edf 100644
--- a/guides/profiles/18-punchout/introduction/index.adoc
+++ b/guides/profiles/18-punchout/introduction/index.adoc
@@ -1,5 +1,5 @@
-= Introduction to openPeppol and BIS
+= Introduction to OpenPeppol and BIS
This BIS is a result of work within {openpeppol} and is published as part of the {peppol} specifications.
diff --git a/guides/profiles/18-punchout/requirements/peppol-requirements.adoc b/guides/profiles/18-punchout/requirements/peppol-requirements.adoc
index fd5698f0..92d498b7 100644
--- a/guides/profiles/18-punchout/requirements/peppol-requirements.adoc
+++ b/guides/profiles/18-punchout/requirements/peppol-requirements.adoc
@@ -2,7 +2,7 @@
= Specific OpenPeppol requirements
[cols="1,2,3",options="header"]
-.Specific openPeppol requirements
+.Specific OpenPeppol requirements
|====
|ID:
|Business term:
diff --git a/guides/profiles/28-ordering/introduction/index.adoc b/guides/profiles/28-ordering/introduction/index.adoc
index eb981a00..49bdeb2e 100644
--- a/guides/profiles/28-ordering/introduction/index.adoc
+++ b/guides/profiles/28-ordering/introduction/index.adoc
@@ -1,5 +1,5 @@
-= Introduction to openPeppol and BIS
+= Introduction to OpenPeppol and BIS
This BIS is a result of work within {openpeppol} and is published as part of the {peppol} specifications.
diff --git a/guides/profiles/3-order-only/introduction/index.adoc b/guides/profiles/3-order-only/introduction/index.adoc
index c9aa487e..4bccb5f4 100644
--- a/guides/profiles/3-order-only/introduction/index.adoc
+++ b/guides/profiles/3-order-only/introduction/index.adoc
@@ -1,5 +1,5 @@
-= Introduction to openPeppol and BIS
+= Introduction to OpenPeppol and BIS
This BIS is a result of work within {openpeppol} and is published as part of the {peppol} specifications.
diff --git a/guides/profiles/30-despatchadvice/introduction/index.adoc b/guides/profiles/30-despatchadvice/introduction/index.adoc
index 91929b56..5763ba32 100644
--- a/guides/profiles/30-despatchadvice/introduction/index.adoc
+++ b/guides/profiles/30-despatchadvice/introduction/index.adoc
@@ -1,5 +1,5 @@
[[introduction-to-openpeppol-and-bis]]
-= Introduction to openPeppol and BIS
+= Introduction to OpenPeppol and BIS
This BIS is a result of work within Peppol project and is published as part of Peppol specifications.
diff --git a/guides/profiles/36-mlr/introduction/index.adoc b/guides/profiles/36-mlr/introduction/index.adoc
index f0287499..703fe667 100644
--- a/guides/profiles/36-mlr/introduction/index.adoc
+++ b/guides/profiles/36-mlr/introduction/index.adoc
@@ -1,5 +1,5 @@
-= Introduction to openPeppol and BIS
+= Introduction to OpenPeppol and BIS
This BIS is a result of work within {openpeppol} and is published as part of the {peppol} specifications.
diff --git a/guides/profiles/42-orderagreement/introduction/index.adoc b/guides/profiles/42-orderagreement/introduction/index.adoc
index 55dab869..15192030 100644
--- a/guides/profiles/42-orderagreement/introduction/index.adoc
+++ b/guides/profiles/42-orderagreement/introduction/index.adoc
@@ -1,5 +1,5 @@
-= Introduction to openPeppol and BIS
+= Introduction to OpenPeppol and BIS
This BIS is a result of work within {openpeppol} and is published as part of the {peppol} specifications.
diff --git a/guides/profiles/63-invoiceresponse/introduction/index.adoc b/guides/profiles/63-invoiceresponse/introduction/index.adoc
index 1be1bf45..66e8c5ee 100644
--- a/guides/profiles/63-invoiceresponse/introduction/index.adoc
+++ b/guides/profiles/63-invoiceresponse/introduction/index.adoc
@@ -1,6 +1,6 @@
[[introduction-to-openpeppol-and-bis]]
-= Introduction to openPeppol and BIS
+= Introduction to OpenPeppol and BIS
This BIS is a result of work within {openpeppol} and is published as part of the {peppol} specifications.
diff --git a/guides/profiles/64-catalogue-wo-response/introduction/index.adoc b/guides/profiles/64-catalogue-wo-response/introduction/index.adoc
index 8e704c6c..72f4f64b 100644
--- a/guides/profiles/64-catalogue-wo-response/introduction/index.adoc
+++ b/guides/profiles/64-catalogue-wo-response/introduction/index.adoc
@@ -1,7 +1,7 @@
[[introduction-to-openpeppol-and-bis]]
-= Introduction to openPeppol and BIS
+= Introduction to OpenPeppol and BIS
-This BIS is a result of work within openPeppol and is published as part of the Peppol specifications.
+This BIS is a result of work within OpenPeppol and is published as part of the Peppol specifications.
This Peppol BIS provides a set of specifications for implementing a Peppol business process.
The document is concerned with clarifying requirements for ensuring interoperability of pan-European Public eProcurement and provides guidelines for supporting these requirements and how to implement them.
diff --git a/guides/profiles/65-advanced-ordering/introduction/index.adoc b/guides/profiles/65-advanced-ordering/introduction/index.adoc
index a8970112..21a1aaed 100644
--- a/guides/profiles/65-advanced-ordering/introduction/index.adoc
+++ b/guides/profiles/65-advanced-ordering/introduction/index.adoc
@@ -1,7 +1,7 @@
= Introduction to OpenPeppol and BIS
-This BIS is a result of work within {openPeppol} and is published as part of the {Peppol} specifications.
+This BIS is a result of work within {OpenPeppol} and is published as part of the {Peppol} specifications.
This BIS provides a set of specifications for implementing a {Peppol} business process.
The document is concerned with clarifying requirements for ensuring interoperability of pan-European Public eProcurement and provides guidelines for supporting these requirements and how to implement them.
diff --git a/guides/profiles/99-Sandbox/codelists/index.adoc b/guides/profiles/99-Sandbox/codelists/index.adoc
index d65e1f90..a45de75f 100644
--- a/guides/profiles/99-Sandbox/codelists/index.adoc
+++ b/guides/profiles/99-Sandbox/codelists/index.adoc
@@ -2,7 +2,7 @@
[[codelist]]
= Code lists
-The following chapters give an overview of the codes that is used in this PEPPOL BIS.
+The following chapters give an overview of the codes that is used in this Peppol BIS.
:leveloffset: +1
diff --git a/guides/profiles/99-Sandbox/codelists/schemes/endpoint.adoc b/guides/profiles/99-Sandbox/codelists/schemes/endpoint.adoc
index 733d1553..fc4065c7 100644
--- a/guides/profiles/99-Sandbox/codelists/schemes/endpoint.adoc
+++ b/guides/profiles/99-Sandbox/codelists/schemes/endpoint.adoc
@@ -4,7 +4,7 @@
Electronic address identifiers (Endpoint identification) use of a code list to be maintained by CEF.
-#This code list is still not available. Use PEPPOL Policy for identifiers#
+#This code list is still not available. Use Peppol Policy for identifiers#
[cols="2,3,3", options="header"]
|===
diff --git a/guides/profiles/99-Sandbox/introduction/index.adoc b/guides/profiles/99-Sandbox/introduction/index.adoc
index 0f0e9100..743cbfee 100644
--- a/guides/profiles/99-Sandbox/introduction/index.adoc
+++ b/guides/profiles/99-Sandbox/introduction/index.adoc
@@ -1,16 +1,16 @@
-= Introduction to openPEPPOL and BIS
+= Introduction to OpenPeppol and BIS
This BIS is a result of work within {openpeppol} and is published as part of the {peppol} specifications.
-This PEPPOL BIS provides a set of specifications for implementing a {peppol} business process.
+This Peppol BIS provides a set of specifications for implementing a {peppol} business process.
The document is concerned with clarifying requirements for ensuring interoperability of pan-European Public eProcurement and provides guidelines for supporting these requirements and how to implement them.
-This PEPPOL BIS is based on the {bii-mlr}. #A conformance statement is included in this BIS, see annex D.#
+This Peppol BIS is based on the {bii-mlr}. #A conformance statement is included in this BIS, see annex D.#
*The purpose* of this document is to describe a common format for the message level response message in the European market, and to facilitate an efficient implementation and increased use of electronic collaboration regarding the message level response process based on this format.
-.Relationship between BII profiles and PEPPOL BIS
+.Relationship between BII profiles and Peppol BIS
image::../../shared/images/BII_relationship.png[]
diff --git a/guides/profiles/99-Sandbox/main.adoc b/guides/profiles/99-Sandbox/main.adoc
index db2fccea..5d18b06a 100644
--- a/guides/profiles/99-Sandbox/main.adoc
+++ b/guides/profiles/99-Sandbox/main.adoc
@@ -1,9 +1,9 @@
include::../../shared/links.adoc[]
= image:../../shared/images/peppol.png[float="right"]BIS Message Level Response - 36A
-OpenPEPPOL AISBL, Post-Award Coordinating Community
+OpenPeppol AISBL, Post-Award Community
v3.0.0
-:description: The PEPPOL Business Interoperability Specification, “BIS” from here on after, has been developed by the OpenPEPPOL AISBL Post Award Coordinating Community and is published as part of the PEPPOL specifications.
+:description: The PEPPOL Business Interoperability Specification, “BIS” from here on after, has been developed by the OpenPeppol AISBL Post Award Community and is published as part of the Peppol specifications.
:doctype: book
:icons: font
:stem:
diff --git a/guides/profiles/99-Sandbox/principles/parties.adoc b/guides/profiles/99-Sandbox/principles/parties.adoc
index 9577b4b0..a5a36bf8 100644
--- a/guides/profiles/99-Sandbox/principles/parties.adoc
+++ b/guides/profiles/99-Sandbox/principles/parties.adoc
@@ -3,7 +3,7 @@
The table below gives the definitions of the parties and roles of the message level response process.
The sender and receiver of the Message Level Response message should be extracted from the
-envelope, i.e. the PEPPOL participants.
+envelope, i.e. the Peppol participants.
[cols="2,4"]
|====
diff --git a/guides/profiles/99-Sandbox/principles/principles/index.adoc b/guides/profiles/99-Sandbox/principles/principles/index.adoc
index 4ce77a9b..6f88dbc2 100644
--- a/guides/profiles/99-Sandbox/principles/principles/index.adoc
+++ b/guides/profiles/99-Sandbox/principles/principles/index.adoc
@@ -2,7 +2,7 @@
[[principles]]
= Principles and prerequisites
-This chapter describes the principles and assumptions that underlie the use of this PEPPOL BIS Punch out.
+This chapter describes the principles and assumptions that underlie the use of this Peppol BIS Punch out.
It is based on the {bii} 18 Punch out.
This document identifies, explains and justifies the business requirements for the Punch Out-process.
diff --git a/guides/profiles/99-Sandbox/principles/principles/scope.adoc b/guides/profiles/99-Sandbox/principles/principles/scope.adoc
index a8cc02cd..d621d674 100644
--- a/guides/profiles/99-Sandbox/principles/principles/scope.adoc
+++ b/guides/profiles/99-Sandbox/principles/principles/scope.adoc
@@ -14,4 +14,4 @@ In this BIS, synchronization of shopping cart transaction information covers the
In case of an update/change, the buyer will simply generate a new product- or service list by repeating the process.
The information sourced with the Punch Out BIS may be used in following business process, such as ordering.
-The order transaction is outside scope of this BIS, we then refer to BISs PEPPOL BIS 3A Order Only or PEPPOL BIS 28A Ordering.
+The order transaction is outside scope of this BIS, we then refer to BISs Peppol BIS 3A Order Only or Peppol BIS 28A Ordering.
diff --git a/guides/profiles/99-Sandbox/profile/identifiers.adoc b/guides/profiles/99-Sandbox/profile/identifiers.adoc
index d1965030..d7984170 100644
--- a/guides/profiles/99-Sandbox/profile/identifiers.adoc
+++ b/guides/profiles/99-Sandbox/profile/identifiers.adoc
@@ -1,7 +1,7 @@
[[namespaces]]
= Namespaces
-The message level response data model is in this PEPPOL BIS bound to the {ubl-appl-resp}. The target namespace for the UBL-ApplicationResponse-2.1 is:
+The message level response data model is in this Peppol BIS bound to the {ubl-appl-resp}. The target namespace for the UBL-ApplicationResponse-2.1 is:
`urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2`
diff --git a/guides/profiles/99-Sandbox/rules/codelist.adoc b/guides/profiles/99-Sandbox/rules/codelist.adoc
index 5a00c110..cbf68e24 100644
--- a/guides/profiles/99-Sandbox/rules/codelist.adoc
+++ b/guides/profiles/99-Sandbox/rules/codelist.adoc
@@ -12,18 +12,18 @@
|Fatal
|CL-071-R002
-|A Response Code MUST be from the UNCL 4343 PEPPOL Subset code list
+|A Response Code MUST be from the UNCL 4343 Peppol Subset code list
|Fatal
|OP-T71-R001
-|An Endpoint Identifier Scheme MUST be from the list of PEPPOL Party Identifiers described in the "PEPPOL Policy for using Identifiers".
+|An Endpoint Identifier Scheme MUST be from the list of Peppol Party Identifiers described in the "Peppol Policy for using Identifiers".
|Fatal
|OP-T71-R002
-|An Party Identifier Scheme MUST be from the list of PEPPOL Party Identifiers described in the "PEPPOL Policy for using Identifiers".
+|An Party Identifier Scheme MUST be from the list of Peppol Party Identifiers described in the "Peppol Policy for using Identifiers".
|Fatal
|OP-071-R003
-|A message level response MUST specify the status reason code using the PEPPOL Status code list
+|A message level response MUST specify the status reason code using the Peppol Status code list
|Fatal
|====
diff --git a/guides/profiles/99-Sandbox/rules/peppol.adoc b/guides/profiles/99-Sandbox/rules/peppol.adoc
index 18fa91fc..94518b7c 100644
--- a/guides/profiles/99-Sandbox/rules/peppol.adoc
+++ b/guides/profiles/99-Sandbox/rules/peppol.adoc
@@ -1,5 +1,5 @@
[[peppol-specific-rules]]
-== PEPPOL Specific rules
+== Peppol Specific rules
[cols="1s,4,1",options="header"]
|====
diff --git a/guides/release-notes/main.adoc b/guides/release-notes/main.adoc
index ef41bdb7..5e6c9c19 100644
--- a/guides/release-notes/main.adoc
+++ b/guides/release-notes/main.adoc
@@ -1,5 +1,5 @@
= Release notes for Peppol BIS 3 documents, other than Peppol BIS Billing 3.0
-openPeppol AISBL
+OpenPeppol AISBL
:icons: font
:source-highlighter: coderay
:toc: left
diff --git a/guides/release-notes/v3.0.1.adoc b/guides/release-notes/v3.0.1.adoc
index 1faf6907..863cc905 100644
--- a/guides/release-notes/v3.0.1.adoc
+++ b/guides/release-notes/v3.0.1.adoc
@@ -4,7 +4,7 @@ Release date:: 2019-05-15
[NOTE]
====
-This release is a backward compatible minor upgrade, version 3.0.1 replacing the previous version 3.0.0 of OpenPEPPOL BIS document, other than the BIS Billing 3.0. The release includes changes to the BIS documents as well as the validation artifacts (VA's).
+This release is a backward compatible minor upgrade, version 3.0.1 replacing the previous version 3.0.0 of OpenPeppol BIS document, other than the BIS Billing 3.0. The release includes changes to the BIS documents as well as the validation artifacts (VA's).
====
== Changes to BIS documents and validation artifacts
diff --git a/guides/release-notes/v3.0.4.adoc b/guides/release-notes/v3.0.4.adoc
index 05220857..e6ec9fae 100644
--- a/guides/release-notes/v3.0.4.adoc
+++ b/guides/release-notes/v3.0.4.adoc
@@ -4,8 +4,8 @@ Release date:: 2020-05-01
== Changes to BIS document
* The code example in section 6.6 (Classification) is updated from the temporary code ”MC” to the code “TST” (The UNSPSC commodity classification system) from code list UCL7143. [POACC-274]
-** for PEPPOL BIS Catalogue without response 3
-** for PEPPOL BIS Catalogue only 3
+** for Peppol BIS Catalogue without response 3
+** for Peppol BIS Catalogue only 3
* Following BIS generalized so that they use term TAX instead of VAT. Enables using them for other similar taxes like GST. Catalogue, Catalogue only, Order, Ordering, Order Agreement, Punch Out, Invoice Response. [POACC-265]
** Text in guidelines generalized from VAT to GST
** Element names and descriptions that had VAT in them generalized as TAX
diff --git a/guides/shared/links.adoc b/guides/shared/links.adoc
index 821e19f2..282bd2a1 100644
--- a/guides/shared/links.adoc
+++ b/guides/shared/links.adoc
@@ -1,15 +1,15 @@
//description and subheading text
-:description: The Peppol Business Interoperability Specification, “BIS” from here on after, has been developed by the OpenPeppol AISBL Post Award Coordinating Community and is published as part of the Peppol specifications.
-:author: OpenPeppol AISBL, Post-Award Coordinating Community
+:description: The Peppol Business Interoperability Specification, “BIS” from here on after, has been developed by the OpenPeppol AISBL Post Award Community and is published as part of the Peppol specifications.
+:author: OpenPeppol AISBL, Post-Award Community
:version: 3.0.3
:ord_version: 3.1.0
//Peppol
-:peppol: https://peppol.eu/?rel=undefined[Peppol]
+:peppol: https://peppol.org/[Peppol]
:common: https://joinup.ec.europa.eu/svn/peppol/PEPPOL%20BIS%20Common%20text%20and%20introduction%20-%20ver%201%202014-04-14.pdf[Peppol BIS common text and introduction]
-:openpeppol: https://peppol.eu/about-openpeppol/?rel=tab41[OpenPeppol]
-:policy8: https://peppol.eu/downloads/the-peppol-edelivery-network-specifications/[Peppol Policy for identifiers, policy 8]
+:openpeppol: https://peppol.org/learn-more/organisation/[OpenPeppol]
+:policy8: https://docs.peppol.eu/edelivery/[Peppol Policy for identifiers, policy 8]
:migration-policy: https://github.com/OpenPEPPOL/documentation/blob/master/LifecycleManagement/ReleaseManagement/Migration%20Policy%20-%20Common%20Document%202014-02-24%20rev%202014-08-27.pdf[OpenPeppol Migration Policy]
-:peppol-transport: https://peppol.eu/downloads/the-peppol-edelivery-network-specifications/[Peppol eDelivery Network Specifications]
+:peppol-transport: https://peppol.org/documentation/technical-documentation/edelivery-documentation/[Peppol eDelivery Network Specifications]
:peppol-billing: http://docs.peppol.eu/poacc/billing/3.0/[Peppol BIS Billing 3.0]
:main-site: link:/poacc/upgrade-3/[Main documentation site]
diff --git a/guides/transactions/114-order-change/codelists/index.adoc b/guides/transactions/114-order-change/codelists/index.adoc
index c43ae92a..2410a48e 100644
--- a/guides/transactions/114-order-change/codelists/index.adoc
+++ b/guides/transactions/114-order-change/codelists/index.adoc
@@ -2,7 +2,7 @@
[[codelist]]
= Code lists
-The following chapters give an overview of the codes that is used in this PEPPOL BIS.
+The following chapters give an overview of the codes that is used in this Peppol BIS.
:leveloffset: +1
diff --git a/guides/transactions/114-order-change/requirements/peppol.adoc b/guides/transactions/114-order-change/requirements/peppol.adoc
index 6797b7dc..003306b5 100644
--- a/guides/transactions/114-order-change/requirements/peppol.adoc
+++ b/guides/transactions/114-order-change/requirements/peppol.adoc
@@ -1,4 +1,4 @@
-[[specific-openPeppol-requirements]]
+[[specific-openpeppol-requirements]]
= Specific OpenPeppol requirements
[cols="1,1,4",options="header"]
diff --git a/guides/transactions/114-order-change/rules/codelist.adoc b/guides/transactions/114-order-change/rules/codelist.adoc
index fc61c110..8969b5e2 100644
--- a/guides/transactions/114-order-change/rules/codelist.adoc
+++ b/guides/transactions/114-order-change/rules/codelist.adoc
@@ -4,11 +4,11 @@
[cols="1s,5",options="header"]
|====
|Identifier |Business Rule
-|OP-T01-001 |OrderTypeCode MUST be from UN/ECE 1001 code list PEPPOL Subset
+|OP-T01-001 |OrderTypeCode MUST be from UN/ECE 1001 code list Peppol Subset
|OP-T01-002 |DocumentCurrencyCode MUST be coded using ISO code list 4217
|OP-T01-003 |A Binary Object MIME code attribute MUST be coded using MIME Code Type version 2008 code list
-|OP-T01-004 |An Endpoint Identifier Scheme identifier MUST be from the code list PEPPOL Party Identifier
-|OP-T01-005 |An Party Identifier Scheme identifier MUST be from the code list PEPPOL Party Identifier
+|OP-T01-004 |An Endpoint Identifier Scheme identifier MUST be from the code list Peppol Party Identifier
+|OP-T01-005 |An Party Identifier Scheme identifier MUST be from the code list Peppol Party Identifier
|OP-T01-006 |Country codes in an order MUST be coded using ISO code list 3166-1
|OP-T01-007 |currencyID MUST be coded using ISO code list 4217
|OP-T01-008 |A tax category identifier MUST be coded using UN/ECE 5305 BII2 Subset
diff --git a/guides/transactions/115-order-cancellation/codelists/index.adoc b/guides/transactions/115-order-cancellation/codelists/index.adoc
index c43ae92a..2410a48e 100644
--- a/guides/transactions/115-order-cancellation/codelists/index.adoc
+++ b/guides/transactions/115-order-cancellation/codelists/index.adoc
@@ -2,7 +2,7 @@
[[codelist]]
= Code lists
-The following chapters give an overview of the codes that is used in this PEPPOL BIS.
+The following chapters give an overview of the codes that is used in this Peppol BIS.
:leveloffset: +1
diff --git a/guides/transactions/115-order-cancellation/codelists/schemes/endpoint.adoc b/guides/transactions/115-order-cancellation/codelists/schemes/endpoint.adoc
index 733d1553..d5b43334 100644
--- a/guides/transactions/115-order-cancellation/codelists/schemes/endpoint.adoc
+++ b/guides/transactions/115-order-cancellation/codelists/schemes/endpoint.adoc
@@ -4,7 +4,7 @@
Electronic address identifiers (Endpoint identification) use of a code list to be maintained by CEF.
-#This code list is still not available. Use PEPPOL Policy for identifiers#
+#This code list is still not available. Use Peppol Policy for use of identifiers#
[cols="2,3,3", options="header"]
|===
diff --git a/guides/transactions/115-order-cancellation/requirements/peppol.adoc b/guides/transactions/115-order-cancellation/requirements/peppol.adoc
index 570082bb..d4962b7c 100644
--- a/guides/transactions/115-order-cancellation/requirements/peppol.adoc
+++ b/guides/transactions/115-order-cancellation/requirements/peppol.adoc
@@ -1,5 +1,5 @@
[[specific-openpeppol-requirements]]
-= Specific OpenPEPPOL requirements
+= Specific OpenPeppol requirements
[cols="1,1,4",options="header"]
|====
@@ -37,5 +37,5 @@ Swedish requirement.
|OP-T01-013
|AdditionalItemProperty: +
Value quantity and value qualifier
-|Value quantity and value qualifier has been added to the AdditionalItemProperty element to harmonise with PEPPOL BIS Catalogue.
+|Value quantity and value qualifier has been added to the AdditionalItemProperty element to harmonise with Peppol BIS Catalogue.
|====
diff --git a/guides/transactions/115-order-cancellation/rules/codelist.adoc b/guides/transactions/115-order-cancellation/rules/codelist.adoc
index d9cd8127..59d47582 100644
--- a/guides/transactions/115-order-cancellation/rules/codelist.adoc
+++ b/guides/transactions/115-order-cancellation/rules/codelist.adoc
@@ -4,11 +4,11 @@
[cols="1s,5",options="header"]
|====
|Identifier |Business Rule
-|OP-T01-001 |OrderTypeCode in an order MUST be from UN/ECE 1001 code list PEPPOL Subset
+|OP-T01-001 |OrderTypeCode in an order MUST be from UN/ECE 1001 code list Peppol Subset
|OP-T01-002 |DocumentCurrencyCode MUST be coded using ISO code list 4217
|OP-T01-003 |A Binary Object MIME code attribute MUST be coded using MIME Code Type version 2008 code list
-|OP-T01-004 |An Endpoint Identifier Scheme identifier MUST be from the code list PEPPOL Party Identifier
-|OP-T01-005 |An Party Identifier Scheme identifier MUST be from the code list PEPPOL Party Identifier
+|OP-T01-004 |An Endpoint Identifier Scheme identifier MUST be from the code list Peppol Party Identifier
+|OP-T01-005 |An Party Identifier Scheme identifier MUST be from the code list Peppol Party Identifier
|OP-T01-006 |Country codes in an order MUST be coded using ISO code list 3166-1
|OP-T01-007 |currencyID MUST be coded using ISO code list 4217
|OP-T01-008 |A tax category identifier MUST be coded using UN/ECE 5305 BII2 Subset
diff --git a/rules/examples/DespatchAdvice_Example.xml b/rules/examples/DespatchAdvice_Example.xml
index 605d89fd..f2614839 100644
--- a/rules/examples/DespatchAdvice_Example.xml
+++ b/rules/examples/DespatchAdvice_Example.xml
@@ -1,7 +1,7 @@
diff --git a/structure/codelist/MimeCode.xml b/structure/codelist/MimeCode.xml
index dd2a8e46..ce87620e 100644
--- a/structure/codelist/MimeCode.xml
+++ b/structure/codelist/MimeCode.xml
@@ -5,7 +5,7 @@
MimeCode
1.0
IANA
- OpenPEPPOL
+ OpenPeppol
diff --git a/structure/codelist/OPStatusAction.xml b/structure/codelist/OPStatusAction.xml
index d14344be..ff571996 100644
--- a/structure/codelist/OPStatusAction.xml
+++ b/structure/codelist/OPStatusAction.xml
@@ -1,10 +1,10 @@
- Status Clarification Action (OpenPEPPOL)
+ Status Clarification Action (OpenPeppol)
OPStatusAction
1.0
- OpenPEPPOL
+ OpenPeppol
diff --git a/structure/codelist/OPStatusReason.xml b/structure/codelist/OPStatusReason.xml
index 436b9846..76008941 100644
--- a/structure/codelist/OPStatusReason.xml
+++ b/structure/codelist/OPStatusReason.xml
@@ -1,10 +1,10 @@
- Status Clarification Reason (OpenPEPPOL)
+ Status Clarification Reason (OpenPeppol)
OPStatusReason
1.0
- OpenPEPPOL
+ OpenPeppol
diff --git a/structure/codelist/StatusReason.xml b/structure/codelist/StatusReason.xml
index b5a460f3..cda1da44 100644
--- a/structure/codelist/StatusReason.xml
+++ b/structure/codelist/StatusReason.xml
@@ -1,10 +1,10 @@
- Status reason code (openPEPPOL)
+ Status reason code (OpenPeppol)
StatusReason
3.0
- openPEPPOL
+ OpenPeppol
diff --git a/structure/codelist/TransactionConditions.xml b/structure/codelist/TransactionConditions.xml
index 63399dd4..5a474e06 100644
--- a/structure/codelist/TransactionConditions.xml
+++ b/structure/codelist/TransactionConditions.xml
@@ -1,11 +1,11 @@
- Transaction condition code (OpenPEPPOL)
+ Transaction condition code (OpenPeppol)
TransactionCondition
1.0
- OpenPEPPOL
- OpenPEPPOL
+ OpenPeppol
+ OpenPeppol
CT
diff --git a/structure/codelist/TrueFalse.xml b/structure/codelist/TrueFalse.xml
index 4ed07417..7c7d9933 100644
--- a/structure/codelist/TrueFalse.xml
+++ b/structure/codelist/TrueFalse.xml
@@ -1,11 +1,11 @@
- Boolean indicator (openPEPPOL)
+ Boolean indicator (OpenPeppol)
TrueFalse
1.0
- OpenPEPPOL
- OpenPEPPOL
+ OpenPeppol
+ OpenPeppol
diff --git a/structure/codelist/UNCL1001_T01.xml b/structure/codelist/UNCL1001_T01.xml
index 3e6fdfca..ea66ce4f 100644
--- a/structure/codelist/UNCL1001_T01.xml
+++ b/structure/codelist/UNCL1001_T01.xml
@@ -5,7 +5,7 @@
UNCL1001_T01
D.17A
UN/CEFACT
- openPEPPOL
+ OpenPeppol
105
diff --git a/structure/codelist/UNCL1225.xml b/structure/codelist/UNCL1225.xml
index 4b4f7b3d..9889f31b 100644
--- a/structure/codelist/UNCL1225.xml
+++ b/structure/codelist/UNCL1225.xml
@@ -5,7 +5,7 @@
UNCL1225
D.17A
UN/CEFACT
- openPEPPOL
+ OpenPeppol
27
diff --git a/structure/codelist/UNCL1229.xml b/structure/codelist/UNCL1229.xml
index 36a761ee..a62056e6 100644
--- a/structure/codelist/UNCL1229.xml
+++ b/structure/codelist/UNCL1229.xml
@@ -5,7 +5,7 @@
UNCL1229
D.17A
UN/CEFACT
- openPEPPOL
+ OpenPeppol
1
diff --git a/structure/codelist/UNCL1229_CHANGE.xml b/structure/codelist/UNCL1229_CHANGE.xml
index 0ed79aa8..218b8063 100644
--- a/structure/codelist/UNCL1229_CHANGE.xml
+++ b/structure/codelist/UNCL1229_CHANGE.xml
@@ -5,7 +5,7 @@
UNCL1229_CHANGE
D.17A
UN/CEFACT
- openPEPPOL
+ OpenPeppol
1
diff --git a/structure/codelist/UNCL4219.xml b/structure/codelist/UNCL4219.xml
index 7e1729f8..090a5803 100644
--- a/structure/codelist/UNCL4219.xml
+++ b/structure/codelist/UNCL4219.xml
@@ -5,7 +5,7 @@
UNCL4219
D.17A
UN/CEFACT
- openPEPPOL
+ OpenPeppol
1
diff --git a/structure/codelist/UNCL4343-T111.xml b/structure/codelist/UNCL4343-T111.xml
index 53434834..76187093 100644
--- a/structure/codelist/UNCL4343-T111.xml
+++ b/structure/codelist/UNCL4343-T111.xml
@@ -5,7 +5,7 @@
UNCL4343-T111
D.17A
UN/CEFACT
- openPEPPOL-InvoiceResponse
+ OpenPeppol-InvoiceResponse
AB
diff --git a/structure/codelist/UNCL4343-T76.xml b/structure/codelist/UNCL4343-T76.xml
index 51367306..08132a3e 100644
--- a/structure/codelist/UNCL4343-T76.xml
+++ b/structure/codelist/UNCL4343-T76.xml
@@ -5,7 +5,7 @@
UNCL4343-T76
D.17A
UN/CEFACT
- openPEPPOL
+ OpenPeppol
AB
diff --git a/structure/codelist/UNCL4343.xml b/structure/codelist/UNCL4343.xml
index e4cb6795..fca59ed6 100644
--- a/structure/codelist/UNCL4343.xml
+++ b/structure/codelist/UNCL4343.xml
@@ -5,7 +5,7 @@
UNCL4343
D.17A
UN/CEFACT
- openPEPPOL
+ OpenPeppol
AB
diff --git a/structure/codelist/UNCL5189.xml b/structure/codelist/UNCL5189.xml
index 50783861..c87e1f81 100644
--- a/structure/codelist/UNCL5189.xml
+++ b/structure/codelist/UNCL5189.xml
@@ -5,7 +5,7 @@
UNCL5189
D.16B
UN/CEFACT
- openPEPPOL
+ OpenPeppol
diff --git a/structure/codelist/UNCL5305.xml b/structure/codelist/UNCL5305.xml
index b3285cfc..bfe68de2 100644
--- a/structure/codelist/UNCL5305.xml
+++ b/structure/codelist/UNCL5305.xml
@@ -5,7 +5,7 @@
UNCL5305
D.17A
UN/CEFACT
- OpenPEPPOL
+ OpenPeppol
AE
diff --git a/structure/codelist/UNCL6313-T16.xml b/structure/codelist/UNCL6313-T16.xml
index 0920c86f..2d26b5b1 100644
--- a/structure/codelist/UNCL6313-T16.xml
+++ b/structure/codelist/UNCL6313-T16.xml
@@ -5,7 +5,7 @@
UNCL6313-T16
D.17A
UN/CEFACT
- openPEPPOL
+ OpenPeppol
diff --git a/structure/codelist/UNCL6313.xml b/structure/codelist/UNCL6313.xml
index a4e721c8..1a4e74dd 100644
--- a/structure/codelist/UNCL6313.xml
+++ b/structure/codelist/UNCL6313.xml
@@ -5,7 +5,7 @@
UNCL6313
D.17A
UN/CEFACT
- openPEPPOL
+ OpenPeppol