diff --git a/base.yaml b/base.yaml
index 4353c42faa..640796d26b 100644
--- a/base.yaml
+++ b/base.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Tie OpenStack components together'
+Description: 'Tie OpenStack components together'
 Parameters:
   TemplateRoot:
     Description: URL Base where all of our templates are available
diff --git a/glance.yaml b/glance.yaml
index b5c0079f72..fd7470adc5 100644
--- a/glance.yaml
+++ b/glance.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Glance'
+Description: 'Glance'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
diff --git a/heat-allinone.yaml b/heat-allinone.yaml
index f1dead2828..13fb1dbb1f 100644
--- a/heat-allinone.yaml
+++ b/heat-allinone.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Heat Engine and API'
+Description: 'Heat Engine and API'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
diff --git a/heat.yaml b/heat.yaml
index d6aa52ed32..4409f19a7c 100644
--- a/heat.yaml
+++ b/heat.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Heat Engine and API'
+Description: 'Heat Engine and API'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
diff --git a/keystone.yaml b/keystone.yaml
index fc2562031c..4fc635daba 100644
--- a/keystone.yaml
+++ b/keystone.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Keystone'
+Description: 'Keystone'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
diff --git a/mysql.yaml b/mysql.yaml
index f6142e2a87..4949b5191e 100644
--- a/mysql.yaml
+++ b/mysql.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Dedicated MySQL server'
+Description: 'Dedicated MySQL server'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
diff --git a/notcompute.yaml b/notcompute.yaml
index 91bdfa2e45..bfe6d7a9b3 100644
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -1,5 +1,5 @@
-Description: HEAT Template - Dedicated MySQL server,HEAT Template - Dedicated MySQL
-  server,HEAT Template - Nova API
+Description: Dedicated MySQL server,Dedicated MySQL
+  server,Nova API
 HeatTemplateFormatVersion: '2012-12-12'
 Outputs:
   GlancePassword:
diff --git a/nova-api.yaml b/nova-api.yaml
index 92ea3cae0e..204621c24f 100644
--- a/nova-api.yaml
+++ b/nova-api.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Nova API'
+Description: 'Nova API'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
diff --git a/nova-compute.yaml b/nova-compute.yaml
index ae4affbf70..18dddcc823 100644
--- a/nova-compute.yaml
+++ b/nova-compute.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Nova Compute'
+Description: 'Nova Compute'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
diff --git a/quantum.yaml b/quantum.yaml
index bc08f014a0..9caad89128 100644
--- a/quantum.yaml
+++ b/quantum.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Quantum'
+Description: 'Quantum'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
diff --git a/rabbitmq.yaml b/rabbitmq.yaml
index d8fdb5f689..80e28eb682 100644
--- a/rabbitmq.yaml
+++ b/rabbitmq.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Dedicated MySQL server'
+Description: 'Dedicated RabbitMQ Server'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances