diff --git a/contents/1-intro.tex b/contents/1-intro.tex
index 13d6c9b65276b4dd6b9cae3ea7992552528193e4..9b3a2fbd9d817a21f09f31f914c14c861103e50f 100644
--- a/contents/1-intro.tex
+++ b/contents/1-intro.tex
@@ -7,14 +7,14 @@ This document is \gls{ESCAPE} project deliverable \docNumber{}: “\docTitle{}
 A fundamentally web-based application, it serves a key part of the interface between the services delivered by \gls{ESCAPE} and the scientific community, providing mechanisms by which users can discover, access, and analyze the data, workflows, and services which the \glspl{ESFRI} affiliated with \gls{ESCAPE}, as well as other research infrastructures and a diverse range of other service providers, publish to the \gls{EOSC}.
 
 At the time of writing, the funded \gls{ESCAPE} project is reaching its conclusion.
-Substantial development effort has been invested into \gls{ESAP} and the surrounding ecosystem of software and services.
-At the same time, we do not believe that the development of \gls{ESAP} itself is coming to an end: the technologies developed, and the workflows pioneered, have shown real potential for widespread future application.
-This makes it an opportune moment to step back and assess the current state of and future plans for \gls{ESAP}.
+Substantial development effort has been invested into \pgls{ESAP} and the surrounding ecosystem of software and services.
+At the same time, we do not believe that the development of \pgls{ESAP} itself is coming to an end: the technologies developed, and the workflows pioneered, have shown real potential for widespread future application.
+This makes it an opportune moment to step back and assess the current state of and future plans for \pgls{ESAP}.
 What have we achieved within the context of \gls{ESCAPE} so far?
 How can we build upon these achievements in the future?
 It is that analysis which is undertaken in this document.
 
-At the mid-point of \gls{ESCAPE}, we undertook a substantial analysis of the performance of the \gls{ESAP} system as it then stood \autocite{ESCAPE-D5.3}.
+At the mid-point of \gls{ESCAPE}, we undertook a substantial analysis of the performance of the \pgls{ESAP} system as it then stood \autocite{ESCAPE-D5.3}.
 This document builds upon that earlier work to describe the sum total of the work achieved across the full duration of the project.
 Specifically, we will consider:
 
@@ -24,16 +24,16 @@ Specifically, we will consider:
 
 \item{To what extent the prototype meets the needs currently being expressed by the \gls{ESCAPE}-affiliated \glspl{ESFRI}, as expressed through the use cases collated by the project?}
 
-\item{To what extent have \gls{ESFRI} or other services have been successfully integrated with \gls{ESAP}?}
+\item{To what extent have \gls{ESFRI} or other services have been successfully integrated with \pgls{ESAP}?}
 
-\item{What are the future plans for \gls{ESAP} development as the \gls{ESCAPE} project comes to its conclusion?}
+\item{What are the future plans for \pgls{ESAP} development as the \gls{ESCAPE} project comes to its conclusion?}
 
 \end{enumerate}
 
 Broadly, this report is structured in two parts.
-In the first part, we provide essential context by describing the \gls{ESAP} system.
-In \cref{sec:vision} we the overall vision for the \gls{ESAP} system: what did we set out to build?
-\Cref{sec:current} takes that further by describing what is currently available: if one were to deploy and operate an \gls{ESAP} system today, what would it consist of?
+In the first part, we provide essential context by describing the \pgls{ESAP} system.
+In \cref{sec:vision} we the overall vision for the \pgls{ESAP} system: what did we set out to build?
+\Cref{sec:current} takes that further by describing what is currently available: if one were to deploy and operate an \pgls{ESAP} system today, what would it consist of?
 
 The second part of this document moves on to asses how successful that vision and implementation have been in addressing user --- and in particular \gls{ESFRI} --- needs.
 In particular, \cref{sec:requirements} tabulates the documented requirements and compares them to delivered product; \cref{sec:usecases} discusses how \pgls{ESAP} relates to all the use cases collected by the \gls{ESCAPE} project; and \cref{sec:esfri} describes current \gls{ESFRI} engagement with the platform..
diff --git a/main.tex b/main.tex
index d3a3f05aa24e203bfa9784b66b907c335c1b6e4a..b0b68b14d09aeb328e09f612669f51b194b047a0 100644
--- a/main.tex
+++ b/main.tex
@@ -13,6 +13,7 @@
 \setDueDate{2022-11-30}
 \setDueMonth{M46}
 
+\glsunset{ESCAPE}
 \glsunset{ESFRI}
 
 % This is set according to information obtained from make and git.