diff --git a/README.rst b/README.rst
index 78b9ca7ae1..b973a84e0c 100644
--- a/README.rst
+++ b/README.rst
@@ -6,7 +6,7 @@ This is an OpenStack style project that provides a REST API to orchestrate
 multiple cloud applications implementing well-known standards such as AWS
 CloudFormation and TOSCA.
 
-Currently the developers are focusing on AWS CloudFormations but are watching
+Currently the developers are focusing on AWS CloudFormation but are watching
 the development of the TOSCA specification.
 
 Why heat? It makes the clouds rise and keeps them there.
diff --git a/bin/heat b/bin/heat
index 381f63e0d7..99033afb0c 100755
--- a/bin/heat
+++ b/bin/heat
@@ -243,7 +243,7 @@ def jeos_create(options, arguments):
         print '   heat jeos_create <distro> <arch> <instancetype>'
         print '     instance type can be:'
         print '     gold builds a base image where userdata is used to initialize the instance'
-        print '     cfntools builds a base image where AWS CloudFormations tools are present'
+        print '     cfntools builds a base image where AWS CloudFormation tools are present'
         sys.exit(1)
 
     distro = arguments.pop(0)
diff --git a/bin/heat-api b/bin/heat-api
index ca82d89773..e6cc3e9e6c 100755
--- a/bin/heat-api
+++ b/bin/heat-api
@@ -3,7 +3,7 @@
 
 """
 Heat API Server.  This implements an approximation of the Amazon
-CloudFormations API and translates it into a native representation.  It then
+CloudFormation API and translates it into a native representation.  It then
 calls the heat-engine via REST to implement them.
 """
 
diff --git a/heat/cfntools/README b/heat/cfntools/README
index 52d655e357..49e6f9bc67 100644
--- a/heat/cfntools/README
+++ b/heat/cfntools/README
@@ -2,7 +2,7 @@ There are several bootstrap methods for cloudformations:
 1. Create image with application ready to go
 2. Use cloud-init to run a startup script passed as userdata to the nova
    server create
-3. Use the CloudFormations instance helper scripts
+3. Use the CloudFormation instance helper scripts
 
 This directory contains files required for choice #3.
 
@@ -10,4 +10,4 @@ cfn-init   - Reads the AWS::CloudFormation::Init for the instance resource,
              installs packages, and starts services
 cfn-signal - Waits for an application to be ready before continuing, ie:
              supporting the WaitCondition feature
-cfn-hup    - Handle updates from the UpdateStack CloudFormations API call
+cfn-hup    - Handle updates from the UpdateStack CloudFormation API call
diff --git a/heat/cfntools/cfn-hup b/heat/cfntools/cfn-hup
index 4d53738ad6..7d72ab93ed 100755
--- a/heat/cfntools/cfn-hup
+++ b/heat/cfntools/cfn-hup
@@ -12,5 +12,5 @@
 #    under the License.
 
 """
-Implements cfn-hup CloudFormations functionality
+Implements cfn-hup CloudFormation functionality
 """
diff --git a/heat/cfntools/cfn-init b/heat/cfntools/cfn-init
index 1b10a13cb4..f0e688ab5b 100755
--- a/heat/cfntools/cfn-init
+++ b/heat/cfntools/cfn-init
@@ -13,7 +13,7 @@
 #    under the License.
 
 """
-Implements cfn-init CloudFormations functionality
+Implements cfn-init CloudFormation functionality
 
 Resource metadata currently implemented:
     * config/packages
diff --git a/heat/cfntools/cfn-signal b/heat/cfntools/cfn-signal
index 3445d60b53..de6283fbd8 100755
--- a/heat/cfntools/cfn-signal
+++ b/heat/cfntools/cfn-signal
@@ -12,5 +12,5 @@
 #    under the License.
 
 """
-Implements cfn-signal CloudFormations functionality
+Implements cfn-signal CloudFormation functionality
 """