diff --git a/xml/MAIN-SBP-DRBD.xml b/xml/MAIN-SBP-DRBD.xml
index 663ccd21..7040d445 100644
--- a/xml/MAIN-SBP-DRBD.xml
+++ b/xml/MAIN-SBP-DRBD.xml
@@ -9,9 +9,9 @@
 
     <info>
         <title>Data Replication Across Geo Clusters via DRBD </title>
-        <subtitle>Included with SUSE Linux Enterprise High Availability Extension</subtitle>
+        <subtitle>Included with SUSE Linux Enterprise High Availability</subtitle>
         <!--<orgname>SUSE Best Practices</orgname>-->
-        <productname>SUSE Linux Enterprise High Availability Extension</productname>
+        <productname>SUSE Linux Enterprise High Availability</productname>
         <productnumber>12 SP1, SP2</productnumber>
         <!--        <productname>DRBD</productname>-->
         <!--        <productnumber>8, 9</productnumber>-->
@@ -27,7 +27,7 @@
             <meta name="series">SUSE Best Practices</meta>
             <meta name="category">High Availability</meta>
 
-        <meta name="platform">SUSE Linux Enterprise High Availability Extension 12 SP1, SP2</meta>
+        <meta name="platform">SUSE Linux Enterprise High Availability 12 SP1, SP2</meta>
             <meta name="platform">DRBD 8, 9</meta>
 
             <authorgroup>
@@ -84,7 +84,7 @@
 
         <abstract>
             <para>This technical guide describes the setup of a geo cluster using DRBD as delivered
-            with the SUSE Linux Enterprise High Availability Extension.</para>
+            with the SUSE Linux Enterprise High Availability.</para>
 
             <para>
                 <emphasis role="strong">Disclaimer: </emphasis>
@@ -105,7 +105,7 @@
         <title>Background</title>
 
         <para>The following sections provide you with important background information about DRBD
-            and the SUSE Linux Enterprise High Availability Extension.</para>
+            and the SUSE Linux Enterprise High Availability.</para>
 
         <sect2 xml:id="sec-drbd">
             <title>About DRBD</title>
@@ -127,9 +127,9 @@
         </sect2>
 
         <sect2 xml:id="sec-sleshae">
-            <title>About SUSE Linux Enterprise High Availability Extension</title>
+            <title>About SUSE Linux Enterprise High Availability</title>
 
-            <para>SUSE Linux Enterprise High Availability Extension is an integrated suite of open
+            <para>SUSE Linux Enterprise High Availability is an integrated suite of open
                 source clustering technologies that enables you to implement highly available
                 physical and virtual Linux clusters, and to eliminate single points of failure. It
                 ensures the availability and manageability of critical networked resources including
@@ -137,12 +137,12 @@
                 protect data integrity, and reduce unplanned downtime for your mission-critical
                 Linux workloads.</para>
 
-            <para>SUSE Linux Enterprise High Availability Extension ships with essential monitoring,
+            <para>SUSE Linux Enterprise High Availability ships with essential monitoring,
                 messaging, and cluster resource management functionality (supporting failover,
                 failback, and migration (load balancing) of individually managed cluster
                 resources).</para>
 
-            <para>SUSE Linux Enterprise High Availability Extension includes DRBD.</para>
+            <para>SUSE Linux Enterprise High Availability includes DRBD.</para>
         </sect2>
     </sect1>
 
@@ -710,7 +710,7 @@ ticket: ticket-nfs, leader: 192.168.201.100, expires: 2016-04-14 07:50:48</scree
     <sect1 xml:id="sec-further-documentation">
         <title>Further Documentation</title>
 
-        <para><emphasis role="strong">SUSE Linux Enterprise High Availability Extension
+        <para><emphasis role="strong">SUSE Linux Enterprise High Availability
                 Guide</emphasis>: A comprehensive documentation about nearly every part of the Linux
             Cluster stack. See <link
                 xlink:href="https://documentation.suse.com/sle-ha/11-SP4/html/SLE-ha-all/book-sleha.html"
diff --git a/xml/entity-decl.ent b/xml/entity-decl.ent
index 6ea12888..2ea12c4f 100644
--- a/xml/entity-decl.ent
+++ b/xml/entity-decl.ent
@@ -69,7 +69,7 @@
 <!ENTITY sleposreg     "SUSE&reg; Linux Enterprise Point of Service">
 <!ENTITY slert         "&sle; Real Time">
 <!ENTITY slertreg      "&slereg; Real Time">
-<!ENTITY hasi          "High Availability Extension">
+<!ENTITY hasi          "High Availability">
 <!ENTITY sletcreg      "&slereg; Thin Client">
 <!ENTITY sletc         "&sle; Thin Client">
 <!ENTITY sletca        "SLETC">