diff --git a/docs/_static/json/amendments/amendments-contract-example.json b/docs/_static/json/amendments/amendments-contract-example.json
index f0ef20915..9cbc388ab 100644
--- a/docs/_static/json/amendments/amendments-contract-example.json
+++ b/docs/_static/json/amendments/amendments-contract-example.json
@@ -111,7 +111,7 @@
                   "id": "1",
                   "amendsReleaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24",
                   "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5",
-                  "rationale": "After negociations with the supplier, the scope of the contract has been increased to purchase an additional item.",
+                  "rationale": "After negotiations with the supplier, the scope of the contract has been increased to purchase an additional item.",
                   "date": "2019-02-16T12:00:00Z"
                 }
               ],
diff --git a/docs/examples/merging/example03-awardAmendment.json b/docs/examples/merging/example03-awardAmendment.json
index 3617379d4..d5cde5077 100644
--- a/docs/examples/merging/example03-awardAmendment.json
+++ b/docs/examples/merging/example03-awardAmendment.json
@@ -167,7 +167,7 @@
             {
               "id": "001",
               "description": "One awarded item has been removed in favor of other two ones.",
-              "rationale": "Items have been changed after negociations with the awarded supplier.",
+              "rationale": "Items have been changed after negotiations with the supplier.",
               "amendsReleaseID": "ocds-23g63a01-200502-award"
             }
           ],
diff --git a/docs/examples/merging/example03-record.json b/docs/examples/merging/example03-record.json
index f87d75583..12ad413a6 100644
--- a/docs/examples/merging/example03-record.json
+++ b/docs/examples/merging/example03-record.json
@@ -170,7 +170,7 @@
                 {
                   "id": "001",
                   "description": "One awarded item has been removed in favor of other two ones.",
-                  "rationale": "Items have been changed after negociations with the awarded supplier.",
+                  "rationale": "Items have been changed after negotiations with the supplier.",
                   "amendsReleaseID": "ocds-23g63a01-200502-award"
                 }
               ],
@@ -471,7 +471,7 @@
               {
                 "id": "001",
                 "description": "One awarded item has been removed in favor of other two ones.",
-                "rationale": "Items have been changed after negociations with the awarded supplier.",
+                "rationale": "Items have been changed after negotiations with the supplier.",
                 "amendsReleaseID": "ocds-23g63a01-200502-award"
               }
             ]
@@ -1356,7 +1356,7 @@
                     "releaseTag": [
                       "awardAmendment"
                     ],
-                    "value": "Items have been changed after negociations with the awarded supplier."
+                    "value": "Items have been changed after negotiations with the supplier."
                   }
                 ],
                 "amendsReleaseID": [
diff --git a/docs/examples/pre-qualification/multi-stage.csv b/docs/examples/pre-qualification/multi-stage.csv
index 4cba81117..f0db2b983 100644
--- a/docs/examples/pre-qualification/multi-stage.csv
+++ b/docs/examples/pre-qualification/multi-stage.csv
@@ -1,14 +1,14 @@
 First stage,Second stage
-"* The procuring entity issues an invitation to participate in the process
+"* The buyer or procuring entity issues an invitation to participate in the process
 
-* Suppliers submit requests to participate
+* Potential suppliers submit requests to participate
 
-* The procuring entity assess suppliers based on their submissions
+* The buyer or procuring entity assesses the requests
 
-* The procuring entity establishes a list of qualified or selected suppliers","* The procuring entity issues an invitation to bid to the suppliers on the list
+* The buyer or procuring entity establishes a list of qualified or selected potential suppliers","* The buyer or procuring entity issues an invitation to bid to the potential suppliers on the list
 
-* Suppliers submit bids
+* Potential suppliers submit bids
 
-* The procuring entity evaluates the bids
+* The buyer or procuring entity evaluates the bids
 
-* The procuring entity awards a contract to the successful supplier(s)"
+* The buyer or procuring entity awards a contract to the supplier(s)"
diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md
index 97cd659de..95d0713de 100644
--- a/docs/guidance/build/merging.md
+++ b/docs/guidance/build/merging.md
@@ -87,7 +87,7 @@ In the final record, both the compiled and versioned releases show the changes.
 
 Another government agency in Colombia publishes a new procurement opportunity. Details are provided in an OCDS release, as shown below.
 
-A few days after releasing the tender notice, the government agency receives feedback for potential bidders, and they realize that the estimated contract period set for the tender could be infeasible. They decide to instead negotiate the contract period with the awarded supplier, and they remove the contract period from the opportunity to avoid confusing potential bidders.
+A few days after releasing the tender notice, the government agency receives feedback for potential bidders, and they realize that the estimated contract period set for the tender could be infeasible. They decide to instead negotiate the contract period with the supplier, and they remove the contract period from the opportunity to avoid confusing potential bidders.
 
 A release with a 'tenderAmendment' tag is published, in which both the `startDate` and `endDate` of the `contractPeriod` block have been set to `null`. Also, an `amendments` block is provided to explain the changes.
 
@@ -115,7 +115,7 @@ The final record is shown below. Note that the fields in the `contractPeriod` bl
 
 The public procurement authority in Zambia publishes an award notice, as well as an OCDS release with an 'award' tag. A NGO collects the individual releases published by the procurement authority on a weekly basis to merge into their own records, which they use to display information on their website.
 
-Two weeks later, the authority publishes a new release. Due to negotiations with the awarded supplier, one of the items in the award is being deleted and two new ones have been added to replace it, as show below. The two new items have been added at the end of the `items` array, and the item to remove has all its fields set to `null`.
+Two weeks later, the authority publishes a new release. Due to negotiations with the supplier, one of the items in the award is being deleted and two new ones have been added to replace it, as show below. The two new items have been added at the end of the `items` array, and the item to remove has all its fields set to `null`.
 
 The NGO generates a record. In the record, all the fields of the removed item have disappeared, and only its `id` is left.
 
diff --git a/docs/guidance/map/buyers_suppliers.md b/docs/guidance/map/buyers_suppliers.md
index d3dba7c17..32cde84e0 100644
--- a/docs/guidance/map/buyers_suppliers.md
+++ b/docs/guidance/map/buyers_suppliers.md
@@ -34,7 +34,7 @@ OCDS defines a supplier as:
 
 ## Consortia suppliers
 
-When multiple suppliers put together a single bid, and are awarded as a group, this is known as a consortium.
+When multiple potential suppliers put together a single bid, and are awarded as a group, this is known as a consortium.
 
 In some countries, these suppliers only create a legal entity after the award, to sign the contract; or, they decide on a prime contractor, with the others being subcontractors.
 
diff --git a/docs/guidance/map/framework_agreements.md b/docs/guidance/map/framework_agreements.md
index 0d52d2855..c436581fa 100644
--- a/docs/guidance/map/framework_agreements.md
+++ b/docs/guidance/map/framework_agreements.md
@@ -157,13 +157,13 @@ NHS National Services Scotland (NSS) wants to establish a framework agreement fo
 
 #### Invitation to participate in the first stage
 
-NSS issues a [contract notice](https://ted.europa.eu/udl?uri=TED:NOTICE:478648-2019:TEXT:EN:HTML) (tender notice), inviting suppliers to participate in the framework agreement. The tender notice specifies that the framework agreement is with a single operator. The framework agreement is not open, since the tender notice does not specify that the procurement involves the setting up of a dynamic purchasing system. The framework agreement is for a single buyer, since the tender notice specifies only one contracting authority.
+NSS issues a [contract notice](https://ted.europa.eu/udl?uri=TED:NOTICE:478648-2019:TEXT:EN:HTML) (tender notice), inviting potential suppliers to participate in the framework agreement. The tender notice specifies that the framework agreement is with a single operator. The framework agreement is not open, since the tender notice does not specify that the procurement involves the setting up of a dynamic purchasing system. The framework agreement is for a single buyer, since the tender notice specifies only one contracting authority.
 
 The notice is modelled as an OCDS release with a `tag` of 'tender' and the following properties:
 
 * The techniques extension is declared in the package metadata.
 * Since this contracting process is for the set-up of a framework agreement, `tender.techniques.hasFrameworkAgreement` is set to `true`.
-* Since the framework agreement will be concluded with a single supplier and since any supplier is able to submit a response to the invitation to participate, `tender.procurementMethod` is set to 'open'.
+* Since the framework agreement will be concluded with a single supplier and since any potential supplier is able to submit a response to the invitation to participate, `tender.procurementMethod` is set to 'open'.
 * Since the framework agreement is closed, `tender.tenderPeriod` is set to the deadline for responses to the invitation to participate.
 * Since there is only one buyer, `buyer` is set to reference the buyer's object in the `parties` array.
 
diff --git a/docs/guidance/map/pre-qualification.md b/docs/guidance/map/pre-qualification.md
index b11617a8a..b8059b20b 100644
--- a/docs/guidance/map/pre-qualification.md
+++ b/docs/guidance/map/pre-qualification.md
@@ -1,6 +1,6 @@
 # Processes with pre-qualification and pre-selection
 
-In single-stage procedures, procuring entities invite suppliers to bid without submitting any prior information.  Such procedures are straightforward to model in OCDS.
+In single-stage procedures, buyers or procuring entities invite potential suppliers to bid without submitting any prior information.  Such procedures are straightforward to model in OCDS.
 
 But, many jurisdictions also use multi-stage procedures. Such procedures follow a process like:
 
@@ -16,27 +16,27 @@ This worked example describes 3 types of multi-stage procedure and explains how
 
 The term ‘pre-qualification’ describes different types of multi-stage procedure:
 
-### Pre-qualification with no limit on the number of qualified suppliers
+### Pre-qualification with no limit on the number of qualified potential suppliers
 
 The [UNCITRAL Model Law on Public Procurement (2011)](https://uncitral.un.org/en/texts/procurement/modellaw/public_procurement) was developed through extensive consultation and so reflects the procurement practices and concepts used in many different jurisdictions. The UNCITRAL model law defines pre-qualification as a procedure to:
 
 > ...identify, prior to solicitation, suppliers or contractors that are qualified.
 
-The model law obliges procuring entities to publish an invitation to pre-qualify. The invitation needs to specify the criteria and procedure for assessing the qualifications of suppliers. Much of the information that would usually appear on an invitation to tender is provided on the invitation to pre-qualify.
+The model law obliges buyers and procuring entities to publish an invitation to pre-qualify. The invitation needs to specify the criteria and procedure for assessing the qualifications of potential suppliers. Much of the information that would usually appear on an invitation to tender is provided on the invitation to pre-qualify.
 
-The procuring entity assesses the qualifications of the suppliers based on their responses. Only pre-qualified suppliers can take part in the later proceedings.
+The buyer or procuring entity assesses the qualifications of the potential suppliers based on their responses. Only pre-qualified potential suppliers can take part in the later proceedings.
 
 ```{note}
 The European Union’s restricted procedure, competitive procedure with negotiation, competitive dialogue and innovation partnership use pre-qualification (see Articles 28-31, [Directive 2014/24/EU](https://eur-lex.europa.eu/eli/dir/2014/24/oj)).
 ```
 
-### Pre-qualification with a limit on the number of qualified suppliers (pre-selection)
+### Pre-qualification with a limit on the number of qualified potential suppliers (pre-selection)
 
 The UNCITRAL model law defines pre-selection as a procedure to:
 
 > ...identify, prior to solicitation, a **limited number** of suppliers or contractors that best meet the qualification criteria for the procurement concerned.
 
-Pre-selection follows the same process as pre-qualification, with some additional requirements. The invitation to pre-qualify needs to specify how many suppliers the procuring entity will later request proposals from. The invitation also needs to specify how the procuring entity will select the suppliers to request proposals from.
+Pre-selection follows the same process as pre-qualification, with some additional requirements. The invitation to pre-qualify needs to specify how many potential suppliers the buyer or procuring entity will later request proposals from. The invitation also needs to specify how the procuring entity will select the potential suppliers to request proposals from.
 
 ```{note}
 The European Union’s restricted procedure, competitive procedure with negotiation, competitive dialogue procedure and innovation partnership all permit the use of pre-selection (see Article 65, [Directive 2014/24/EU](https://eur-lex.europa.eu/eli/dir/2014/24/oj)).
@@ -44,11 +44,11 @@ The European Union’s restricted procedure, competitive procedure with negotiat
 
 ### Pre-qualification in Paraguay
 
-In Paraguay, procuring entities can carry out a single pre-qualification for several tenders of the same nature (see article 22, [law Nº 2.051/03](https://www.contrataciones.gov.py/documentos/download/marco-legal/12760)). The details of this procedure will become clearer in the example below.
+In Paraguay, buyers and procuring entities can carry out a single pre-qualification for several tenders of the same nature (see article 22, [law Nº 2.051/03](https://www.contrataciones.gov.py/documentos/download/marco-legal/12760)). The details of this procedure will become clearer in the example below.
 
 ## The OCDS model
 
-In OCDS, a contracting process has a single competitive stage, the `tender` section. This represents the initiation of the process, when procuring entities invite suppliers to take part:
+In OCDS, a contracting process has a single competitive stage, the `tender` section. This represents the initiation of the process, when buyers or procuring entities invite potential suppliers to take part:
 
 <div style="width:100%">
 
@@ -105,7 +105,7 @@ The `tender` section is also used to disclose information about the procedure us
 
 ## Example: Pre-qualification
 
-The Bank of England issues a [restricted procedure contract notice](https://ted.europa.eu/udl?uri=TED:NOTICE:90873-2019:TEXT:EN:HTML) to invite suppliers to pre-qualify for a tender to provide facilities management services.
+The Bank of England issues a [restricted procedure contract notice](https://ted.europa.eu/udl?uri=TED:NOTICE:90873-2019:TEXT:EN:HTML) to invite potential suppliers to pre-qualify for a tender to provide facilities management services.
 
 The notice represents the initiation of the contracting process, so it is modelled using the `tender` section in OCDS:
 
@@ -114,7 +114,7 @@ The notice represents the initiation of the contracting process, so it is modell
 :title: Tender section
 ```
 
-Any supplier can submit a request to take part in the first stage, but only qualified suppliers will be invited to submit a bid for the contract. Therefore, `tender/procurementMethod` is set to ‘selective’.
+Any potential supplier can submit a request to take part in the first stage, but only qualified potential suppliers will be invited to submit a bid for the contract. Therefore, `tender/procurementMethod` is set to ‘selective’.
 
 ```{note}
 OCDS does not currently provide a way to disclose information on the second stage of multi-stage procedures. The approach to modelling multi-stage procedures is under discussion on [GitHub](https://github.com/open-contracting/standard/issues/440).
@@ -124,11 +124,11 @@ Contact the [helpdesk](../../support/index.md) if you want to disclose this type
 
 ## Example: Pre-selection
 
-The National Nuclear Laboratory issues a [restricted procedure contract notice](https://ted.europa.eu/udl?uri=TED:NOTICE:28681-2020:TEXT:EN:HTML&src=0) to invite suppliers to pre-qualify for a project to update its physical security system arrangements.
+The National Nuclear Laboratory issues a [restricted procedure contract notice](https://ted.europa.eu/udl?uri=TED:NOTICE:28681-2020:TEXT:EN:HTML&src=0) to invite potential suppliers to pre-qualify for a project to update its physical security system arrangements.
 
 The notice represents the initiation of the contracting process, so it is modelled using the `tender` section in OCDS.
 
-The procuring entitiy will invite a maximum of 5 qualified suppliers to submit a bid at the next stage, so `tender/procurementMethod` is set to ‘selective’. The [selectionCriteria extension](https://extensions.open-contracting.org/en/extensions/selectionCriteria/master/) is used to disclose the criteria for choosing which suppliers to invite proposals from.
+The procuring entitiy will invite a maximum of 5 qualified potential suppliers to submit a bid at the next stage, so `tender/procurementMethod` is set to ‘selective’. The [selectionCriteria extension](https://extensions.open-contracting.org/en/extensions/selectionCriteria/master/) is used to disclose the criteria for choosing which potential suppliers to invite proposals from.
 
 ```{jsoninclude} ../../examples/pre-qualification/pre-selection-package.json
 :jsonpointer: /releases/0/tender
@@ -137,11 +137,11 @@ The procuring entitiy will invite a maximum of 5 qualified suppliers to submit a
 
 ## Example: Pre-qualification in Paraguay
 
-The Ministry of Public Works and Communications issues an [invitation for suppliers to pre-qualify for two tenders for road construction in different neighbourhoods](https://contrataciones.gov.py/licitaciones/convocatoria/338229-servicios-consultoria-estudios-factibilidad-diseno-final-ingenieria-tramos-caminos-1/precalificacion.html). Each tender will re-use the list of pre-qualified suppliers established as a result of this first procedure.
+The Ministry of Public Works and Communications issues an [invitation for potential suppliers to pre-qualify for two tenders for road construction in different neighbourhoods](https://contrataciones.gov.py/licitaciones/convocatoria/338229-servicios-consultoria-estudios-factibilidad-diseno-final-ingenieria-tramos-caminos-1/precalificacion.html). Each tender will re-use the list of pre-qualified potential suppliers established as a result of this first procedure.
 
-The invitation represents the initiation of a contracting process to establish a list of pre-qualified suppliers, so it is modelled using the `tender` section in OCDS.
+The invitation represents the initiation of a contracting process to establish a list of pre-qualified potential suppliers, so it is modelled using the `tender` section in OCDS.
 
-Only qualified suppliers will be invited to bid in subsequent tenders that use the list, so `tender.procurementMethod` is set to ‘selective’.
+Only qualified potential suppliers will be invited to bid in subsequent tenders that use the list, so `tender.procurementMethod` is set to ‘selective’.
 
 ```{jsoninclude} ../../examples/pre-qualification/pre-qualification-paraguay-package.json
 :jsonpointer: /releases/0/tender
diff --git a/docs/history/changelog.md b/docs/history/changelog.md
index c2d50b9b5..c725adb00 100644
--- a/docs/history/changelog.md
+++ b/docs/history/changelog.md
@@ -91,10 +91,11 @@ Per the [normative and non-normative content and changes policy](https://docs.go
   * [#1377](https://github.com/open-contracting/standard/pull/1377) Clarify the description of 'completionCertificate' and align it with the description of 'paymentCertificate' in OC4IDS.
   * [#1378](https://github.com/open-contracting/standard/pull/1378) Remove the Category column.
   * [#1403](https://github.com/open-contracting/standard/pull/1403) Replace "contract notice" with "contract signature notice", add synonyms to all notice codes ('plannedProcurementNotice', 'tenderNotice', 'awardNotice', 'contractNotice') and standardize the descriptions.
+  * [#1416](https://github.com/open-contracting/standard/pull/1416) Change "interested supplier" to "potential supplier".
 
 * `method.csv`:
   * [#1353](https://github.com/open-contracting/standard/pull/1353) Replace "submit a tender" with "submit a bid".
-  * [#1416](https://github.com/open-contracting/standard/pull/1416) Change "(interested) supplier" to "potential supplier".
+  * [#1416](https://github.com/open-contracting/standard/pull/1416) Change "interested supplier" to "potential supplier". Change "supplier" to "potential supplier", where appropriate.
   * [#1418](https://github.com/open-contracting/standard/pull/1418) Standardize the codes' phrasing.
 
 * `milestoneType.csv`:
diff --git a/schema/codelists/documentType.csv b/schema/codelists/documentType.csv
index eb9cd83e5..258fbe255 100644
--- a/schema/codelists/documentType.csv
+++ b/schema/codelists/documentType.csv
@@ -1,6 +1,6 @@
 Section,Code,Title,Description,Deprecated,Deprecation note
 planning,plannedProcurementNotice,Notice of planned procurement,"Notice published by the buyer or procuring entity regarding their plans for future procurement. This notice is called a notice of planned procurement (for example, in the WTO's General Procurement Agreement), a future opportunity notice, a planning notice, a prior information notice or a periodic indicative notice (for example, in the EU). In some cases, the buyer or procuring entity can use the notice of planned procurement as a tender notice.",,
-tender,tenderNotice,Tender notice,"Notice published by the buyer or procuring entity inviting interested suppliers to submit a bid. This notice is called a tender notice, a notice of intended procurement (for example, in the WTO's General Procurement Agreement), an opportunity notice, a competition notice or a contract notice (for example, in the EU).",,
+tender,tenderNotice,Tender notice,"Notice published by the buyer or procuring entity inviting potential suppliers to submit a bid. This notice is called a tender notice, a notice of intended procurement (for example, in the WTO's General Procurement Agreement), an opportunity notice, a competition notice or a contract notice (for example, in the EU).",,
 award,awardNotice,Award notice,"Notice published by the buyer or procuring entity giving details of the contract award. This notice is published after a contract has been awarded but before it has been signed: for example, for the purposes of the standstill period. Once the contract has been signed, a contract signature notice is typically published.",,
 contract,contractNotice,Contract signature notice,"Notice published by the buyer or procuring entity giving details of the contract being concluded (for example, signed). This notice is called a contract signature notice, a result notice, a contract award notice (for example, in the EU), or a contract notice (for example, in Australia).",,
 implementation,completionCertificate,Completion certificate,A document issued by a relevant authority certifying that the work specified in the contract is complete to a certain level of quality. Completion certificates might only be relevant for particular kinds of contracting processes.,,
diff --git a/schema/codelists/method.csv b/schema/codelists/method.csv
index b8afe73b9..ab9d1ae88 100644
--- a/schema/codelists/method.csv
+++ b/schema/codelists/method.csv
@@ -2,4 +2,4 @@ Code,Title,Description
 open,Open,All potential suppliers can submit a bid.
 selective,Selective,All potential suppliers can qualify to submit a bid.
 limited,Limited,Only potential suppliers chosen by the buyer or the procuring entity can submit a bid.
-direct,Direct,Only a single supplier chosen by the buyer or the procuring entity can submit a bid.
+direct,Direct,Only a single potential supplier chosen by the buyer or the procuring entity can submit a bid.