diff --git a/source/chapters/contributing.adoc b/source/chapters/contributing.adoc
index f9f75e2..4f45785 100644
--- a/source/chapters/contributing.adoc
+++ b/source/chapters/contributing.adoc
@@ -141,7 +141,7 @@
 
 How do I know if my employer has signed the Member Committer and Contributor Agreement (MCCA)? ::
 
-Check with your manager. If your manager doesn't know, you can contact the {emoRecords}[EMO Record Team] for assistance.
+Check with your manager. If your manager doesn't know, you can contact the {emoRecordsEmailLink} for assistance.
 
 I know that my employer has signed the Member Committer and Contributor Agreement (MCCA), but my account page shows that I am not covered by the ECA. What should I do? ::
 
diff --git a/source/chapters/specifications.adoc b/source/chapters/specifications.adoc
index 753eb58..2181be6 100644
--- a/source/chapters/specifications.adoc
+++ b/source/chapters/specifications.adoc
@@ -111,7 +111,7 @@
 [[specifications-agreements]]
 === Specification Development Agreements
 
-Due to the nature of specification project work, the <<paperwork, committer agreements>> need to be augmented. For {forge} open source software projects (i.e., those projects not engaged in specification development) the committer agreements (Member Committer and Contributor Agreement and Individual Committer Agreement) are sufficient. The complete set of required agreements are described below.
+Due to the nature of specification project work, the <<paperwork, committer agreements>> need to be augmented. For {forgeName} open source software projects (i.e., those projects not engaged in specification development) the committer agreements (Member Committer and Contributor Agreement and Individual Committer Agreement) are sufficient. The complete set of required agreements are described below.
 
 [graphviz, images/specification-committers, svg]
 .What paperwork is required?
@@ -277,7 +277,7 @@
 
 All versions of specifications that are referenced by a ratified final specification must themselves be ratified. The <<specifications-release-review,release review>> for related specification versions may be run concurrently.
 
-Final Specifications and their associated artifacts are distributed under specific licenses. The specification document for the final specification must be distributed as read-only text (e.g., PDF) under the {efsl}[Eclipse Foundation Specification License]. The ratified TCK in composite is distributed under the {eftcklUrl}[Eclipse Foundation TCK License]. Other technical artifacts must be distributed under an open source license (normally the specification project’s license).
+Final Specifications and their associated artifacts are distributed under specific licenses. The specification document for the final specification must be distributed as read-only text (e.g., PDF) under the {efslLink}. The ratified TCK in composite is distributed under the {eftcklLink}. Other technical artifacts must be distributed under an open source license (normally the specification project’s license).
 
 [[specifications-implementations]]
 == Compatible Implementations
diff --git a/source/config.adoc b/source/config.adoc
index 67ec65a..516748c 100644
--- a/source/config.adoc
+++ b/source/config.adoc
@@ -18,7 +18,7 @@
 :activityUrl: http://www.eclipse.org/projects/project_activity.php
 :edpUrl: http://www.eclipse.org/projects/dev_process/development_process.php
 :efspUrl: https://www.eclipse.org/projects/efsp/
-:eflsUrl: https://www.eclipse.org/legal/efsl.php
+:efslUrl: https://www.eclipse.org/legal/efsl.php
 :eftcklUrl: https://www.eclipse.org/legal/tck.php
 :trademarkTransferUrl: http://eclipse.org/legal/Trademark_Transfer_Agreement.pdf
 :trademarkGuidelinesUrl: https://eclipse.org/legal/logo_guidelines.php
@@ -28,6 +28,15 @@
 :wgUrl: https://www.eclipse.org/org/workinggroups/
 :licenseWhitelistUrl: https://www.eclipse.org/legal/licenses.php#approved
 
+:webmasterEmailLink: mailto:{webmasterEmail}[Eclipse Webmaster]
+:ipTeamEmailLink: mailto:{ipTeamEmail}[EMO IP Team]
+:emoEmailLink: mailto:{emoEmail}[EMO]
+:emoRecordsEmailLink: mailto:{emoRecordsEmail}[EMO Records Team]
+
+:edpLink: {edpUrl}[Eclipse Foundation Development Process]
+:efslLink: {efslUrl}[Eclipse Foundation Specification License]
+:eftcklLink: {eftcklUrl}[Eclipse Foundation TCK License]
+
 :developerPortalUrl: http://portal.eclipse.org
 :bylawsUrl: https://www.eclipse.org/org/documents/eclipse_foundation-bylaws.pdf
 :committerGuidelinesUrl: http://www.eclipse.org/legal/committerguidelines.php