diff --git a/src/documentation/content/xdocs/hpsf/internals.xml b/src/documentation/content/xdocs/hpsf/internals.xml
index e3a738c91..1a5012c1d 100644
--- a/src/documentation/content/xdocs/hpsf/internals.xml
+++ b/src/documentation/content/xdocs/hpsf/internals.xml
@@ -4,7 +4,7 @@
 
 <document>
   <header>
-    <title>HPSF Internals: The Horrible Property Set Format</title>
+    <title>Jakarta POI - HPSF Internals</title>
     <authors>
       <person name="Rainer Klute" email="klute@rainer-klute.de"/>
     </authors>
@@ -32,13 +32,13 @@
      <strong>property set stream</strong>.</p>
 
     <p>This document describes the internal structure of a property set stream,
-     i.e. the <strong>Horrible Property Set Format (HPSF)</strong>.  It does
+     i.e. the <strong>HPSF</strong>.  It does
      not describe how a Microsoft Office document is organized internally and
      how to retrieve a stream from it. See the <link
       href="../poifs/index.html">POIFS documentation</link> for that kind of
      stuff.</p>
 
-    <p>The Horrible Property Set Format is not only used in the Summary
+    <p>The HPSF is not only used in the Summary
      Information stream in the top-level document of a Microsoft Office
      document. Often there is also a property set stream named
      <code>\005DocumentSummaryInformation</code> with additional properties.
diff --git a/src/documentation/content/xdocs/trans/de/index.xml b/src/documentation/content/xdocs/trans/de/index.xml
index 039f1ee0a..3e2302a37 100644
--- a/src/documentation/content/xdocs/trans/de/index.xml
+++ b/src/documentation/content/xdocs/trans/de/index.xml
@@ -131,7 +131,7 @@
           href="../../poifs/index.html">POIFS-Seite</link>.
         </p>
       </section>
-      <section><title>HSSF (Horrible Spreadsheet Format)</title>
+      <section><title>HSSF</title>
         <p>
           HSSF ist unsere Portierung des Microsoft Excel 97(-2002)
           Dateiformats in reinem Java. Es unterstützt Lesen und
@@ -139,7 +139,7 @@
           <link href="../../hssf/index.html">HSSF-Seite</link>.
         </p>
       </section>
-      <section><title>HWPF (Horrible Document Format)</title>
+      <section><title>HWPF</title>
         <p>
           HWPF ist unsere Portierung des Microsoft Word 97 Datei-Formats
           in reinem Java. Es unterstützt Lesen und Schreiben. Mehr
@@ -149,7 +149,7 @@
           Entwickler, die mitmachen.
         </p>
       </section>
-      <section><title>HPSF (Horrible Property Set Format)</title>
+      <section><title>HPSF</title>
         <p>
           HPSF ist unsere Portierung des OLE 2 Property Formats.
           Property Sets werden häufig genutzt, um Metadaten eines
diff --git a/src/documentation/content/xdocs/trans/es/historyandfuture.xml b/src/documentation/content/xdocs/trans/es/historyandfuture.xml
index 0f87274e1..8d77a1c8f 100644
--- a/src/documentation/content/xdocs/trans/es/historyandfuture.xml
+++ b/src/documentation/content/xdocs/trans/es/historyandfuture.xml
@@ -132,8 +132,8 @@
         <p>
           Estamos empezando a expandir nuestro alcance de nuevo. Si pudimos
           hacer todo esto para ficheros XLS, ¿ñuhay de ficheros Doc o PPT?
-          Pensamos que nuestro siguiente componente (HWPF - Formato de 
-          Documento Horrible) deber seguir el mismo patr. Esperamos
+          Pensamos que nuestro siguiente componente (HWPF)
+          deber seguir el mismo patr. Esperamos
           que se nos una sangre nueva al equipo y que nos permita abordar
           esto con mayor celeridad (en parte porque POIFS ya estterminado).
           ¡Ðero a lo mejor lo que m necesitamos es a ti!