diff --git a/doc/guide/admin/preface.sdf b/doc/guide/admin/preface.sdf
index fb752ed97b..7271cafefb 100644
--- a/doc/guide/admin/preface.sdf
+++ b/doc/guide/admin/preface.sdf
@@ -17,9 +17,9 @@ Copyright 1992-1996, Regents of the {{ORG[expand]UM}}, {{All Rights Reserved}}.
 P2[notoc] Scope of this Document
 
 This document provides a guide for installing OpenLDAP 2.0 Software
-on UNIX (and UNIX-like) systems.  The document is aimed at experienced
-system administrators but who may not have prior experience operating
-LDAP-based directory software.
+on {{TERM:UNIX}} (and UNIX-like) systems.  The document is aimed at
+experienced system administrators but who may not have prior experience
+operating {{TERM:LDAP}}-based directory software.
 
 
 P2[notoc] Acknowledgments
diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index 7a460427f2..742ad3aeef 100644
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -13,7 +13,7 @@
 #
 
 !define DOC_AUTHOR	"The OpenLDAP Project <{{URL:http://www.openldap.org/}}>"
-!define DOC_NAME    "OpenLDAP"
+!define DOC_NAME    "OpenLDAP 2.0"
 !define DOC_TYPE    "Guide"
 
 !define DOC_LOGO	"../images/LDAPlogo.gif"
@@ -174,6 +174,7 @@ SMTP	Simple Mail Transfer Protocol
 SNMP	Simple Network Management Protocol
 STD	Internet Standard
 UDP	User Datagram Protocol
+UNIX	UNIX
 URI	Uniform Resource Identifier
 URL	Uniform Resource Locator
 WWW	World Wide Web