diff --git a/xml/MAIN.SLEHA.xml b/xml/MAIN.SLEHA.xml
index 3e636baec..5195932d4 100644
--- a/xml/MAIN.SLEHA.xml
+++ b/xml/MAIN.SLEHA.xml
@@ -18,7 +18,7 @@
&productname; Documentation
&productname;
- &productnameabbrev;
+ &productnameshort;
&productnumber;
diff --git a/xml/book_administration.xml b/xml/book_administration.xml
index 8ffb8e1d6..196fc55e1 100644
--- a/xml/book_administration.xml
+++ b/xml/book_administration.xml
@@ -21,7 +21,7 @@
&haguide;
&productname;
- &productnameabbrev;
+ &productnameshort;
&productnumber;
diff --git a/xml/book_geo_clustering.xml b/xml/book_geo_clustering.xml
index f61785a62..accba7552 100644
--- a/xml/book_geo_clustering.xml
+++ b/xml/book_geo_clustering.xml
@@ -16,7 +16,8 @@
&geoguide;
&productnumber;
- &productname;
+ &productname;
+ &productnameshort;
diff --git a/xml/book_quickstarts.xml b/xml/book_quickstarts.xml
index ce3fe24ab..bb6b2dc95 100644
--- a/xml/book_quickstarts.xml
+++ b/xml/book_quickstarts.xml
@@ -17,6 +17,7 @@
Quick Start Guides
&productname;
+ &productnameshort;
diff --git a/xml/product-entities.ent b/xml/product-entities.ent
index 9c1486962..a956f264e 100644
--- a/xml/product-entities.ent
+++ b/xml/product-entities.ent
@@ -2,7 +2,7 @@
-
+