diff --git a/odata-data-aggregation-ext/0 frontmatter.md b/odata-data-aggregation-ext/0 frontmatter.md
index cc8047bea..d22f4513f 100644
--- a/odata-data-aggregation-ext/0 frontmatter.md
+++ b/odata-data-aggregation-ext/0 frontmatter.md
@@ -12,14 +12,14 @@
#### This stage:
-https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/csd04/odata-data-aggregation-ext-v4.0-csd04.md (Authoritative) \
-https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/csd04/odata-data-aggregation-ext-v4.0-csd04.html \
-https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/csd04/odata-data-aggregation-ext-v4.0-csd04.pdf
+https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$stage$$$/$$$filename$$$.md (Authoritative) \
+https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$stage$$$/$$$filename$$$.html \
+https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$stage$$$/$$$filename$$$.pdf
#### Previous stage:
-https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$previousStage$$$/odata-data-aggregation-ext-v4.0-cs02.docx (Authoritative) \
-https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$previousStage$$$/odata-data-aggregation-ext-v4.0-cs02.html \
-https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$previousStage$$$/odata-data-aggregation-ext-v4.0-cs02.pdf
+https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$previousStage$$$/odata-data-aggregation-ext-v4.0-$$$previousStage$$$.docx (Authoritative) \
+https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$previousStage$$$/odata-data-aggregation-ext-v4.0-$$$previousStage$$$.html \
+https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$previousStage$$$/odata-data-aggregation-ext-v4.0-$$$previousStage$$$.pdf
#### Latest stage:
https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/odata-data-aggregation-ext-v4.0.md (Authoritative) \
@@ -45,10 +45,10 @@ Martin Zurmühl (martin.zurmuehl@sap.com), [SAP SE](https://www.sap.com/)
#### Additional artifacts:
This document is one component of a Work Product that also includes:
-* ABNF components: _OData Aggregation ABNF Construction Rules Version 4.0 and OData Aggregation ABNF Test Cases_: https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/csd04/abnf/
+* ABNF components: _OData Aggregation ABNF Construction Rules Version 4.0 and OData Aggregation ABNF Test Cases_: https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$stage$$$/abnf/
* OData Aggregation Vocabulary:
- * https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/csd04/vocabularies/Org.OData.Aggregation.V1.json
- * https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/csd04/vocabularies/Org.OData.Aggregation.V1.xml
+ * https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$stage$$$/vocabularies/Org.OData.Aggregation.V1.json
+ * https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$stage$$$/vocabularies/Org.OData.Aggregation.V1.xml
#### Related work:
This specification is related to:
@@ -83,7 +83,7 @@ When referencing this specification the following citation format should be used
_$$$pagetitle$$$_.
Edited by Ralf Handl, Hubert Heijkers, Gerald Krause, Michael Pizzo, Heiko Theißen, and Martin Zurmuehl. $$$pubdate$$$. OASIS $$$subtitle$$$.
-https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/csd04/$$$filename$$$.html.
+https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/$$$stage$$$/$$$filename$$$.html.
Latest stage: https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/odata-data-aggregation-ext-v4.0.html.
#### Notices
diff --git a/odata-data-aggregation-ext/5 Vocabulary for Data Aggregation.md b/odata-data-aggregation-ext/5 Vocabulary for Data Aggregation.md
index b3af082da..d655732d0 100644
--- a/odata-data-aggregation-ext/5 Vocabulary for Data Aggregation.md
+++ b/odata-data-aggregation-ext/5 Vocabulary for Data Aggregation.md
@@ -220,7 +220,7 @@ The hierarchy terms can be applied to the [Example Data Model](#ExampleDataModel
+ aggregation-ext/v4.0/$$$stage$$$/vocabularies/Org.OData.Aggregation.V1.xml">
diff --git a/odata-json-format/0 frontmatter.md b/odata-json-format/0 frontmatter.md
index eef2b9bae..5862b8cea 100644
--- a/odata-json-format/0 frontmatter.md
+++ b/odata-json-format/0 frontmatter.md
@@ -47,7 +47,7 @@ This specification is related to:
* _OData Version 4.02_. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
* _OData Version 4.02 Part 1: Protocol_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html
* _OData Version 4.02 Part 2: URL Conventions_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html
- * _ABNF components: OData ABNF Construction Rules Version 4.02 and OData ABNF Test Cases_. https://docs.oasis-open.org/odata/odata/v4.02/csd01/abnf/
+ * _ABNF components: OData ABNF Construction Rules Version 4.02 and OData ABNF Test Cases_. https://docs.oasis-open.org/odata/odata/v4.02/$$$stage$$$/abnf/
* _OData Vocabularies Version 4.0_. Edited by Michael Pizzo, Ralf Handl, and Ram Jeyaraman. Latest stage: https://docs.oasis-open.org/odata/odata-vocabularies/v4.0/odata-vocabularies-v4.0.html
* _OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02_. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. Latest stage: https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html
* _OData Common Schema Definition Language (CSDL) XML Representation Version 4.02_. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. Latest stage: https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/odata-csdl-xml-v4.02.html